gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Dec 18 15:27:15 EST 2016
Updated via https://github.com/Gnucash/gnucash/commit/4979eb62 (commit)
via https://github.com/Gnucash/gnucash/commit/1ef17e6e (commit)
via https://github.com/Gnucash/gnucash/commit/bbb5e56e (commit)
via https://github.com/Gnucash/gnucash/commit/21bd13b9 (commit)
via https://github.com/Gnucash/gnucash/commit/2cecc293 (commit)
via https://github.com/Gnucash/gnucash/commit/38527d08 (commit)
via https://github.com/Gnucash/gnucash/commit/3ed1c761 (commit)
via https://github.com/Gnucash/gnucash/commit/54beffd9 (commit)
via https://github.com/Gnucash/gnucash/commit/78b41f7a (commit)
via https://github.com/Gnucash/gnucash/commit/ad208810 (commit)
via https://github.com/Gnucash/gnucash/commit/ad1ba561 (commit)
via https://github.com/Gnucash/gnucash/commit/fcd817a6 (commit)
via https://github.com/Gnucash/gnucash/commit/fc3dc3e7 (commit)
via https://github.com/Gnucash/gnucash/commit/7b7c780a (commit)
via https://github.com/Gnucash/gnucash/commit/332bd3bb (commit)
via https://github.com/Gnucash/gnucash/commit/98697a1e (commit)
via https://github.com/Gnucash/gnucash/commit/d9dbc3de (commit)
via https://github.com/Gnucash/gnucash/commit/0829d6dc (commit)
via https://github.com/Gnucash/gnucash/commit/5803c141 (commit)
from https://github.com/Gnucash/gnucash/commit/feee7ca6 (commit)
commit 4979eb62a7795ca44fa4a2557bca5ee40292f59f
Merge: feee7ca 1ef17e6
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 18 12:14:00 2016 -0800
Merge branch 'maint' after release 2.6.15.
diff --cc README
index 94ca716,0812598..1a34cc5
--- a/README
+++ b/README
@@@ -211,7 -211,7 +211,7 @@@ Building & Installin
GnuCash uses GNU Automake to handle the build process, so for most of
the details, see the generic instructions in INSTALL. (If you are
- building directory from Git, read the README.git file for more instructions.)
-building directly from SVN, read the README.svn for more instructions.)
++building directly from Git, read the README.git file for more instructions.)
Below we detail the GnuCash specific bits.
Prior to building GnuCash, you will have to obtain and install the
diff --cc src/libqof/qof/test/test-gnc-date.c
index c7d732f,acd48f9..a391ea2
--- a/src/libqof/qof/test/test-gnc-date.c
+++ b/src/libqof/qof/test/test-gnc-date.c
@@@ -1819,37 -1932,103 +1819,53 @@@ Timespe
gnc_dmy2timespec_end (int day, int month, int year)// C: 1 Local: 0:0:0
*/
static void
-test_gnc_dmy2timespec_end (void)
-{
- GDateTime *gdt1 = gncdt.new_local (1999, 7, 21,23,59, 59);
- GDateTime *gdt2 = gncdt.new_local (1918, 3, 30, 23, 59, 59);
- GDateTime *gdt3 = gncdt.new_local (1918, 3, 31, 23, 59, 59);
- GDateTime *gdt4 = gncdt.new_local (2057, 11, 20, 23, 59, 59);
-
- gint day, mon, yr;
- Timespec t, r_t;
-
- t = g_date_time_to_timespec (gdt1);
- g_date_time_get_ymd (gdt1, &yr, &mon, &day);
- r_t = gnc_dmy2timespec_end (day, mon, yr);
- g_assert_cmpint (r_t.tv_sec, ==, t.tv_sec);
- g_assert_cmpint (r_t.tv_nsec, ==, t.tv_nsec);
-
- t = g_date_time_to_timespec (gdt2);
- g_date_time_get_ymd (gdt2, &yr, &mon, &day);
- r_t = gnc_dmy2timespec_end (day, mon, yr);
- g_assert_cmpint (r_t.tv_sec, ==, t.tv_sec);
- g_assert_cmpint (r_t.tv_nsec, ==, t.tv_nsec);
-
- t = g_date_time_to_timespec (gdt3);
- g_date_time_get_ymd (gdt3, &yr, &mon, &day);
- r_t = gnc_dmy2timespec_end (day, mon, yr);
- g_assert_cmpint (r_t.tv_sec, ==, t.tv_sec);
- g_assert_cmpint (r_t.tv_nsec, ==, t.tv_nsec);
-
- t = g_date_time_to_timespec (gdt4);
- g_date_time_get_ymd (gdt4, &yr, &mon, &day);
- r_t = gnc_dmy2timespec_end (day, mon, yr);
- g_assert_cmpint (r_t.tv_sec, ==, t.tv_sec);
- g_assert_cmpint (r_t.tv_nsec, ==, t.tv_nsec);
-
- g_date_time_unref (gdt1);
- g_date_time_unref (gdt2);
- g_date_time_unref (gdt3);
- g_date_time_unref (gdt4);
+test_gnc_dmy2timespec_end (FixtureB *f, gconstpointer pData)
+{
+ for (int i = 0; i < sizeof(f->test)/sizeof(TimeMap); ++i)
+ {
+#ifdef HAVE_STRUCT_TM_GMTOFF
+ struct tm tm = {59, 59, 23, f->test[i].day, f->test[i].mon - 1,
+ f->test[i].yr - 1900, 0, 0, -1, 0, NULL};
+#else
+ struct tm tm = {59, 59, 23, f->test[i].day, f->test[i].mon - 1,
+ f->test[i].yr - 1900, 0, 0, -1};
+#endif
+ Timespec r_t = gnc_dmy2timespec_end (f->test[i].day, f->test[i].mon,
+ f->test[i].yr);
+ int offset = gnc_mktime(&tm) - gnc_timegm(&tm);
+ g_assert_cmpint (r_t.tv_sec, ==, f->test[i].secs + offset);
+ }
}
+ static GDateTime*
+ offset_adjust(GDateTime *gdt)
+ {
+ Testfuncs *tf = gnc_date_load_funcs();
+ GTimeZone *zone = tf->timezone_new_local();
+ int interval = g_time_zone_find_interval(zone, G_TIME_TYPE_STANDARD,
+ g_date_time_to_unix(gdt));
+ int offset = g_time_zone_get_offset(zone, interval) / 60;
+ int off_hr = (offset / 60) + (offset % 60 ? (offset < 0 ? -1 : 1) : 0);
+ int correction = off_hr < -10 ? -10 - off_hr : off_hr > 13 ? 13 - off_hr : 0;
+ GDateTime* new_gdt = g_date_time_add_hours(gdt, correction);
+ g_date_time_unref(gdt);
+ g_slice_free(Testfuncs, tf);
+ return new_gdt;
+ }
+
/*gnc_dmy2timespec_neutral*/
static void
-test_gnc_dmy2timespec_neutral (void)
-{
- GDateTime *gdt1 = offset_adjust(gncdt.new_utc (1999, 7, 21, 10, 59, 0));
- GDateTime *gdt2 = offset_adjust(gncdt.new_utc (1918, 3, 31, 10, 59, 0));
- GDateTime *gdt3 = offset_adjust(gncdt.new_utc (1918, 4, 1, 10, 59, 0));
- GDateTime *gdt4 = offset_adjust(gncdt.new_utc (2057, 11, 20, 10, 59, 0));
-
- gint day, mon, yr;
- Timespec t, r_t;
-
- t = g_date_time_to_timespec (gdt1);
- g_date_time_get_ymd (gdt1, &yr, &mon, &day);
- r_t = gnc_dmy2timespec_neutral (day, mon, yr);
- g_assert_cmpint (r_t.tv_sec, ==, t.tv_sec);
- g_assert_cmpint (r_t.tv_nsec, ==, t.tv_nsec);
-
- t = g_date_time_to_timespec (gdt2);
- g_date_time_get_ymd (gdt2, &yr, &mon, &day);
- r_t = gnc_dmy2timespec_neutral (day, mon, yr);
- g_assert_cmpint (r_t.tv_sec, ==, t.tv_sec);
- g_assert_cmpint (r_t.tv_nsec, ==, t.tv_nsec);
-
- t = g_date_time_to_timespec (gdt3);
- g_date_time_get_ymd (gdt3, &yr, &mon, &day);
- r_t = gnc_dmy2timespec_neutral (day, mon, yr);
- g_assert_cmpint (r_t.tv_sec, ==, t.tv_sec);
- g_assert_cmpint (r_t.tv_nsec, ==, t.tv_nsec);
-
- t = g_date_time_to_timespec (gdt4);
- g_date_time_get_ymd (gdt4, &yr, &mon, &day);
- r_t = gnc_dmy2timespec_neutral (day, mon, yr);
- g_assert_cmpint (r_t.tv_sec, ==, t.tv_sec);
- g_assert_cmpint (r_t.tv_nsec, ==, t.tv_nsec);
-
- g_date_time_unref (gdt1);
- g_date_time_unref (gdt2);
- g_date_time_unref (gdt3);
- g_date_time_unref (gdt4);
+test_gnc_dmy2timespec_neutral (FixtureB *f, gconstpointer pData)
+{
+ for (int i = 0; i < sizeof(f->test)/sizeof(TimeMap); ++i)
+ {
+ Timespec r_t = gnc_dmy2timespec_neutral (f->test[i].day, f->test[i].mon,
+ f->test[i].yr);
+
+ g_assert_cmpint (r_t.tv_sec, ==, f->test[i].secs);
+ }
}
+
/* gnc_timezone
long int
gnc_timezone (const struct tm *tm)// C: 5 in 2 Local: 2:0:0
diff --cc src/report/locale-specific/us/taxtxf-de_DE.scm
index 5aff387,fafa1c3..9a06bc9
--- a/src/report/locale-specific/us/taxtxf-de_DE.scm
+++ b/src/report/locale-specific/us/taxtxf-de_DE.scm
@@@ -765,15 -764,18 +765,15 @@@
;; Ignore
'())))
- (let ((from-date (strftime "%d.%m.%Y" (localtime (car from-value))))
- (to-date (strftime "%d.%m.%Y" (localtime (car to-value))))
- (to-year (strftime "%Y" (localtime (car to-value))))
+ (let ((from-date (strftime "%d.%m.%Y" (gnc-localtime (car from-value))))
+ (to-date (strftime "%d.%m.%Y" (gnc-localtime (car to-value))))
+ (to-year (strftime "%Y" (gnc-localtime (car to-value))))
(today-date (strftime "%d.%m.%Y"
- (localtime
+ (gnc-localtime
(car (timespecCanonicalDayTime
(cons (current-time) 0))))))
- (tax-nr (or
- (kvp-frame-get-slot-path-gslist
- (qof-book-get-slots (gnc-get-current-book))
- (append gnc:*kvp-option-path*
- (list gnc:*tax-label* gnc:*tax-nr-label*)))
+ (tax-nr (or
+ (gnc:option-get-value book gnc:*tax-label* gnc:*tax-nr-label*)
""))
)
diff --cc src/report/locale-specific/us/taxtxf.scm
index b14e20f,67298ca..96e676a
--- a/src/report/locale-specific/us/taxtxf.scm
+++ b/src/report/locale-specific/us/taxtxf.scm
@@@ -1496,10 -1493,10 +1496,10 @@@
(gnc:html-table-append-row!
date-table
(gnc:make-html-table-cell/markup
- "date-cell"
+ "date-cell"
(strftime "%Y-%b-%d"
- (localtime (car trans-date)))))
- (gnc:html-table-set-style! num-table "table"
+ (gnc-localtime (car trans-date)))))
+ (gnc:html-table-set-style! num-table "table"
'attribute (list "border" "0")
'attribute (list "cellspacing" "0")
'attribute (list "cellpadding" "0"))
@@@ -2162,10 -2159,10 +2162,10 @@@
(set-tm:mon bdtm 8))
((4th-est 4th-last last-year) ; Dec 31
(set-tm:mon bdtm 11))
- (else
+ (else
(set! bdtm (gnc:timepair->date to-value)))))
(set-tm:isdst bdtm -1)
- (cons (car (mktime bdtm)) 0))))
+ (cons (gnc-mktime bdtm) 0))))
(form-line-acct-header-printed? #f)
(form-schedule-header-printed? #f)
@@@ -2180,10 -2177,10 +2180,10 @@@
(define (txf-special-splits-period account from-value to-value)
(if (and (xaccAccountGetTaxRelated account)
(txf-special-date? (gnc:account-get-txf-code account)))
- (let*
+ (let*
((full-year?
- (let ((bdto (localtime (car to-value)))
- (bdfrom (localtime (car from-value))))
+ (let ((bdto (gnc-localtime (car to-value)))
+ (bdfrom (gnc-localtime (car from-value))))
(and (equal? (tm:year bdto) (tm:year bdfrom))
(equal? (tm:mon bdfrom) 0)
(equal? (tm:mday bdfrom) 1)
@@@ -2396,13 -2393,13 +2396,13 @@@
) ;; end of let*
)
- (let ((from-date (strftime "%Y-%b-%d" (localtime (car from-value))))
- (to-date (strftime "%Y-%b-%d" (localtime (car to-value))))
+ (let ((from-date (strftime "%Y-%b-%d" (gnc-localtime (car from-value))))
+ (to-date (strftime "%Y-%b-%d" (gnc-localtime (car to-value))))
- (today-date (strftime "D%m/%d/%Y"
- (gnc-localtime
+ (today-date (strftime "D%m/%d/%Y"
- (localtime
++ (gnc-localtime
(car (timespecCanonicalDayTime
(cons (current-time) 0))))))
- (tax-year (strftime "%Y" (localtime (car from-value))))
+ (tax-year (strftime "%Y" (gnc-localtime (car from-value))))
(tax-entity-type (gnc-get-current-book-tax-type))
(tax-entity-type-valid? #f)
(prior-form-schedule "")
commit 1ef17e6e16c3febd238fe7dc277a2ecba6f7b7c8
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Dec 17 11:11:56 2016 -0800
Release 2.6.15
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d48b2b5..c1572b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ ENABLE_TESTING()
# Version number of gnucash
SET (GNUCASH_MAJOR_VERSION 2)
SET (GNUCASH_MINOR_VERSION 6)
-SET (GNUCASH_MICRO_VERSION 14)
+SET (GNUCASH_MICRO_VERSION 15)
SET (GNUCASH_NANO_VERSION 0)
SET (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}.${GNUCASH_MICRO_VERSION}")
SET (GNUCASH_LATEST_STABLE_SERIES 2.6)
diff --git a/ChangeLog b/ChangeLog
index 2578cb9..b088600 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,270 @@
+2016-12-17 John Ralls
+
+ * Update Danish and Serbian translations from the Translation Project. (HEAD, maint)
+
+2016-12-17 Phil Davis
+
+ * README typo (origin/maint)
+
+2016-12-13 John Ralls
+
+ * Bug 775912 - Tips of the Day shows content only once very 3 times
+
+2016-12-11 John Ralls
+
+ * Remove QIF importer error “Dates earlier than 1970 are not supportedâ€.
+
+2016-12-11 John Ralls
+
+ * Bug 685329 - Crashes on non-existent date
+
+2016-12-11 John Ralls
+
+ * Bug 772369 - Replace use of guile's internal date/time functions
+
+2016-12-11 John Ralls
+
+ * Bug 773808 - Export Report Crash
+
+2016-12-10 John Ralls
+
+ * Bug 772484 - Segfault on Transaction edit
+
+2016-12-10 John Ralls
+
+ * Bug 774237 - FTBFS under some timezones (eg. GMT-14)
+
+2016-12-09 John Ralls
+
+ * Bug 775385 - Confusing error message which includes the text "file file"
+
+2016-12-09 John Ralls
+
+ * Bug 775368 - "Average cost" price source problem
+
+2016-12-09 John Ralls
+
+ * Change the default price-source from Average Cost to Nearest in Time.
+
+2016-12-09 John Ralls
+
+ * Calculate rates only for buy transactions in the report commodity for cost totals.
+
+2016-12-04 John Ralls
+
+ * Single functions for gnc:make-exchange-alist and gnc:get-exchange-totals.
+
+2016-12-01 John Ralls
+
+ * Move checks for no split amount and trading accounts to get-match-commodity-splits.
+
+2016-12-01 John Ralls
+
+ * Clean up whitespace in commodity-utilities.scm.
+
+2016-12-06 Ryan Tucker
+
+ * fix missing chmod +x in configure.ac
+
+2016-12-04 John Ralls
+
+ * Bug 775567 - Importing QIF file from PayPal crashes GnuCash 2.6.14 on Windows XP service pack 3
+
+2016-12-03 John Ralls
+
+ * Prevent crash when there's an error loading a qif import file.
+
+2016-11-19 Robert Fewell
+
+ * Bug 516920 Scheduled trasaction calendar popup off screen
+
+2016-11-30 Geert Janssens
+
+ * Fix compiler warning about misleading indentation
+
+2016-11-28 Geert Janssens
+
+ * Fix report html header
+
+2016-11-16 Robert Fewell
+
+ * Changed the default value for date format
+
+2016-11-16 Robert Fewell
+
+ * Fix check printing custom preference value
+
+2016-11-16 Robert Fewell
+
+ * Correct the default options if default invalid
+
+2016-11-16 Robert Fewell
+
+ * Add an unset option to date-format
+
+2016-11-15 Robert Fewell
+
+ * Added a default currency to the currency option
+
+2016-11-15 Robert Fewell
+
+ * Add plot size option for future compatibility
+
+2016-11-15 Robert Fewell
+
+ * Fix warning from glib when saving reports.
+
+2016-11-15 Robert Fewell
+
+ * Change report resizing when not in view
+
+2016-11-15 Robert Fewell
+
+ * Forgot to add the png file to previous commit
+
+2016-11-15 Robert Fewell
+
+ * Add an image for the report tab
+
+2016-11-15 Robert Fewell
+
+ * Change the reload to include using web_view_reload
+
+2016-11-15 Robert Fewell
+
+ * Track visibility of the view scroll bars
+
+2016-11-15 Robert Fewell
+
+ * Add progress bar updates for reload / Update
+
+2016-11-15 Robert Fewell
+
+ * Add call back to track page size changes
+
+2016-11-15 Robert Fewell
+
+ * Stop the progress bar changing height
+
+2016-11-15 Robert Fewell
+
+ * Add idle function to load report
+
+2016-11-15 Robert Fewell
+
+ * Remove macros/as-scrub-include.m4 from makefile
+
+2016-11-13 Geert Janssens
+
+ * Fix make check after commit 673888dee7c
+
+2016-11-12 Geert Janssens
+
+ * Bug 770364 - Sign of Value in Lots in Account window seems inconsistent
+
+2016-11-12 Geert Janssens
+
+ * Use G_MAXINT64 instead of 0 to indicate an invalid date
+
+2016-11-11 Geert Janssens
+
+ * Show empty business splits in lot viewer
+
+2016-11-11 Geert Janssens
+
+ * Check more splits while running check & repair on business accounts
+
+2016-11-11 Geert Janssens
+
+ * Business check & repair - correct lot invoice state
+
+2016-11-09 Geert Janssens
+
+ * Various small improvements to check & repair on business accounts
+
+2016-11-06 Geert Janssens
+
+ * When juggling business splits while scrubbing set both value and amount
+
+2016-11-06 Geert Janssens
+
+ * Update progress bar while running Check & Repair
+
+2016-11-09 Geert Janssens
+
+ * Remove lot from account while deleting the lot
+
+2016-11-10 John Ralls
+
+ * Ensure that the Namespace combo box is initialized to a valid iter.
+
+2016-10-24 John Ralls
+
+ * Bug 769124 - Australian (GMT-10) OFX transactions imported have previous
+
+2016-10-20 John Ralls
+
+ * Bug 769124 - Australian (GMT-10) OFX transactions imported have previous days date.
+
+2016-10-14 Rob.Gowin
+
+ * Remove configuration of HAVE_PUTENV.
+
+2016-10-10 Geert Janssens
+
+ * Bug 771617 - Build fails because test test-report-utilities is sensitive to time of day/timezone
+
+2016-10-10 Geert Janssens
+
+ * Bug 771617 - Build fails because test test-report-utilities is sensitive to time of day/timezone
+
+2016-10-04 John Ralls
+
+ * Fix CSV importer to handle GMT + 13 Timezone (New Zealand Daylight Time).
+
+2016-10-04 John Ralls
+
+ * Bug 772382 - Date off-by-one after DST change
+
+2016-09-28 Ralf Habacker
+
+ * Fix broken german account template 'Kontenrahmen für Wohnungswirtschaft'.
+
+2016-10-03 Geert Janssens
+
+ * Bug 771617 - Build fails because test test-report-utilities is sensitive to time of day/timezone
+
+2016-10-02 Geert Janssens
+
+ * Bug 772313 - Invalid DOCTYPE in report generation
+
+2016-09-27 Rob Gowin
+
+ * Use default PKG_CHECK_MODULES for CMake version > 3.4
+
+2016-09-25 John Ralls
+
+ * Remove obsolete AS_SCRUB_INCLUDES macro.
+
+2016-09-25 Mike Evans
+
+ * Bug 771246 - Set Invoice/Bill items date correctly from imported CSV.
+
+2016-09-17 John Ralls
+
+ * Fix version in CMakeLists.txt. (tag: 2.6.14a)
+
+2016-09-16 John Ralls
+
+ * Release 2.6.14 (tag: 2.6.14)
+
2016-09-16 John Ralls
- * Synchronize translation project. (HEAD, maint)
+ * Synchronize translation project.
2016-09-15 John Ralls
- * Bug 769746 - Zero interest loan formula fails. (origin/maint)
+ * Bug 769746 - Zero interest loan formula fails.
2016-08-01 Robert Fewell
diff --git a/NEWS b/NEWS
index 9ed2c77..4b462cd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,52 @@
Version history:
------- -------
+2.6.15 - 18 December 2016
+Announcement: GnuCash 2.6.15 Release 2016-12-18
+GnuCash 2.6.14 released
+
+The GnuCash development team proudly announces GnuCash 2.6.15, the
+fifteenth maintenance release in the 2.6-stable series.
+
+The following bugs are fixed:
+
+ Bug 340991 - Default price source for reports not good.
+ Bug 516920 - Scheduled trasaction calendar popup off screen.
+ Bug 685329 - Crashes on non-existent date.
+ Bug 769124 - Australian (GMT-10) OFX transactions imported have
+ previous day's date.
+ Bug 770364 - Sign of Value in Lots in Account window seems inconsistent.
+ Bug 771246 - Set Invoice/Bill items date correctly from imported CSV.
+ Bug 771617 - Build fails because test test-report-utilities is
+ sensitive to time of day/timezone.
+ Bug 772313 - Invalid DOCTYPE in report generation.
+ Bug 772369 - Replace use of guile's internal date/time functions.
+ Bug 772382 - Date off-by-one after DST change.
+ Bug 772484 - Segfault on Transaction edit.
+ Bug 773808 - Export Report Crash.
+ Bug 774237 - FTBFS under some timezones (eg. GMT-14).
+ Bug 775368 - "Average cost" price source problem.
+ Bug 775385 - Confusing error message which includes the text "file file".
+ Bug 775567 - Importing QIF file from PayPal crashes GnuCash 2.6.14
+ on Windows XP service pack 3/
+ Bug 775912 - Tips of the Day shows content only once very 3 times.
+
+Other repairs that weren't marked as bugs in git:
+ Fix report html header
+ Changed the default value for date format in Business Options
+ Change report resizing when not in view
+ Add an image for the report tab
+ Show empty business splits in lot viewer
+ Business check & repair - correct lot invoice state
+ When juggling business splits while scrubbing set both value and amount
+ Update progress bar while running Check & Repair
+ Remove lot from account while deleting the lot
+ Ensure that the Namespace combo box is initialized to a valid iter.
+ Fix CSV importer to handle GMT + 13 Timezone (New Zealand Daylight
+ Fix broken german account template 'Kontenrahmen für
+ Wohnungswirtschaft'.Time).
+
+Translation Updates: Danish, German, Serbian
+
2.6.14 - 17 September 2016
Announcement: GnuCash 2.6.14 Release 2016-09-17
GnuCash 2.6.14 released
diff --git a/configure.ac b/configure.ac
index dd26ee8..2e13ce6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script.
# Autoconf initialization
AC_PREREQ(2.60)
-AC_INIT([GnuCash], [2.6.14], [gnucash-devel at gnucash.org])
+AC_INIT([GnuCash], [2.6.15], [gnucash-devel at gnucash.org])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_SRCDIR(src/engine/Transaction.h)
AC_CONFIG_MACRO_DIR([macros])
commit bbb5e56e309397384724dba4f971b9dde1a7806a
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Dec 17 10:20:50 2016 -0800
Update AUTHORS and DOCUMENTORS.
diff --git a/AUTHORS b/AUTHORS
index d2546e8..ba4b436 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,303 +1,326 @@
-GETTING HELP: If you need help with GnuCash, please do not contact any of the
-Authors directly. Instead, first look at http://wiki.gnucash.org/wiki/FAQ to
-see if your question is common and is answered there. If that doesn't help,
-there are mailing lists in English, Dutch, French, German, Italian, and
-Portuguese and an English IRC channel. More information can be found at
-http://wiki.gnucash.org/wiki/Mailing_Lists and http://wiki.gnucash.org/wiki/IRC.
+GETTING HELP: If you need help with GnuCash, please do not contact any
+of the Authors directly. Instead, first look at
+http://wiki.gnucash.org/wiki/FAQ to see if your question is common and
+is answered there. If that doesn't help, there are mailing lists in
+English, Dutch, French, German, Italian, and Portuguese and an English
+IRC channel. More information can be found at
+http://wiki.gnucash.org/wiki/Mailing_Lists and
+http://wiki.gnucash.org/wiki/IRC.
-Main Developers:
+Current Project Team:
+=====================
+J. Alex Aycinena: Tax Reports, General Development
+Derek Atkins: Infrastructure, User Support
+Mike Alexander: Pricing/Exchange Rates, Lots, Advanced Portfolio Report
+Frank Ellenberger: Currencies
+Rob Gowin: CMake build system
+Robert Fewell: GUI Development
+Geert Janssens: General Development and Maintenance
+Aaron Laws: General Development
+John Ralls: General Development and Maintenance
+Christian Stimming: Administration
+Linas Vepstas: Administration and Website Hosting
+
+Dependencies:
+=============
+We'd like to acknowledge the contributions of some specialty packages
+that are incorporated into GnuCash and are critical to some of its
+features:
+Erik Colson: Finance::Quote
+Benoit Gregoire: libofx
+Martin Preuss: AQBanking
+
+Early Developers:
----------------
(In Historical Order)
-Robin Clark <rclark at hmc.edu> wrote the original X-Accountant in Motif
- as a school project, taking it to version 0.9 by October 1997.
- Although every single line of his code has been re-written (several
- times over), his name appears as a credit in almost every file.
- Such is the power of copyrights.
+Robin Clark wrote the original X-Accountant in Motif as a school
+ project, taking it to version 0.9 by October 1997. Although every
+ single line of his code has been re-written (several times over),
+ his name appears as a credit in almost every file. Such is the
+ power of copyrights.
-Linas Vepstas <linas at linas.org> liked what he saw: the GUI was slick,
- the code was documented and well structured, and it was all GPL'ed.
- And so he re-wrote it: adding cell-widgets to XbaeMatrix, so that
- the combobox and arrows would make an even slicker GUI, rewrote the
+Linas Vepstas liked what he saw: the GUI was slick, the code was
+ documented and well structured, and it was all GPL'ed. And so he
+ re-wrote it: adding cell-widgets to XbaeMatrix, so that the
+ combobox and arrows would make an even slicker GUI, rewrote the
X-Accountant internals to add double-entry, an account hierarchy,
- split out a transaction mini-engine, add support for stocks, and spiffed
- up the help menus. All for version 1.0 as of January 1998. Since
- then, for version 1.1 & 1.2, the engine was expanded & refined, and the
- register window code completely redesigned and made mostly
- Motif-(and GUI-)independent.
+ split out a transaction mini-engine, add support for stocks, and
+ spiffed up the help menus. All for version 1.0 as of January 1998.
+ Since then, for version 1.1 & 1.2, the engine was expanded &
+ refined, and the register window code completely redesigned and
+ made mostly Motif-(and GUI-)independent.
-Jeremy Collins <jcollins at gnucash.org> publicized the GnoMoney project
- widely and broadly, and then changed its name to GnuCash. (Actually,
- he put the selection of the name up to popular vote. We all learned
- that democracy is not a good way to pick names.) Jeremy registered
- the domain name, and created and maintained the gnucash.org web site
- for years, and got the initial GTK/gnome code working.
+Jeremy Collins publicized the GnoMoney project widely and broadly, and
+ then changed its name to GnuCash. (Actually, he put the selection
+ of the name up to popular vote. We all learned that democracy is
+ not a good way to pick names.) Jeremy registered the domain name,
+ and created and maintained the gnucash.org web site for years, and
+ got the initial GTK/gnome code working.
-Rob Browning <rlb at cs.utexas.edu> abused everyone for not using perl,
- and then after we added Perl support, dumped Perl in favor of
- Guile/Scheme support. Rob added user preferences, re-wrote the
- reports in scheme, and contributed the change-over of the
- file-format to XML. He then concentrated on scheme performance and
- has been the g-wrap guile wrapper maintainer.
+Rob Browning abused everyone for not using perl, and then after we
+ added Perl support, dumped Perl in favor of Guile/Scheme
+ support. Rob added user preferences, re-wrote the reports in
+ scheme, and contributed the change-over of the file-format to
+ XML. He then concentrated on scheme performance and has been the
+ g-wrap guile wrapper maintainer.
-Dave Peticolas <dave at krondo.com> worked on most parts of Gnucash, especially
- the register and GUI.
+Dave Peticolas worked on most parts of Gnucash, especially the
+ register and GUI.
-Bill Gribble <grib at billgribble.com> is not shy, or softly spoken. So don't
- be shy if you find a bug in his code: QIF import, query API and
- transaction search, check-printing, commodity and currency support, gtkhtml
- integration and report printing, pgp support, guppi integration, and the
- new main window layout.
+Bill Gribble is not shy, or softly spoken. So don't be shy if you find
+ a bug in his code: QIF import, query API and transaction search,
+ check-printing, commodity and currency support, gtkhtml integration
+ and report printing, pgp support, guppi integration, and the new
+ main window layout.
-Robert Graham Merkel <rgmerk at mira.net> extensive work on reports and
- reporting infrastructure, gnome GUI work, and user preferences.
+Robert Graham Merkel extensive work on reports and reporting
+ infrastructure, gnome GUI work, and user preferences.
-James LewisMoss <dres at debian.org> design doc patches, XML refactoring,
- automated test suite, new file hierarchy import.
+James LewisMoss designed doc patches, XML refactoring, automated test
+ suite, new file hierarchy import.
-Christian Stimming <stimming at tuhh.de> is a report-generating
- monster. He's been one of the largest contributors to the report
- infrastructure, creating many of the important reports initially.
- He has also contributed HBCI online banking support and manages
- internationalization and translation.
+Christian Stimming was a report-generating monster. He's been one of
+ the largest contributors to the report infrastructure, creating
+ many of the important reports initially. He has also contributed
+ HBCI online banking support and manages internationalization and
+ translation.
-Joshua Sled <jsled at asynchronous.org> works on scheduled transactions, and
- general project monkeying (IRC bot, logs, website maintenance,
- bug-triage, &c.).
+Joshua Sled worked on scheduled transactions and general project
+ monkeying (IRC bot, logs, website maintenance, bug-triage, &c.).
-Derek Atkins <derek at ihtfp.com> wrote the business-accounting package
- for Gnucash. This includes the Customer/Vendor database, Job tracking,
- Order entry, Invoicing, Accounts Payable, Accounts Receivable, and
- related technologies. In the process he re-wrote the Query engine,
- modularized the Book object storage, and modularized the backend
- to allow pluggable objects.
+Derek Atkins wrote the business-accounting package for Gnucash. This
+ includes the Customer/Vendor database, Job tracking, Order entry,
+ Invoicing, Accounts Payable, Accounts Receivable, and related
+ technologies. In the process he re-wrote the Query engine,
+ modularized the Book object storage, and modularized the backend to
+ allow pluggable objects.
-David Hampton <hampton at employees.org> is an all-around hacker. He
- implemented a large porting of the gtk2 conversion. He generally
- works on cleaning up the GUI and on fleshing out support for
- stocks. David has picked up Dave Peticolas's previous tendency to
- hack obsessively on GnuCash. (Something in the name?)
+David Hampton was an all-around hacker. He implemented a large porting
+ of the gtk2 conversion. He generally works on cleaning up the GUI
+ and on fleshing out support for stocks. David has picked up Dave
+ Peticolas's previous tendency to hack obsessively on
+ GnuCash. (Something in the name?)
-Chris Lyttle <chris at wilddev.net> Administers the GnuCash bug list.
- Improved the help and integrated and finished a concepts and
- tutorial written by Carol Champagne. Looks after
- releasing new GnuCash versions and updating the website.
+Chris Lyttle Administered the GnuCash bug list. Improved the help and
+ integrated and finished a concepts and tutorial written by Carol
+ Champagne. Looks after releasing new GnuCash versions and updating
+ the website.
-Benoit Grégoire <bock at step.polymtl.ca> coded a long awaited OFX module
- for GnuCash and wrote the external libOFX library that it uses.
+Benoit Grégoire coded a long awaited OFX module for GnuCash and wrote
+ the external libOFX library that it uses.
-Neil Williams <linux at codehelp.co.uk> finished conversion from GncBook
- to QofBook and worked on the separation of QoF into a standalone
- library. He also contributed lots of Doxygen fixes and updates.
+Neil Williams finished conversion from GncBook to QofBook and worked
+ on the separation of QoF into a standalone library. He also
+ contributed lots of Doxygen fixes and updates.
-Chris Shoemaker <c.shoemaker at cox.net> implemented budgeting support
- for GnuCash. He replaced g-wrap by SWIG as GnuCash's guile wrapper
- generator and is also an all around hacker.
+Chris Shoemaker implemented budgeting support for GnuCash. He replaced
+ g-wrap by SWIG as GnuCash's guile wrapper generator and is also an
+ all around hacker.
-Andreas Köhler <andi5.py at gmx.net> is hunting down lots of bugs,
- especially for GUI code and other gtk related issues.
+Andreas Köhler hunted down lots of bugs, especially for GUI code and
+ other gtk related issues.
-Charles Day <cedayiv at gmail.com> overhauled the QIF importer and now
- focuses mainly on investment- and currency-related issues.
+Charles Day overhauled the QIF importer and now focuses mainly on
+ investment- and currency-related issues.
Other Contributors:
----------------
(In alphabetical order)
-Mike Alexander <mta at umich.edu> Cap gains, lot and MacOS fixes.
-Andrew Arensburger <arensb at cfar.umd.edu> for FreeBSD & other patches
-Matt Armstrong <matt_armstrong at bigfoot.com> for misc fixes
-Jon Arney <jarney1 at cox.net> Windows porting patches, misc fixes
-A. Alper Atici <alper_atici at yahoo.com> Turkish translation
+Mike Alexander Cap gains, lot and MacOS fixes.
+Andrew Arensburger for FreeBSD & other patches
+Matt Armstrong for misc fixes
+Jon Arney Windows porting patches, misc fixes
+A. Alper Atici Turkish translation
J. Alex Aycinena Heavily improved Tax Report & TXF export
-Fred Baube <fred at moremagic.com> for attempted Java port/MoneyDance
-Roman Bertle <bertle at smoerz.org> Austrian German account templates
-Jan-Pascal van Best <j.p.vanbest at tbm.tudelft.nl> MT940 importer
-Dennis Björklund <dennisb at cs.chalmers.se> Swedish translation
-Andreas Bogk <andreas at andreas.org> Postgres backend patch
-Per Bojsen <bojsen at worldnet.att.net> several core dump fixes
-Terry Boldt <tboldt at attglobal.net> financial calculator and expression parser
-Forest Bond <forest at alittletooquiet.net> Budget report improvements
-Richard Braakman <dark at xs4all.nl> xml version configure patch
-Simon Britnell <simon.britnell at peace.com> patch to RPM spec
-Christopher B. Browne <cbbrowne at hex.net> for perl, lots of scheme and documentation updates
-Nathan Buchanan <nbinont at yahoo.ca> packaging Windows binaries for release
-Johan Buret <johanburet at free.fr> french translation
-Thomas Bushnell <tb at becket.net> fix for file backups
-Eskil Bylund <eskil.bylund at gmail.com> account type deprecation
-Paul Campbell <kemitix at users.sourceforge.net> reconcile children patch
-Conrad Canterford <conrad at mail.watersprite.com.au> register bug fix
-Bill Carlson <wwc at wwcnet.nu> performance improvements
-David MarÃn Carreño <davefx at aspl.f2s.com> Spanish translation of account setup.
-Tomas Cernaj <tcernaj at gmx.de> GType consistency changes, register fixes
-Carol Champagne <carol at io.com> documentation & a patient GUI usability critic
-Nikos Charonitakis <charosn at her.forthnet.gr> Greek translation
-Graham Chapman <grahamc at zeta.org.au> for the xacc-rpts addon package
-George Chen <georgec at sco.com> for MS-Money QIF's & fixes
-Albert Chin-A-Young <china at thewrittenword.com> configure.in patch
-Kenneth Christiansen <kenneth at gnome.org> Danish translation
-Matthew Condell <mcondell at bbn.com> FreeBSD patch
-Patrick Condron <pcondon at rackspace.com> for webserver and T1 connection (credits to rackspace.com)
-Raphael Dechenaux <raphael.dechenaux at worldonline.fr> register patch
-Ciaran Deignan <Ciaran.Deignan at bull.net> for AIX binary version
-Glen Ditchfield <gjditchfield at acm.org> updated documentation
-Tyson Dowd <tyson at tyse.net> for config/make patches & debian maint
-Koen D'Hondt <ripley at xs4all.nl> for Solaris patches to XmHTML
-Bob Drzyzgula <bob at mostly.com> for budgeting design notes
-Frank H. Ellenberger <f.ellenberger at online.de> small things, usually germany related
-Volker Englisch <Volker at englisch.us> QA and testing
-Frank H. Ellenberger <f.ellenberger at online.de> Fix for IDR currency
-Christoph Ernst <C.Ernst72 at googlemail.com> Small bugfixes and minor enhancements
-Jonathan Ernst <jonathan at ernstfamily.ch> Translations
-Stephen Evanchik <evanchsa at clarkson.edu> Logging improvements; gtk2 conversions
-Mike Evans <mikee at saxicola.co.uk> Bug fixes and testing.
-Joshua Facemyer / Impressus Art <faceman at impressusart.com>: New artwork.
-Paul Fenwick <pjf at schools.net.au> ASX support, Finance::Quote
-Hubert Figuiere <hfiguiere at teaser.fr> patch to gnc-prices
-Valek Filippov <frob at df.ru> messages Russian translation
-Jan-Uwe Finck <jufi at nerdnet.de> for messages German translation
-Kevin Finn <kevinfinn at mediaone.net> auto-decimal point, options, auto interest xfer patches
-Aurimas Fišeras <aurimas at members.fsf.org> Lithuanian Translation, general i18n
-Danny Fischer <dan.pescaru at gmail.com> Romanian translation
-Ron Forrester <rjf at aracnet.com> for gnome patches
-Christoph Franzen <ChristophFranzen at gmx.net> German account template for Wohnungswirtschaft business
-Dave Freese <DFreese at osc.uscg.mil> for leap-year fix
-Todd T. Fries <todd at flare.fries.net> OpenBSD fix
-John Goerzen <jgoerzen at complete.org> file i/o fix for 64-bit architectures
-Jeff Green <jeff at parit.ca> Python bindings, with grant funding from Assiniboine Credit Union (http://assiniboine.mb.ca/)
-Hans de Graaff <hans at degraaff.org> XML patches
-Daniel Hagerty <hag at linnaean.org> patch to balance sheet report
-Mitsuo Hamada <mhamada at redhat.com> messages Japanese translations
-Otto Hammersmith <otto at bug.redhat.com> for RedHat RPM version
-Eric Hanchrow <offby1 at blarg.net> updated currency documentation
-Daniel Harding <dharding at gmail.com> Windows build tweaks; various code fixes
-Alexandru Harsanyi <haral at codec.ro> for core dumps, lockups, gtk work
-John Hasler <john at dhh.gt.org> engine patch
-Jon KÃ¥re Hellan <hellan at acm.org> misc core dump fixes
-Hendrik-Jan Heins <hjh at passys.nl> Dutch translation
-Joachim Herb <joachim.herb at gmx.de> Data table option for barchart reports
-Claus Hindsgaul <claus_h at image.dk> messages Danish translation
-Christoph Holtermann <c.holtermann at gmx.de> Python wrapper improvements
-Ori Hoch <ori at uumpa.com> Hebrew translation
-Péter Hosszú <hosszu at web.de> Hungarian translation
-Edward J. Huff <ejhuff at huff20may77.us> Date handling in reports, quarterly option
-Tomokazu Iwashita <iwashita at center.nitech.ac.jp> Japanese translation of xea
-Geert Janssens <janssens-geert at telenet.be> GUI fixes for Lots, autocompletion in gnc-general-search, several small fixes
-David Jafferian <david.jafferian at east.sun.com> Delete account query code.
-Mark Jenkins <mark at parit.ca> Python bindings, with grant funding from Assiniboine Credit Union (http://assiniboine.mb.ca/) and Legal Aid Manitoba (http://www.legalaid.mb.ca/)
-Rich Johnson <rich at dogstar-interactive.com> Mac OS X patch
-Miquel Jordana Vilamitjana <jjvmjv at mundomail.net> Spanish translation of manual
-Prakash Kailasa <PrakashK at bigfoot.com> for gnome build fixes
-Alexey Kakunin <small at arcadia.spb.ru> quickfill patch for Cyrillic
-Ben Kelly <ben.kelly at ieee.org> for Motif menu bug fix, core dump fixes
-Jeff Kletsky <gnomebugzilla at allycomm.com> Various patches, including for OFX import
-Tom Kludy <tkludy at csd.sgi.com> for SGI Irix port
-Tuomo Kohvakka <tuomo.kohvakka at iki.fi> Finnish translation
-Matt Kraai <kraai at alumni.carnegiemellon.edu> date accelerator bug fix
-Mantas KriauÄiÅ«nas <mantas at akl.lt> Lithuanian Translation
-Rafał Krzewski <rafal.krzewski at caltha.pl> bi module fixes
-Sven Kuenzler <sk at xgm.de> for SuSE README file
-Fabrice Kurz <kurzf at voila.fr> French translation
-Eneko Lacunza <enlar at enlar.net> Spanish Translation
-Bryan Larsen <blarsen at ada-works.com> guile budget report
-Chris J (Oakton) Leach <LeachCJ at az1.bp.com> autoconf patch
-Nicholas Lee <nj.lee at plumtree.co.nz> scheme bug fix
-Graham Leggett <minfrin at sharp.fm> for fixing a hang
-Rolf Leggewie <foss at rolf.leggewie.biz> SKR04 and gnucash for german business
-Georg Lehner <Jorge.Lehner at gmx.net> Nicaraguan Spanish translation
-Ted Lemon <mellon at andare.fugue.com> for NetBSD port
-Yannick Le Ny <y-le-ny at ifrance.com> French translations
-Frederic Leroy <> 64bit fixes, GUI improvements
-Frederic Lespez <frederic.lespez at wanadoo.fr> French account templates fixes.
-Chao-Hsiung Liao <pesder.liao at msa.hinet.net> Traditional Chinese translation
-Grant Likely <glikely at nortelnetworks.com> gnome and engine patches
-Vitaly Lipatov <lav at altlinux.ru> complete Russian translation, build tweaks, code cleanup
-Volodymyr M. Lisivka <lvm at mystery.lviv.net> Ukrainian translation
-Phil Longstaff <plongstaff at newearth.org> fixes for pricedb
-Duarte Loreto <happyguy_pt at hotmail.com> message and documentation Portuguese translations
-Raffael Luthiger <modir at huanga.com> Swiss German translation
-Lionel Elie Mamane <lionel at mamane.lu> Patches for gcc2.95 macro compatibility
-Kjartan Maraas <kmaraas at gnome.org> Norwegian translations
-Heath Martin <martinh at pegasus.cc.ucf.edu> gnome patches, major register work, x86_64 support
-Matt Martin <mgmartin at abacusnet.net> guile error handling code
-Yves-Eric Martin <yem_lists.gnucash.org at filter.yve.net> work on financial year end work
-Tadas Masiulionis <tadzikaz at gmail.com> Lithuanian Translation
-Juan Manuel GarcÃa Molina <juanmagm at mail.com> messages Spanish translation
-David Montenegro <sunrise2000 at comcast.net> all sorts of Scheme reports
-Orestes Mas <orestes at tsc.upc.es> Catalan translation
-Bernard Meens <meensb at xs4all.nl> Dutch translation
-Christopher Molnar <molnarc at mandrakesoft.com> build system patch
-Tim Mooney <mooney at dogbert.cc.ndsu.NoDak.edu> port to alpha-dec-osf4.0f
-Lucimar Moresco <lucimarmoresco at hotmail.com> pt_BR account templates
-G. Allen Morris III <gam3 at ann.softgams.com> for QIF core dump
-Steven Murdoch <sjmurdoch at bigfoot.com> gnc-prices fix for London exchange
-Jose Carlos Nascimento <joseca at psabs.com> Brazilian Portuguese translation
-Brent Neal <brent at baton.phys.lsu.edu> TIAA-CREF support.
-Christian Neumair <chris at gnome-de.org> Various gnome2 fixes/HIG work.
-Johnny Ernst Nielsen <j.e.nielsen at iname.com> messages Danish translation
-Stefan Nobis <stefan-ml at snobis.de> German translation patch
-Martin Norbäck <d95mback at dtek.chalmers.se> Swedish translation
-Peter Norton <spacey at inch.com> for a valiant attempt at a GTK port
-Bill Nottingham <notting at redhat.com> guile configure patch
-Peter O'Gorman <peter at pogma.com> file i/o patches, Mac OS X patches
-OmNiBuS <webmaster at obsidian.uia.net> web site graphics & content
-Gordon Oliver <gordo at pincoya.com> multiple currency status line patch
-Scott Oonk <s.oonk at comcast.net>, <scott.oonk at gmail.com> register changes for utf-8 and pango.
-Alan Orndorff <dwarf at solarisresources.com> Solaris packager
-Myroslav Opyr <mopyr at IPM.Lviv.UA> for misc patches
-Laurent Pélecq <laurent.pelecq at wanadoo.fr> i18n patches with gettext
-Sulyok Peter <sp at elte.hu> Hungarian account templates
-Alain Peyrat <Alain.Peyrat at nmu.alcatel.fr> for configure.in patches
-Zdenko Podobný <zdpo at mailbox.sk> Slovak translations
-Peter Pointner <peter at wuzel.m.isar.de> QIF import fixes, Qt patches
-Gavin Porter <maufk at csv.warwick.ac.uk> for euro style dates
-Tomas Pospisek <tpo at spin.ch> Debian patches
-Paul Poulain <famille.p.poulain at free.fr> French translations
-John Ralls <jralls at ceridwen.fremont.ca.us> MacOSX integration
-Ron Record <rr at sco.com> for SCO Unixware & OpenServer binaries
-Keith Refson <Keith.Refson at earth.ox.ac.uk> Solaris fixes
-Jerry Quinn <jlquinn at optonline.net> Bugfixes
-Andreas Rottmann <a.rottmann at gmx.at> fixes for g-wrap 1.9
-Betina Schmidt <betina-s at gmx.de> German account template
-Dirk Schoenberger <schoenberger at signsoft.com> Qt/KDE work
-Jan Schrage <jan.schrage at urz.uni-heidelberg.de> documentation patches
-Christopher Seawood <cls at seawood.org> for XbaeMatrix core dump
-Peter Selinger <selinger at users.sourceforge.net> date completion
-Alessandro Seveso <aleseveso at tiscalinet.it> messages Italian translations
-Clytie Siddall <clytie at riverland.net.au> Vietnamese translation
-Mike Simons <msimons at fsimons01.erols.com> misc configure.in patches
-Keld Simonsen <keld at dkuug.dk> messages Danish translation
-Richard Skelton <rich at brake.demon.co.uk> for Solaris cleanup
-Thomas Vander Stichele <thomas at urgent.rug.ac.be> Macro for filtering system directories
-James Strandboge <jstrand1 at rochester.rr.com> "Easy" Invoice report
-Henning Spruth <spruth at bigfoot.com> for German text & euro date rework
-Ben Stanley <bds02 at uow.edu.au> test infrastructure
-Robby Stephenson <robby.stephenson at usa.net> register & file history patches
-Robert Stocks <robert.stocks at gmail.com> additional register report options
-Michael T. Garrison Stuber <garrisonstuber at bellsouth.net> report patch
-Bartek Szady <bszx at bszxdomain.edu.eu.org> engine and build system patches
-Herbert Thoma <tma at iis.fhg.de> gnome register & euro support patches
-Tor Harald Thorland <linux at strigen.com> testing, Norwegian translation
-Nigel Titley <nigel at titley.com> British English translation
-James A. Treacy <treacy at debian.org> doc patch
-Arnold Troeger <troeger at samart.co.th> Mandrake packager
-Diane Trout <detrout at earthlink.net> scheme QIF import patch
-Nicolae Turcan <nicturcan at gmail.com> Romanian translation
-Richard -Gilligan- Uschold <uschold at cs.ucf.edu> tax report & txf export
-Tom Van Braeckel <tomvanbraeckel at gmail.com> various patches and fixes
-Matthew Vanecek <mevanecek at yahoo.com> lots of postgres backend work
-Didier Vidal <didier-devel at 9online.fr> various G2 fixes.
-Oliver Vollmer <ovo at mx.lihas.de> German account templates SKR03
-Richard Wackerbarth <rkw at dataplex.net> patch to gnc-prices, qif import fixes
-Rob Walker <rob at valinux.com> guile and register patches
-Darin Willits <darin at blueyonder.co.uk> initial budgeting prototype
-Andy Wingo <wingo at pobox.com> income per day-of-week report
-Tom Winterhalder <t.winterhalder at freesurf.ch> Swiss German account template
-David Woodhouse <dwmw2 at infradead.org> messages British translations
-Kuang-che Wu <kcwu at csie.org> Traditional Chinese translation
-Ken Yamaguchi <gooch at ic.EECS.Berkeley.EDU> QIF import fixes; MYM import
-Shimpei Yamashita <shimpei at gol.com> messages Japanese translation
-Alex Zepeda <jazepeda at pacbell.net> postgres configure patch
+Roman Bertle Austrian German account templates
+Jan-Pascal van Best MT940 importer
+Dennis Björklund Swedish translation
+Andreas Bogk Postgres backend patch
+Per Bojsen several core dump fixes
+Terry Boldt financial calculator and expression parser
+Forest Bond Budget report improvements
+Richard Braakman xml version configure patch
+Simon Britnell patch to RPM spec
+Christopher B. Browne> for perl, lots of scheme and documentation updates
+Nathan Buchanan packaging Windows binaries for release
+Johan Buret french translation
+Thomas Bushnell fix for file backups
+Eskil Bylund account type deprecation
+Paul Campbell reconcile children patch
+Conrad Canterford register bug fix
+Bill Carlson performance improvements
+David MarÃn Carreño Spanish translation of account setup.
+Tomas Cernaj GType consistency changes, register fixes
+Carol Champagne documentation & a patient GUI usability critic
+Nikos Charonitakis Greek translation
+Graham Chapman for the xacc-rpts addon package
+George Chen for MS-Money QIF's & fixes
+Albert Chin-A-Young configure.in patch
+Kenneth Christiansen Danish translation
+Matthew Condell FreeBSD patch
+Patrick Condron for webserver and T1 connection (credits to rackspace.com)
+Raphael Dechenaux register patch
+Ciaran Deignan for AIX binary version
+Glen Ditchfield updated documentation
+Tyson Dowd for config/make patches & debian maint
+Koen D'Hondt for Solaris patches to XmHTML
+Bob Drzyzgula for budgeting design notes
+Frank H. Ellenberger small things, usually germany related
+Volker Englisch QA and testing
+Frank H. Ellenberger Fix for IDR currency
+Christoph Ernst Small bugfixes and minor enhancements
+Jonathan Ernst Translations
+Stephen Evanchik Logging improvements; gtk2 conversions
+Mike Evans Bug fixes and testing.
+Joshua Facemyer / Impressus Art : New artwork.
+Paul Fenwick ASX support, Finance::Quote
+Hubert Figuiere patch to gnc-prices
+Valek Filippov messages Russian translation
+Jan-Uwe Finck for messages German translation
+Kevin Finn auto-decimal point, options, auto interest xfer patches
+Aurimas Fišeras Lithuanian Translation, general i18n
+Danny Fischer Romanian translation
+Ron Forrester for gnome patches
+Christoph Franzen German account template for Wohnungswirtschaft business
+Dave Freese for leap-year fix
+Todd T. Fries OpenBSD fix
+John Goerzen file i/o fix for 64-bit architectures
+Jeff Green Python bindings, with grant funding from Assiniboine Credit Union (http://assiniboine.mb.ca/)
+Hans de Graaff XML patches
+Daniel Hagerty patch to balance sheet report
+Mitsuo Hamada messages Japanese translations
+Otto Hammersmith for RedHat RPM version
+Eric Hanchrow updated currency documentation
+Daniel Harding Windows build tweaks; various code fixes
+Alexandru Harsanyi for core dumps, lockups, gtk work
+John Hasler engine patch
+Jon KÃ¥re Hellan misc core dump fixes
+Hendrik-Jan Heins Dutch translation
+Joachim Herb Data table option for barchart reports
+Claus Hindsgaul messages Danish translation
+Christoph Holtermann Python wrapper improvements
+Ori Hoch Hebrew translation
+Péter Hosszú Hungarian translation
+Edward J. Huff Date handling in reports, quarterly option
+Tomokazu Iwashita Japanese translation of xea
+Geert Janssens GUI fixes for Lots, autocompletion in gnc-general-search, several small fixes
+David Jafferian Delete account query code.
+Mark Jenkins Python bindings, with grant funding from Assiniboine Credit Union (http://assiniboine.mb.ca/) and Legal Aid Manitoba (http://www.legalaid.mb.ca/)
+Rich Johnson Mac OS X patch
+Miquel Jordana Vilamitjana Spanish translation of manual
+Prakash Kailasa for gnome build fixes
+Alexey Kakunin quickfill patch for Cyrillic
+Ben Kelly for Motif menu bug fix, core dump fixes
+Jeff Kletsky Various patches, including for OFX import
+Tom Kludy for SGI Irix port
+Tuomo Kohvakka Finnish translation
+Matt Kraai date accelerator bug fix
+Mantas KriauÄiÅ«nas Lithuanian Translation
+Rafał Krzewski bi module fixes
+Sven Kuenzler for SuSE README file
+Fabrice Kurz French translation
+Eneko Lacunza Spanish Translation
+Bryan Larsen guile budget report
+Chris J (Oakton) Leach autoconf patch
+Nicholas Lee scheme bug fix
+Graham Leggett for fixing a hang
+Rolf Leggewie SKR04 and gnucash for german business
+Georg Lehner Nicaraguan Spanish translation
+Ted Lemon for NetBSD port
+Yannick Le Ny French translations
+Frederic Leroy 64bit fixes, GUI improvements
+Frederic Lespez French account templates fixes.
+Chao-Hsiung Liao Traditional Chinese translation
+Grant Likely gnome and engine patches
+Vitaly Lipatov complete Russian translation, build tweaks, code cleanup
+Volodymyr M. Lisivka Ukrainian translation
+Phil Longstaff fixes for pricedb
+Duarte Loreto message and documentation Portuguese translations
+Raffael Luthiger Swiss German translation
+Lionel Elie Mamane Patches for gcc2.95 macro compatibility
+Kjartan Maraas Norwegian translations
+Heath Martin gnome patches, major register work, x86_64 support
+Matt Martin guile error handling code
+Yves-Eric Martin work on financial year end work
+Tadas Masiulionis Lithuanian Translation
+Juan Manuel GarcÃa Molina messages Spanish translation
+David Montenegro all sorts of Scheme reports
+Orestes Mas Catalan translation
+Bernard Meens Dutch translation
+Christopher Molnar build system patch
+Tim Mooney port to alpha-dec-osf4.0f
+Lucimar Moresco pt_BR account templates
+G. Allen Morris III for QIF core dump
+Steven Murdoch gnc-prices fix for London exchange
+Jose Carlos Nascimento Brazilian Portuguese translation
+Brent Neal TIAA-CREF support.
+Christian Neumair Various gnome2 fixes/HIG work.
+Johnny Ernst Nielsen messages Danish translation
+Stefan Nobis German translation patch
+Martin Norbäck Swedish translation
+Peter Norton for a valiant attempt at a GTK port
+Bill Nottingham guile configure patch
+Peter O'Gorman file i/o patches, Mac OS X patches
+OmNiBuS web site graphics & content
+Gordon Oliver multiple currency status line patch
+Scott Oonk register changes for utf-8 and pango.
+Alan Orndorff Solaris packager
+Myroslav Opyr for misc patches
+Laurent Pélecq i18n patches with gettext
+Sulyok Peter Hungarian account templates
+Alain Peyrat for configure.in patches
+Zdenko Podobný Slovak translations
+Peter Pointner QIF import fixes, Qt patches
+Gavin Porter for euro style dates
+Tomas Pospisek Debian patches
+Paul Poulain French translations
+John Ralls MacOSX integration
+Ron Record for SCO Unixware & OpenServer binaries
+Keith Refson Solaris fixes
+Jerry Quinn Bugfixes
+Andreas Rottmann fixes for g-wrap 1.9
+Betina Schmidt German account template
+Dirk Schoenberger Qt/KDE work
+Jan Schrage documentation patches
+Christopher Seawood for XbaeMatrix core dump
+Peter Selinger date completion
+Alessandro Seveso messages Italian translations
+Clytie Siddall Vietnamese translation
+Mike Simons misc configure.in patches
+Keld Simonsen messages Danish translation
+Richard Skelton for Solaris cleanup
+Thomas Vander Stichele Macro for filtering system directories
+James Strandboge "Easy" Invoice report
+Henning Spruth for German text & euro date rework
+Ben Stanley test infrastructure
+Robby Stephenson register & file history patches
+Robert Stocks additional register report options
+Michael T. Garrison Stuber report patch
+Bartek Szady engine and build system patches
+Herbert Thoma gnome register & euro support patches
+Tor Harald Thorland testing, Norwegian translation
+Nigel Titley British English translation
+James A. Treacy doc patch
+Arnold Troeger Mandrake packager
+Diane Trout scheme QIF import patch
+Nicolae Turcan Romanian translation
+Richard -Gilligan- Uschold tax report & txf export
+Tom Van Braeckel various patches and fixes
+Matthew Vanecek lots of postgres backend work
+Didier Vidal various G2 fixes.
+Oliver Vollmer German account templates SKR03
+Richard Wackerbarth patch to gnc-prices, qif import fixes
+Rob Walker guile and register patches
+Darin Willits initial budgeting prototype
+Andy Wingo income per day-of-week report
+Tom Winterhalder Swiss German account template
+David Woodhouse messages British translations
+Kuang-che Wu Traditional Chinese translation
+Ken Yamaguchi QIF import fixes; MYM import
+Shimpei Yamashita messages Japanese translation
+Alex Zepeda postgres configure patch
-... and I am sure that I have missed many others ...
+... and many others who've submitted patches ...
diff --git a/DOCUMENTERS b/DOCUMENTERS
index 062a54c..cee6c1b 100644
--- a/DOCUMENTERS
+++ b/DOCUMENTERS
@@ -8,26 +8,32 @@ http://wiki.gnucash.org/wiki/Mailing_Lists and http://wiki.gnucash.org/wiki/IRC.
Contributors:
Current -
-Bengt Thuree <bengt at thuree.com>
-Chris Lyttle <chris at wilddev.net>
-Christian Stimming <stimming at tuhh.de>
-Cristian Marchi <cri79 at libero.it>
-Dave Herman <dvherman at bigfoot.com>
-David Hampton <hampton at employees.org>
J. Alex Aycinena
-Niklas Spille <see-g at web.de>
-Patrick Schweiger <pks at spiffykitty.com>
-Yasuaki Taniguchi
-Yawar Amin
+Frank Ellenberger
+Chris Good
+Geert Janssens
+Mike Evans
+John Ralls
+David T.
Past -
-Bill Gribble <grib at billgribble.com>
-Christopher Browne <gnucash at cbbrowne.com>
-Carol Champagne <carol at io.com>
-Eric Hanchrow <offby1 at blarg.net>
-Glen Ditchfield <gjditchfield at acm.org>
-James A. Treacy <treacy at debian.org>
-Jon Lapham <lapham at extracta.com.br>
-Linas Vepstas <linas at linas.org>
-Neil Williams <linux at codehelp.co.uk>
-Robert Graham Merkel <rgmerk at mira.net>
+Yawar Amin
+Christopher Browne
+Carol Champagne
+Glen Ditchfield
+Bill Gribble
+David Hampton
+Eric Hanchrow
+Dave Herman
+Jon Lapham
+Chris Lyttle
+Cristian Marchi
+Niklas Spille
+Patrick Schweiger
+Christian Stimming
+Yasuaki Taniguchi
+Bengt Thuree
+James A. Treacy
+Linas Vepstas
+Neil Williams
+Robert Graham Merkel
commit 21bd13b91aec21fcc79f026519356ca0ba22e3c4
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Dec 17 09:45:21 2016 -0800
Update Danish and Serbian translations from the Translation Project.
diff --git a/po/da.po b/po/da.po
index 587b6d8..d6e58a8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -20,6 +20,7 @@
# billing term -> betalingsbetingelse
# book -> bog (regnskab)
# business -> forretning (afklar om det skal være virksomhed)
+# cancel -> annuller, fortryd
# Cash Flow -> pengestrømsopgørelse
# charge -> betaling
# Chart of Accounts -> kontoplan
@@ -27,6 +28,7 @@
# company -> firma
# customer -> kunde
# decimal point -> decimaltegn
+# decimal places -> decimaler
# dialog -> vindue
# due -> forfalden (due day -> forfaldsdag)
# employee -> medarbejder (jævnfør konventionsliste; ikke ansat) (søgt på alle af dem her)
@@ -80,10 +82,16 @@
# korrekt i den nuværende oversættelse).
# revenue -> indtægt
# security -> værdipapir (http://en.wikipedia.org/wiki/Bond_%28finance%29)
+# sign reverse balances -> skift fortegn
# split -> opdeling
# subtotal -> delsum (ikke brugt: undertotal)
# summary bar -> oversigtsbjælken
# tax invoice -> skatteopgørelse
+# ticker symbol -> tickersymbol (A ticker symbol or stock symbol is an abbreviation used to uniquely
+# identify publicly traded shares of a particular stock on a particular stock market.
+# A stock symbol may consist of letters, numbers or a combination of both. "Ticker
+# symbol" refers to the symbols that were printed on the ticker tape of a ticker
+# tape machine.
# value -> beløb (værdi - alt efter sammenhæng)
# vendor -> leverandør (alternativ sælger)
# void -> ugyldig
@@ -96,57 +104,59 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gnucash 2.6.10\n"
+"Project-Id-Version: gnucash 2.6.14\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-19 12:03-0800\n"
-"PO-Revision-Date: 2016-01-02 22:41+0200\n"
+"POT-Creation-Date: 2016-09-16 11:33-0700\n"
+"PO-Revision-Date: 2016-09-20 22:41+0200\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
"Language: da\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Business options
-#: ../src/app-utils/app-utils.scm:302
+#: ../src/app-utils/app-utils.scm:303
#: ../src/business/business-gnome/gncmod-business-gnome.c:117
msgid "Business"
msgstr "Forretning"
-#: ../src/app-utils/app-utils.scm:303
+#: ../src/app-utils/app-utils.scm:304
#: ../src/business/business-gnome/dialog-customer.c:923
#: ../src/business/business-gnome/dialog-vendor.c:726
+#: ../src/gnome-utils/gnc-tree-view-owner.c:380
+#: ../src/gnome-utils/gnc-tree-view-owner.c:388
#: ../src/report/business-reports/taxinvoice.eguile.scm:159
msgid "Company Name"
msgstr "Firmanavn"
-#: ../src/app-utils/app-utils.scm:304
+#: ../src/app-utils/app-utils.scm:305
msgid "Company Address"
msgstr "Firmaets adresse"
-#: ../src/app-utils/app-utils.scm:305
+#: ../src/app-utils/app-utils.scm:306
msgid "Company ID"
msgstr "Firma-id"
-#: ../src/app-utils/app-utils.scm:306
+#: ../src/app-utils/app-utils.scm:307
msgid "Company Phone Number"
msgstr "Firmaets telefonnummer"
-#: ../src/app-utils/app-utils.scm:307
+#: ../src/app-utils/app-utils.scm:308
msgid "Company Fax Number"
msgstr "Firmaets faxnummer"
-#: ../src/app-utils/app-utils.scm:308
+#: ../src/app-utils/app-utils.scm:309
msgid "Company Website URL"
msgstr "Firmaets internetside"
-#: ../src/app-utils/app-utils.scm:309
+#: ../src/app-utils/app-utils.scm:310
msgid "Company Email Address"
msgstr "Firmaets e-post-adresse"
-#: ../src/app-utils/app-utils.scm:310
+#: ../src/app-utils/app-utils.scm:311
msgid "Company Contact Person"
msgstr "Firmaets kontaktperson"
@@ -677,60 +687,60 @@ msgstr "Talfejl"
#. * 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).
-#: ../src/app-utils/gnc-ui-util.c:339
+#: ../src/app-utils/gnc-ui-util.c:338
msgid "Tax-related but has no tax code"
msgstr "Relateret til skat men har ingen skattekode"
-#: ../src/app-utils/gnc-ui-util.c:353
+#: ../src/app-utils/gnc-ui-util.c:352
msgid "Tax entity type not specified"
msgstr "Skatteentitetens type er ikke specificeret"
-#: ../src/app-utils/gnc-ui-util.c:430
+#: ../src/app-utils/gnc-ui-util.c:429
#, c-format
msgid "Tax type %s: invalid code %s for account type"
msgstr "Skattetype %s: Ugyldig kode %s for kontotype"
-#: ../src/app-utils/gnc-ui-util.c:434
+#: ../src/app-utils/gnc-ui-util.c:433
#, c-format
msgid "Not tax-related; tax type %s: invalid code %s for account type"
msgstr "Ikke relateret til skat; skattetype %s: Ugyldig kode %s for kontotype"
-#: ../src/app-utils/gnc-ui-util.c:447
+#: ../src/app-utils/gnc-ui-util.c:446
#, c-format
msgid "Invalid code %s for tax type %s"
msgstr "Ugyldig kode %s for skattetype %s"
-#: ../src/app-utils/gnc-ui-util.c:451
+#: ../src/app-utils/gnc-ui-util.c:450
#, c-format
msgid "Not tax-related; invalid code %s for tax type %s"
msgstr "Ikke relateret til skat; ugyldig kode %s for skattetype %s"
-#: ../src/app-utils/gnc-ui-util.c:469
+#: ../src/app-utils/gnc-ui-util.c:468
#, c-format
msgid "No form: code %s, tax type %s"
msgstr "Ingen formular: kode %s, skattetype %s"
-#: ../src/app-utils/gnc-ui-util.c:473
+#: ../src/app-utils/gnc-ui-util.c:472
#, c-format
msgid "Not tax-related; no form: code %s, tax type %s"
msgstr "Ikke relateret til skat; ingen formular: kode %s, skattetype %s"
-#: ../src/app-utils/gnc-ui-util.c:490 ../src/app-utils/gnc-ui-util.c:505
+#: ../src/app-utils/gnc-ui-util.c:489 ../src/app-utils/gnc-ui-util.c:504
#, c-format
msgid "No description: form %s, code %s, tax type %s"
msgstr "Ingen beskrivelse: formular %s, kode %s, skattetype %s"
-#: ../src/app-utils/gnc-ui-util.c:494 ../src/app-utils/gnc-ui-util.c:509
+#: ../src/app-utils/gnc-ui-util.c:493 ../src/app-utils/gnc-ui-util.c:508
#, c-format
msgid "Not tax-related; no description: form %s, code %s, tax type %s"
msgstr "Ikke relateret til skat; ingen beskrivelse: formular %s, kode %s, skattetype %s"
-#: ../src/app-utils/gnc-ui-util.c:532
+#: ../src/app-utils/gnc-ui-util.c:531
#, c-format
msgid "Not tax-related; %s%s: %s (code %s, tax type %s)"
msgstr "Ikke relateret til skat; %s%s: %s (kode %s, skattetype %s)"
-#: ../src/app-utils/gnc-ui-util.c:579
+#: ../src/app-utils/gnc-ui-util.c:578
#, c-format
msgid "(Tax-related subaccounts: %d)"
msgstr "(Underkonti relateret til skat: %d)"
@@ -738,35 +748,35 @@ msgstr "(Underkonti relateret til skat: %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.
-#: ../src/app-utils/gnc-ui-util.c:616
+#: ../src/app-utils/gnc-ui-util.c:615
msgid "not cleared:n"
msgstr "i"
#. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:619
+#: ../src/app-utils/gnc-ui-util.c:618
msgid "cleared:c"
msgstr "s"
#. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:622
+#: ../src/app-utils/gnc-ui-util.c:621
msgid "reconciled:y"
msgstr "a"
#. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:625
+#: ../src/app-utils/gnc-ui-util.c:624
msgid "frozen:f"
msgstr "f"
#. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:628
+#: ../src/app-utils/gnc-ui-util.c:627
msgid "void:v"
msgstr "u"
-#: ../src/app-utils/gnc-ui-util.c:669
+#: ../src/app-utils/gnc-ui-util.c:668
msgid "Opening Balances"
msgstr "Ã…bningssaldi"
-#: ../src/app-utils/gnc-ui-util.c:672
+#: ../src/app-utils/gnc-ui-util.c:671
#: ../src/import-export/qif-imp/qif-dialog-utils.scm:72
#: ../src/import-export/qif-imp/qif-dialog-utils.scm:76
#: ../src/report/business-reports/balsheet-eg.eguile.scm:200
@@ -777,7 +787,7 @@ msgstr "Overført resultat"
# Jeg kender ikke det korrekte regnskabsord for equity.
# Dette er mit bedste bud
# (optræder flere steder) CH
-#: ../src/app-utils/gnc-ui-util.c:744 ../src/engine/Account.c:3951
+#: ../src/app-utils/gnc-ui-util.c:743 ../src/engine/Account.c:3990
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2959
#: ../src/import-export/qif-imp/qif-dialog-utils.scm:71
#: ../src/import-export/qif-imp/qif-dialog-utils.scm:75
@@ -787,7 +797,7 @@ msgstr "Overført resultat"
msgid "Equity"
msgstr "Udligning"
-#: ../src/app-utils/gnc-ui-util.c:799 ../src/gnome/assistant-hierarchy.c:955
+#: ../src/app-utils/gnc-ui-util.c:798 ../src/gnome/assistant-hierarchy.c:994
#: ../src/gnome-utils/dialog-account.c:304
#: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:35
msgid "Opening Balance"
@@ -796,7 +806,7 @@ msgstr "Ã…bningssaldo"
#: ../src/app-utils/guile-util.c:906
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:8
#: ../src/gnome/gnc-plugin-page-register2.c:2466
-#: ../src/gnome/gnc-plugin-page-register.c:2631
+#: ../src/gnome/gnc-plugin-page-register.c:2674
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3199
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3204
#: ../src/register/ledger-core/split-register.c:2367
@@ -810,7 +820,7 @@ msgstr "Debet"
#: ../src/app-utils/guile-util.c:937
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:9
#: ../src/gnome/gnc-plugin-page-register2.c:2463
-#: ../src/gnome/gnc-plugin-page-register.c:2627
+#: ../src/gnome/gnc-plugin-page-register.c:2670
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2898
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2917
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2935
@@ -844,7 +854,7 @@ msgstr "Beløb ind"
#: ../src/app-utils/prefs.scm:64
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3133
-#: ../src/import-export/csv-imp/gnc-csv-model.c:70
+#: ../src/import-export/csv-imp/gnc-csv-model.c:76
msgid "Deposit"
msgstr "Indsæt"
@@ -859,8 +869,8 @@ msgstr "Modtag"
#: ../src/app-utils/prefs.scm:92
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:17
#: ../src/business/business-ledger/gncEntryLedgerModel.c:131
-#: ../src/engine/gncOwner.c:765 ../src/engine/gncOwner.c:800
-#: ../src/engine/gncOwner.c:830 ../src/engine/gncOwner.c:843
+#: ../src/engine/gncOwner.c:794 ../src/engine/gncOwner.c:829
+#: ../src/engine/gncOwner.c:859 ../src/engine/gncOwner.c:872
#: ../src/gnome/assistant-loan.c:1831 ../src/gnome/assistant-loan.c:2739
#: ../src/gnome/assistant-loan.c:2801 ../src/gnome/assistant-loan.c:2814
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2887
@@ -875,7 +885,7 @@ msgstr "Modtag"
#: ../src/register/ledger-core/split-register.c:2533
#: ../src/report/business-reports/customer-summary.scm:222
#: ../src/report/business-reports/customer-summary.scm:223
-#: ../src/report/business-reports/owner-report.scm:345
+#: ../src/report/business-reports/owner-report.scm:344
msgid "Payment"
msgstr "Betaling"
@@ -948,7 +958,7 @@ msgstr "Køb"
msgid "Charge"
msgstr "Afgift"
-#: ../src/app-utils/prefs.scm:73 ../src/engine/Account.c:3950
+#: ../src/app-utils/prefs.scm:73 ../src/engine/Account.c:3989
#: ../src/engine/gncInvoice.c:973
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3161
#: ../src/report/business-reports/customer-summary.scm:462
@@ -963,7 +973,7 @@ msgstr "Omkostning"
#. page / name / orderkey / tooltip / default
#: ../src/app-utils/prefs.scm:75
#: ../src/business/business-gnome/business-gnome-utils.c:225
-#: ../src/business/business-gnome/dialog-invoice.c:3213
+#: ../src/business/business-gnome/dialog-invoice.c:3245
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:383
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:1
#: ../src/engine/gncInvoice.c:969 ../src/gnome-search/dialog-search.c:1069
@@ -979,7 +989,7 @@ msgstr "Omkostning"
#: ../src/report/business-reports/job-report.scm:427
#: ../src/report/business-reports/taxinvoice.eguile.scm:114
#: ../src/report/business-reports/taxinvoice.scm:203
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1698
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1699
#: ../src/report/standard-reports/register.scm:838
msgid "Invoice"
msgstr "Faktura"
@@ -992,7 +1002,7 @@ msgstr "Beløb ud"
#: ../src/app-utils/prefs.scm:81
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3048
-#: ../src/import-export/csv-imp/gnc-csv-model.c:71
+#: ../src/import-export/csv-imp/gnc-csv-model.c:77
msgid "Withdrawal"
msgstr "Udtræk"
@@ -1024,8 +1034,8 @@ msgstr "Forbrug"
msgid "Sell"
msgstr "Sælg"
-#: ../src/app-utils/prefs.scm:89 ../src/engine/Account.c:3949
-#: ../src/engine/Scrub.c:393 ../src/gnome/gnc-budget-view.c:385
+#: ../src/app-utils/prefs.scm:89 ../src/engine/Account.c:3988
+#: ../src/engine/Scrub.c:393 ../src/gnome/gnc-budget-view.c:388
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2975
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3076
#: ../src/import-export/qif-imp/qif-dialog-utils.scm:32
@@ -1053,10 +1063,10 @@ msgstr "Rabat"
#: ../src/app-utils/prefs.scm:91
#: ../src/business/business-gnome/business-gnome-utils.c:219
-#: ../src/business/business-gnome/dialog-invoice.c:2368
-#: ../src/business/business-gnome/dialog-invoice.c:2543
-#: ../src/business/business-gnome/dialog-invoice.c:2544
-#: ../src/business/business-gnome/dialog-invoice.c:3201
+#: ../src/business/business-gnome/dialog-invoice.c:2371
+#: ../src/business/business-gnome/dialog-invoice.c:2546
+#: ../src/business/business-gnome/dialog-invoice.c:2547
+#: ../src/business/business-gnome/dialog-invoice.c:3233
#: ../src/engine/gncInvoice.c:971 ../src/gnome-search/dialog-search.c:1053
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3098
#: ../src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade.h:3
@@ -1142,11 +1152,11 @@ msgstr "Du kan også finde og anmelde fejlrapporter på http://bugzilla.gnome.or
msgid "To find the last stable version, please refer to http://www.gnucash.org"
msgstr "For at finde den sidste stabile version, så gå venligst til http://www.gnucash.org"
-#: ../src/bin/gnucash-bin.c:379
+#: ../src/bin/gnucash-bin.c:427
msgid "- GnuCash personal and small business finance management"
msgstr "- GnuCash - finanshåndtering for personer og små virksomheder"
-#: ../src/bin/gnucash-bin.c:385 ../src/bin/gnucash-bin.c:766
+#: ../src/bin/gnucash-bin.c:433 ../src/bin/gnucash-bin.c:814
#, c-format
msgid ""
"%s\n"
@@ -1155,7 +1165,7 @@ msgstr ""
"%s\n"
"Kør »%s --help« for at se den fulde liste over tilgængelige indstillinger for kommandolinjen.\n"
-#: ../src/bin/gnucash-bin.c:398
+#: ../src/bin/gnucash-bin.c:446
#, c-format
msgid "GnuCash %s development version"
msgstr "GnuCash %s udviklingsversion"
@@ -1169,7 +1179,7 @@ msgstr "GnuCash %s udviklingsversion"
#. 2nd %s is the scm type (svn/svk/git/bzr);
#. 3rd %s is the scm revision number;
#. 4th %s is the build date
-#: ../src/bin/gnucash-bin.c:404 ../src/gnome-utils/gnc-main-window.c:4382
+#: ../src/bin/gnucash-bin.c:452 ../src/gnome-utils/gnc-main-window.c:4385
#, c-format
msgid ""
"%s\n"
@@ -1178,7 +1188,7 @@ msgstr ""
"%s\n"
"Denne kopi blev bygget ud fra %s rev %s fra den %s."
-#: ../src/bin/gnucash-bin.c:410
+#: ../src/bin/gnucash-bin.c:458
#, c-format
msgid "GnuCash %s"
msgstr "GnuCash %s"
@@ -1186,7 +1196,7 @@ msgstr "GnuCash %s"
#. Translators: 1st %s is a fixed message, which is translated independently;
#. 2nd %s is the scm (svn/svk/git/bzr) revision number;
#. 3rd %s is the build date
-#: ../src/bin/gnucash-bin.c:415 ../src/gnome-utils/gnc-main-window.c:4389
+#: ../src/bin/gnucash-bin.c:463 ../src/gnome-utils/gnc-main-window.c:4392
#, c-format
msgid ""
"%s\n"
@@ -1195,20 +1205,20 @@ msgstr ""
"%s\n"
"Denne kopi blev bygget fra rev %s fra den %s."
-#: ../src/bin/gnucash-bin.c:516
+#: ../src/bin/gnucash-bin.c:564
msgid "No quotes retrieved. Finance::Quote isn't installed properly.\n"
msgstr ""
#. Install Price Quote Sources
-#: ../src/bin/gnucash-bin.c:599
+#: ../src/bin/gnucash-bin.c:647
msgid "Checking Finance::Quote..."
msgstr "Kontrollerer Finance::Quote ..."
-#: ../src/bin/gnucash-bin.c:607
+#: ../src/bin/gnucash-bin.c:655
msgid "Loading data..."
msgstr "Indlæser data..."
-#: ../src/bin/gnucash-bin.c:767
+#: ../src/bin/gnucash-bin.c:815
msgid ""
"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 ?"
@@ -1218,8 +1228,8 @@ msgstr ""
#: ../src/business/business-gnome/business-gnome-utils.c:73
#: ../src/business/business-gnome/business-gnome-utils.c:260
-#: ../src/business/business-gnome/dialog-invoice.c:1312
-#: ../src/business/business-gnome/dialog-invoice.c:1390
+#: ../src/business/business-gnome/dialog-invoice.c:1315
+#: ../src/business/business-gnome/dialog-invoice.c:1393
#: ../src/gnome-utils/gnc-general-select.c:214
msgid "Select..."
msgstr "Vælg ..."
@@ -1230,9 +1240,9 @@ msgid "Edit..."
msgstr "Rediger ..."
#: ../src/business/business-gnome/business-gnome-utils.c:222
-#: ../src/business/business-gnome/dialog-invoice.c:2373
-#: ../src/business/business-gnome/dialog-invoice.c:2550
-#: ../src/business/business-gnome/dialog-invoice.c:2551
+#: ../src/business/business-gnome/dialog-invoice.c:2376
+#: ../src/business/business-gnome/dialog-invoice.c:2553
+#: ../src/business/business-gnome/dialog-invoice.c:2554
msgid "Voucher"
msgstr "Bilag"
@@ -1240,7 +1250,7 @@ msgstr "Bilag"
#: ../src/business/business-gnome/business-gnome-utils.c:448
#: ../src/engine/Recurrence.c:478 ../src/engine/Recurrence.c:668
#: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:4
-#: ../src/import-export/csv-imp/gnc-csv-model.c:64
+#: ../src/import-export/csv-imp/gnc-csv-model.c:70
#: ../src/report/standard-reports/transaction.scm:685
#: ../src/report/standard-reports/transaction.scm:722
#: ../src/report/standard-reports/transaction.scm:777
@@ -1251,12 +1261,12 @@ msgid "None"
msgstr "Ingen"
#: ../src/business/business-gnome/business-gnome-utils.c:564
-#: ../src/gnome/assistant-hierarchy.c:863
+#: ../src/gnome/assistant-hierarchy.c:902
msgid "Yes"
msgstr "Ja"
#: ../src/business/business-gnome/business-gnome-utils.c:566
-#: ../src/gnome/assistant-hierarchy.c:866
+#: ../src/gnome/assistant-hierarchy.c:905
msgid "No"
msgstr "Nej"
@@ -1334,11 +1344,12 @@ msgid "Proximo"
msgstr "Proximo"
#: ../src/business/business-gnome/dialog-billterms.c:533
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:26
+#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:607
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:27
#: ../src/report/business-reports/customer-summary.scm:224
#: ../src/report/business-reports/job-report.scm:255
-#: ../src/report/business-reports/owner-report.scm:341
-#: ../src/report/business-reports/owner-report.scm:346
+#: ../src/report/business-reports/owner-report.scm:340
+#: ../src/report/business-reports/owner-report.scm:345
msgid "Unknown"
msgstr "Ukendt"
@@ -1416,10 +1427,10 @@ msgstr "Kundes fakturaer"
#: ../src/business/business-gnome/dialog-customer.c:907
#: ../src/business/business-gnome/dialog-employee.c:712
-#: ../src/business/business-gnome/dialog-invoice.c:2967
-#: ../src/business/business-gnome/dialog-invoice.c:2976
-#: ../src/business/business-gnome/dialog-invoice.c:2987
-#: ../src/business/business-gnome/dialog-invoice.c:3240
+#: ../src/business/business-gnome/dialog-invoice.c:2999
+#: ../src/business/business-gnome/dialog-invoice.c:3008
+#: ../src/business/business-gnome/dialog-invoice.c:3019
+#: ../src/business/business-gnome/dialog-invoice.c:3272
#: ../src/business/business-gnome/dialog-job.c:549
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:1
msgid "Process Payment"
@@ -1445,12 +1456,12 @@ msgstr "Kontakt"
#. FALL THROUGH
#: ../src/business/business-gnome/dialog-customer.c:932
-#: ../src/business/business-gnome/dialog-invoice.c:3112
-#: ../src/business/business-gnome/dialog-invoice.c:3253
+#: ../src/business/business-gnome/dialog-invoice.c:3144
+#: ../src/business/business-gnome/dialog-invoice.c:3285
#: ../src/business/business-gnome/dialog-job.c:575
#: ../src/business/business-gnome/dialog-order.c:885
#: ../src/business/business-gnome/dialog-vendor.c:735
-#: ../src/report/business-reports/aging.scm:464
+#: ../src/report/business-reports/aging.scm:556
#: ../src/report/business-reports/owner-report.scm:73
msgid "Company"
msgstr "Firma"
@@ -1459,6 +1470,7 @@ msgstr "Firma"
#: ../src/business/business-gnome/dialog-employee.c:734
#: ../src/business/business-gnome/dialog-job.c:579
#: ../src/business/business-gnome/dialog-vendor.c:737
+#: ../src/gnome-utils/gnc-tree-view-owner.c:377
msgid "ID #"
msgstr "Id #"
@@ -1513,7 +1525,8 @@ msgid "Employee Username"
msgstr "Medarbejderbrugernavn"
#: ../src/business/business-gnome/dialog-employee.c:725
-#: ../src/business/business-gnome/dialog-invoice.c:3092
+#: ../src/business/business-gnome/dialog-invoice.c:3124
+#: ../src/gnome-utils/gnc-tree-view-owner.c:392
msgid "Employee Name"
msgstr "Medarbejdernavn"
@@ -1523,13 +1536,14 @@ msgid "Username"
msgstr "Brugernavn"
#: ../src/business/business-gnome/dialog-employee.c:736
-#: ../src/gnome/dialog-sx-editor2.c:1757 ../src/gnome/dialog-sx-editor.c:1792
-#: ../src/gnome/dialog-tax-info.c:1150 ../src/gnome-utils/gnc-dense-cal.c:337
+#: ../src/gnome/dialog-sx-editor2.c:1762 ../src/gnome/dialog-sx-editor.c:1798
+#: ../src/gnome/dialog-tax-info.c:1153 ../src/gnome-utils/gnc-dense-cal.c:337
#: ../src/gnome-utils/gnc-tree-model-budget.c:96
#: ../src/gnome-utils/gnc-tree-view-commodity.c:396
+#: ../src/gnome-utils/gnc-tree-view-owner.c:376
#: ../src/gnome-utils/gnc-tree-view-sx-list.c:163
#: ../src/gnome-utils/gtkbuilder/gnc-date-format.glade.h:8
-#: ../src/report/business-reports/aging.scm:353
+#: ../src/report/business-reports/aging.scm:366
msgid "Name"
msgstr "Navn"
@@ -1556,26 +1570,26 @@ msgid "This entry is attached to an order and will be deleted from that as well!
msgstr ""
#: ../src/business/business-gnome/dialog-invoice.c:692
-#: ../src/business/business-gnome/dialog-invoice.c:3021
-#: ../src/business/business-gnome/dialog-invoice.c:3055
-#: ../src/business/business-gnome/dialog-invoice.c:3089
+#: ../src/business/business-gnome/dialog-invoice.c:3053
+#: ../src/business/business-gnome/dialog-invoice.c:3087
+#: ../src/business/business-gnome/dialog-invoice.c:3121
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2836
#: ../src/register/ledger-core/split-register-model.c:231
-#: ../src/report/business-reports/aging.scm:393
+#: ../src/report/business-reports/aging.scm:406
#: ../src/report/business-reports/easy-invoice.scm:304
#: ../src/report/business-reports/fancy-invoice.scm:898
#: ../src/report/business-reports/invoice.scm:725
#: ../src/report/business-reports/job-report.scm:44
#: ../src/report/business-reports/owner-report.scm:51
-#: ../src/report/business-reports/owner-report.scm:570
+#: ../src/report/business-reports/owner-report.scm:569
#: ../src/report/business-reports/taxinvoice.eguile.scm:243
msgid "Due Date"
msgstr "Forfaldsdato"
#. Should be using standard label for due date?
#: ../src/business/business-gnome/dialog-invoice.c:693
-#: ../src/report/business-reports/aging.scm:394
-#: ../src/report/business-reports/owner-report.scm:571
+#: ../src/report/business-reports/aging.scm:407
+#: ../src/report/business-reports/owner-report.scm:570
msgid "Post Date"
msgstr "Bogføringsdato"
@@ -1596,38 +1610,38 @@ msgid "Do you really want to post the invoice?"
msgstr "Er du sikker på, at du vil bogføre fakturaen?"
#. Fill in the conversion prices with feedback from the user
-#: ../src/business/business-gnome/dialog-invoice.c:823
+#: ../src/business/business-gnome/dialog-invoice.c:826
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 ""
-#: ../src/business/business-gnome/dialog-invoice.c:953
+#: ../src/business/business-gnome/dialog-invoice.c:956
msgid "The post action was canceled because not all exchange rates were given."
-msgstr "Bogføringshandlingen blev afbrudt da ikke alle vekselkurser var angivet."
+msgstr "Bogføringshandlingen blev annulleret, da ikke alle vekselkurser var angivet."
-#: ../src/business/business-gnome/dialog-invoice.c:1222
-#: ../src/gnome/window-reconcile2.c:1142 ../src/gnome/window-reconcile.c:1142
+#: ../src/business/business-gnome/dialog-invoice.c:1225
+#: ../src/gnome/window-reconcile2.c:1142 ../src/gnome/window-reconcile.c:1179
msgid "Total:"
msgstr "Total:"
-#: ../src/business/business-gnome/dialog-invoice.c:1228
+#: ../src/business/business-gnome/dialog-invoice.c:1231
msgid "Subtotal:"
msgstr "Delsum:"
-#: ../src/business/business-gnome/dialog-invoice.c:1229
+#: ../src/business/business-gnome/dialog-invoice.c:1232
msgid "Tax:"
msgstr "Skat:"
-#: ../src/business/business-gnome/dialog-invoice.c:1233
+#: ../src/business/business-gnome/dialog-invoice.c:1236
msgid "Total Cash:"
msgstr "Samlet beløb:"
-#: ../src/business/business-gnome/dialog-invoice.c:1234
+#: ../src/business/business-gnome/dialog-invoice.c:1237
msgid "Total Charge:"
msgstr "Samlet betaling:"
#. Set the type label
-#: ../src/business/business-gnome/dialog-invoice.c:1703
-#: ../src/business/business-gnome/dialog-payment.c:1010
+#: ../src/business/business-gnome/dialog-invoice.c:1706
+#: ../src/business/business-gnome/dialog-payment.c:1024
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:22
#: ../src/engine/gncInvoice.c:977
#: ../src/report/business-reports/easy-invoice.scm:717
@@ -1642,148 +1656,154 @@ msgstr "Samlet betaling:"
msgid "Credit Note"
msgstr "Kreditnota"
-#: ../src/business/business-gnome/dialog-invoice.c:1922
-#: ../src/business/business-gnome/dialog-invoice.c:1941
-#: ../src/business/business-gnome/dialog-invoice.c:1960
+#: ../src/business/business-gnome/dialog-invoice.c:1925
+#: ../src/business/business-gnome/dialog-invoice.c:1944
+#: ../src/business/business-gnome/dialog-invoice.c:1963
msgid "New Credit Note"
msgstr "Ny kreditnota"
-#: ../src/business/business-gnome/dialog-invoice.c:1923
+#: ../src/business/business-gnome/dialog-invoice.c:1926
#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:275
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:21
#: ../src/gnome-search/dialog-search.c:1071
msgid "New Invoice"
msgstr "Ny faktura"
-#: ../src/business/business-gnome/dialog-invoice.c:1928
-#: ../src/business/business-gnome/dialog-invoice.c:1947
-#: ../src/business/business-gnome/dialog-invoice.c:1966
+#: ../src/business/business-gnome/dialog-invoice.c:1931
+#: ../src/business/business-gnome/dialog-invoice.c:1950
+#: ../src/business/business-gnome/dialog-invoice.c:1969
msgid "Edit Credit Note"
msgstr "Rediger kreditnota"
-#: ../src/business/business-gnome/dialog-invoice.c:1929
+#: ../src/business/business-gnome/dialog-invoice.c:1932
msgid "Edit Invoice"
msgstr "Rediger faktura"
-#: ../src/business/business-gnome/dialog-invoice.c:1932
-#: ../src/business/business-gnome/dialog-invoice.c:1951
-#: ../src/business/business-gnome/dialog-invoice.c:1970
+#: ../src/business/business-gnome/dialog-invoice.c:1935
+#: ../src/business/business-gnome/dialog-invoice.c:1954
+#: ../src/business/business-gnome/dialog-invoice.c:1973
msgid "View Credit Note"
msgstr "Vis kreditnota"
-#: ../src/business/business-gnome/dialog-invoice.c:1933
+#: ../src/business/business-gnome/dialog-invoice.c:1936
msgid "View Invoice"
msgstr "Vis faktura"
-#: ../src/business/business-gnome/dialog-invoice.c:1942
+#: ../src/business/business-gnome/dialog-invoice.c:1945
#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:274
#: ../src/gnome-search/dialog-search.c:1055
msgid "New Bill"
msgstr "Ny regning"
-#: ../src/business/business-gnome/dialog-invoice.c:1948
+#: ../src/business/business-gnome/dialog-invoice.c:1951
msgid "Edit Bill"
msgstr "Rediger regning"
-#: ../src/business/business-gnome/dialog-invoice.c:1952
+#: ../src/business/business-gnome/dialog-invoice.c:1955
msgid "View Bill"
msgstr "Vis regning"
-#: ../src/business/business-gnome/dialog-invoice.c:1961
+#: ../src/business/business-gnome/dialog-invoice.c:1964
#: ../src/gnome-search/dialog-search.c:1067
msgid "New Expense Voucher"
msgstr "Nyt udgiftsbilag"
-#: ../src/business/business-gnome/dialog-invoice.c:1967
+#: ../src/business/business-gnome/dialog-invoice.c:1970
msgid "Edit Expense Voucher"
msgstr "Rediger udgiftsbilag"
-#: ../src/business/business-gnome/dialog-invoice.c:1971
+#: ../src/business/business-gnome/dialog-invoice.c:1974
msgid "View Expense Voucher"
msgstr "Vis udgiftsbilag"
-#: ../src/business/business-gnome/dialog-invoice.c:2367
-#: ../src/business/business-gnome/dialog-invoice.c:2542
+#: ../src/business/business-gnome/dialog-invoice.c:2370
+#: ../src/business/business-gnome/dialog-invoice.c:2545
msgid "Bill Information"
msgstr "Fakturasoplysninger"
-#: ../src/business/business-gnome/dialog-invoice.c:2369
-#: ../src/business/business-gnome/dialog-invoice.c:2545
-#: ../src/business/business-gnome/dialog-invoice.c:3062
+#: ../src/business/business-gnome/dialog-invoice.c:2372
+#: ../src/business/business-gnome/dialog-invoice.c:2548
+#: ../src/business/business-gnome/dialog-invoice.c:3094
msgid "Bill ID"
msgstr "Regnings-id"
-#: ../src/business/business-gnome/dialog-invoice.c:2372
-#: ../src/business/business-gnome/dialog-invoice.c:2549
+#: ../src/business/business-gnome/dialog-invoice.c:2375
+#: ../src/business/business-gnome/dialog-invoice.c:2552
msgid "Voucher Information"
msgstr "Bilagsoplysninger"
-#: ../src/business/business-gnome/dialog-invoice.c:2374
-#: ../src/business/business-gnome/dialog-invoice.c:2552
-#: ../src/business/business-gnome/dialog-invoice.c:3096
+#: ../src/business/business-gnome/dialog-invoice.c:2377
+#: ../src/business/business-gnome/dialog-invoice.c:2555
+#: ../src/business/business-gnome/dialog-invoice.c:3128
msgid "Voucher ID"
msgstr "Bilags-id"
-#: ../src/business/business-gnome/dialog-invoice.c:2865
+#: ../src/business/business-gnome/dialog-invoice.c:2873
msgid "Date of duplicated entries"
msgstr "Dato for duplikerede poster"
-#: ../src/business/business-gnome/dialog-invoice.c:2900
+#: ../src/business/business-gnome/dialog-invoice.c:2928
+msgid ""
+"One or more selected invoices have already been posted.\n"
+"Re-check your selection."
+msgstr ""
+
+#: ../src/business/business-gnome/dialog-invoice.c:2932
msgid "Do you really want to post these invoices?"
msgstr "Er du sikker på, at du vil bogføre disse fakturaer?"
-#: ../src/business/business-gnome/dialog-invoice.c:2966
+#: ../src/business/business-gnome/dialog-invoice.c:2998
msgid "View/Edit Invoice"
msgstr "Vis/rediger faktura"
-#: ../src/business/business-gnome/dialog-invoice.c:2968
-#: ../src/business/business-gnome/dialog-invoice.c:2977
-#: ../src/business/business-gnome/dialog-invoice.c:2988
+#: ../src/business/business-gnome/dialog-invoice.c:3000
+#: ../src/business/business-gnome/dialog-invoice.c:3009
+#: ../src/business/business-gnome/dialog-invoice.c:3020
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:261
#: ../src/gnome/gnc-plugin-page-register2.c:480
-#: ../src/gnome/gnc-plugin-page-register.c:483
+#: ../src/gnome/gnc-plugin-page-register.c:485
msgid "Duplicate"
msgstr "Dublet"
-#: ../src/business/business-gnome/dialog-invoice.c:2969
-#: ../src/business/business-gnome/dialog-invoice.c:2978
-#: ../src/business/business-gnome/dialog-invoice.c:2989
+#: ../src/business/business-gnome/dialog-invoice.c:3001
+#: ../src/business/business-gnome/dialog-invoice.c:3010
+#: ../src/business/business-gnome/dialog-invoice.c:3021
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:265
msgid "Post"
msgstr "Bogfør"
-#: ../src/business/business-gnome/dialog-invoice.c:2970
-#: ../src/business/business-gnome/dialog-invoice.c:2979
-#: ../src/business/business-gnome/dialog-invoice.c:2990
+#: ../src/business/business-gnome/dialog-invoice.c:3002
+#: ../src/business/business-gnome/dialog-invoice.c:3011
+#: ../src/business/business-gnome/dialog-invoice.c:3022
msgid "Printable Report"
msgstr "Rapport til udskrivning"
-#: ../src/business/business-gnome/dialog-invoice.c:2975
-#: ../src/business/business-gnome/dialog-invoice.c:3239
+#: ../src/business/business-gnome/dialog-invoice.c:3007
+#: ../src/business/business-gnome/dialog-invoice.c:3271
msgid "View/Edit Bill"
msgstr "Vis/rediger regning"
#. Translators: The terms 'Voucher' and 'Expense Voucher' are used
#. interchangeably in gnucash and mean the same thing.
-#: ../src/business/business-gnome/dialog-invoice.c:2986
+#: ../src/business/business-gnome/dialog-invoice.c:3018
msgid "View/Edit Voucher"
msgstr "Vis/rediger bilag"
-#: ../src/business/business-gnome/dialog-invoice.c:3000
+#: ../src/business/business-gnome/dialog-invoice.c:3032
msgid "Invoice Owner"
msgstr "Fakturaejer"
-#: ../src/business/business-gnome/dialog-invoice.c:3003
+#: ../src/business/business-gnome/dialog-invoice.c:3035
#: ../src/report/business-reports/easy-invoice.scm:339
#: ../src/report/business-reports/fancy-invoice.scm:329
#: ../src/report/business-reports/invoice.scm:314
msgid "Invoice Notes"
msgstr "Fakturabemærkninger"
-#: ../src/business/business-gnome/dialog-invoice.c:3006
-#: ../src/business/business-gnome/dialog-invoice.c:3040
-#: ../src/business/business-gnome/dialog-invoice.c:3074
-#: ../src/business/business-gnome/dialog-invoice.c:3103
+#: ../src/business/business-gnome/dialog-invoice.c:3038
+#: ../src/business/business-gnome/dialog-invoice.c:3072
+#: ../src/business/business-gnome/dialog-invoice.c:3106
+#: ../src/business/business-gnome/dialog-invoice.c:3135
#: ../src/business/business-gnome/dialog-job.c:562
#: ../src/business/business-gnome/dialog-job.c:573
#: ../src/business/business-gnome/dialog-order.c:883
@@ -1796,15 +1816,15 @@ msgstr "Fakturabemærkninger"
msgid "Billing ID"
msgstr "Regnings-id"
-#: ../src/business/business-gnome/dialog-invoice.c:3009
-#: ../src/business/business-gnome/dialog-invoice.c:3043
-#: ../src/business/business-gnome/dialog-invoice.c:3077
+#: ../src/business/business-gnome/dialog-invoice.c:3041
+#: ../src/business/business-gnome/dialog-invoice.c:3075
+#: ../src/business/business-gnome/dialog-invoice.c:3109
msgid "Is Paid?"
msgstr "Er betalt?"
-#: ../src/business/business-gnome/dialog-invoice.c:3012
-#: ../src/business/business-gnome/dialog-invoice.c:3046
-#: ../src/business/business-gnome/dialog-invoice.c:3080
+#: ../src/business/business-gnome/dialog-invoice.c:3044
+#: ../src/business/business-gnome/dialog-invoice.c:3078
+#: ../src/business/business-gnome/dialog-invoice.c:3112
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:5
#: ../src/gnome/dialog-find-transactions2.c:125
#: ../src/gnome/dialog-find-transactions.c:124
@@ -1812,57 +1832,57 @@ msgstr "Er betalt?"
msgid "Date Posted"
msgstr "Dato bogført"
-#: ../src/business/business-gnome/dialog-invoice.c:3015
-#: ../src/business/business-gnome/dialog-invoice.c:3049
-#: ../src/business/business-gnome/dialog-invoice.c:3083
+#: ../src/business/business-gnome/dialog-invoice.c:3047
+#: ../src/business/business-gnome/dialog-invoice.c:3081
+#: ../src/business/business-gnome/dialog-invoice.c:3115
msgid "Is Posted?"
msgstr "Er bogført?"
-#: ../src/business/business-gnome/dialog-invoice.c:3018
-#: ../src/business/business-gnome/dialog-invoice.c:3052
-#: ../src/business/business-gnome/dialog-invoice.c:3086
+#: ../src/business/business-gnome/dialog-invoice.c:3050
+#: ../src/business/business-gnome/dialog-invoice.c:3084
+#: ../src/business/business-gnome/dialog-invoice.c:3118
#: ../src/business/business-gnome/dialog-order.c:872
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:4
#: ../src/business/business-gnome/gtkbuilder/dialog-order.glade.h:3
msgid "Date Opened"
msgstr "Dato åbnet"
-#: ../src/business/business-gnome/dialog-invoice.c:3024
-#: ../src/business/business-gnome/dialog-invoice.c:3058
+#: ../src/business/business-gnome/dialog-invoice.c:3056
+#: ../src/business/business-gnome/dialog-invoice.c:3090
msgid "Company Name "
msgstr "Firmanavn "
-#: ../src/business/business-gnome/dialog-invoice.c:3028
+#: ../src/business/business-gnome/dialog-invoice.c:3060
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:3
msgid "Invoice ID"
msgstr "Faktura-id"
-#: ../src/business/business-gnome/dialog-invoice.c:3034
+#: ../src/business/business-gnome/dialog-invoice.c:3066
msgid "Bill Owner"
msgstr "Regningsejer"
-#: ../src/business/business-gnome/dialog-invoice.c:3037
+#: ../src/business/business-gnome/dialog-invoice.c:3069
msgid "Bill Notes"
msgstr "Bemærkninger til regning"
-#: ../src/business/business-gnome/dialog-invoice.c:3068
+#: ../src/business/business-gnome/dialog-invoice.c:3100
msgid "Voucher Owner"
msgstr "Bilagsejer"
-#: ../src/business/business-gnome/dialog-invoice.c:3071
+#: ../src/business/business-gnome/dialog-invoice.c:3103
msgid "Voucher Notes"
msgstr "Bemærkninger til bilag"
-#: ../src/business/business-gnome/dialog-invoice.c:3105
+#: ../src/business/business-gnome/dialog-invoice.c:3137
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:2
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:7
-#: ../src/gnome/dialog-lot-viewer.c:831 ../src/gnome/dialog-tax-info.c:1189
+#: ../src/gnome/dialog-lot-viewer.c:831 ../src/gnome/dialog-tax-info.c:1192
#: ../src/gnome-utils/gnc-tree-view-account.c:732
-#: ../src/gnome-utils/gnc-tree-view-owner.c:402
+#: ../src/gnome-utils/gnc-tree-view-owner.c:429
#: ../src/gnome-utils/gnc-tree-view-price.c:448
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2972
#: ../src/import-export/csv-exp/csv-transactions-export.c:421
-#: ../src/register/ledger-core/split-register-model.c:346
+#: ../src/register/ledger-core/split-register-model.c:353
#: ../src/report/business-reports/customer-summary.scm:69
#: ../src/report/business-reports/job-report.scm:46
#: ../src/report/business-reports/owner-report.scm:53
@@ -1871,33 +1891,33 @@ msgstr "Bemærkninger til bilag"
msgid "Type"
msgstr "Type"
-#: ../src/business/business-gnome/dialog-invoice.c:3107
+#: ../src/business/business-gnome/dialog-invoice.c:3139
#: ../src/register/ledger-core/split-register-model.c:300
msgid "Paid"
msgstr "Betalt"
-#: ../src/business/business-gnome/dialog-invoice.c:3110
+#: ../src/business/business-gnome/dialog-invoice.c:3142
msgid "Posted"
msgstr "Bogført"
-#: ../src/business/business-gnome/dialog-invoice.c:3115
-#: ../src/business/business-gnome/dialog-invoice.c:3255
+#: ../src/business/business-gnome/dialog-invoice.c:3147
+#: ../src/business/business-gnome/dialog-invoice.c:3287
#: ../src/report/business-reports/easy-invoice.scm:805
msgid "Due"
msgstr "Forfalden"
-#: ../src/business/business-gnome/dialog-invoice.c:3117
+#: ../src/business/business-gnome/dialog-invoice.c:3149
#: ../src/business/business-gnome/dialog-order.c:890
#: ../src/gnome/dialog-lot-viewer.c:837
msgid "Opened"
msgstr "Ã…bnet"
-#: ../src/business/business-gnome/dialog-invoice.c:3119
+#: ../src/business/business-gnome/dialog-invoice.c:3151
#: ../src/business/business-gnome/dialog-order.c:892
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:19
#: ../src/gnome/dialog-lot-viewer.c:914 ../src/gnome/reconcile-view.c:381
#: ../src/gnome/reconcile-view.c:385
-#: ../src/import-export/csv-imp/gnc-csv-model.c:66
+#: ../src/import-export/csv-imp/gnc-csv-model.c:72
#: ../src/register/ledger-core/split-register-model.c:246
#: ../src/register/ledger-core/split-register-model.c:266
#: ../src/report/standard-reports/general-journal.scm:110
@@ -1911,15 +1931,15 @@ msgstr "Ã…bnet"
msgid "Num"
msgstr "Nr."
-#: ../src/business/business-gnome/dialog-invoice.c:3200
+#: ../src/business/business-gnome/dialog-invoice.c:3232
msgid "Find Bill"
msgstr "Find regning"
-#: ../src/business/business-gnome/dialog-invoice.c:3206
+#: ../src/business/business-gnome/dialog-invoice.c:3238
msgid "Find Expense Voucher"
msgstr "Find udgiftsbilag"
-#: ../src/business/business-gnome/dialog-invoice.c:3207
+#: ../src/business/business-gnome/dialog-invoice.c:3239
#: ../src/gnome-search/dialog-search.c:1065
#: ../src/report/business-reports/easy-invoice.scm:712
#: ../src/report/business-reports/fancy-invoice.scm:811
@@ -1927,27 +1947,27 @@ msgstr "Find udgiftsbilag"
msgid "Expense Voucher"
msgstr "Udgiftsbilag"
-#: ../src/business/business-gnome/dialog-invoice.c:3212
+#: ../src/business/business-gnome/dialog-invoice.c:3244
msgid "Find Invoice"
msgstr "Find faktura"
#. Translators: This abbreviation is the column heading for
#. the condition "Is this invoice a Credit Note?"
-#: ../src/business/business-gnome/dialog-invoice.c:3249
+#: ../src/business/business-gnome/dialog-invoice.c:3281
msgid "CN?"
msgstr ""
#. note the "Amount" multichoice option here
-#: ../src/business/business-gnome/dialog-invoice.c:3251
+#: ../src/business/business-gnome/dialog-invoice.c:3283
#: ../src/gnome/dialog-lot-viewer.c:926 ../src/gnome/reconcile-view.c:373
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2992
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3004
#: ../src/import-export/aqb/dialog-ab.glade.h:34
-#: ../src/import-export/import-main-matcher.c:476
+#: ../src/import-export/import-main-matcher.c:464
#: ../src/import-export/import-match-picker.c:345
#: ../src/import-export/import-match-picker.c:385
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3498
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3535
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3504
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3541
#: ../src/report/business-reports/customer-summary.scm:71
#: ../src/report/business-reports/job-report.scm:48
#: ../src/report/business-reports/owner-report.scm:57
@@ -1967,14 +1987,14 @@ msgstr "Beløb"
#. Translators: %d is the number of bills due. This is a
#. ngettext(3) message.
-#: ../src/business/business-gnome/dialog-invoice.c:3305
+#: ../src/business/business-gnome/dialog-invoice.c:3337
#, c-format
msgid "The following bill is due:"
msgid_plural "The following %d bills are due:"
msgstr[0] "Den følgende regning er forfalden:"
msgstr[1] "De følgende %d regninger er forfaldne:"
-#: ../src/business/business-gnome/dialog-invoice.c:3310
+#: ../src/business/business-gnome/dialog-invoice.c:3342
msgid "Due Bills Reminder"
msgstr "PÃ¥mindelse om forfaldne regninger"
@@ -2013,12 +2033,14 @@ msgstr "Kun aktive?"
#: ../src/business/business-gnome/dialog-job.c:564
#: ../src/business/business-gnome/gtkbuilder/dialog-job.glade.h:2
+#: ../src/gnome-utils/gnc-tree-view-owner.c:385
msgid "Job Number"
msgstr "Jobnummer"
#: ../src/business/business-gnome/dialog-job.c:566
#: ../src/business/business-gnome/dialog-job.c:577
#: ../src/business/business-gnome/gtkbuilder/dialog-job.glade.h:3
+#: ../src/gnome-utils/gnc-tree-view-owner.c:384
msgid "Job Name"
msgstr "Jobnavn"
@@ -2085,27 +2107,27 @@ msgstr "Lukket"
msgid "Find Order"
msgstr "Find ordre"
-#: ../src/business/business-gnome/dialog-payment.c:203
+#: ../src/business/business-gnome/dialog-payment.c:206
msgid "You must enter a valid account name for posting."
msgstr "Du skal indtaste et gyldigt kontonavn for bogføring."
-#: ../src/business/business-gnome/dialog-payment.c:211
+#: ../src/business/business-gnome/dialog-payment.c:214
msgid "You must select a company for payment processing."
msgstr "Du skal vælge et firma til betalingsprocessen."
-#: ../src/business/business-gnome/dialog-payment.c:232
+#: ../src/business/business-gnome/dialog-payment.c:235
msgid "You must select a transfer account from the account tree."
msgstr "Du skal vælge en overførselskonto fra kontotræet."
-#: ../src/business/business-gnome/dialog-payment.c:426
+#: ../src/business/business-gnome/dialog-payment.c:439
msgid "Pre-Payment"
msgstr "Forudbetaling"
-#: ../src/business/business-gnome/dialog-payment.c:715
+#: ../src/business/business-gnome/dialog-payment.c:728
msgid "The transfer and post accounts are associated with different currencies. Please specify the conversion rate."
msgstr "Overførsel- og bogføringskonti er forbundet med forskellige valutaer. Angiv venligst konverteringsforholdet."
-#: ../src/business/business-gnome/dialog-payment.c:1108
+#: ../src/business/business-gnome/dialog-payment.c:1122
#, 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?"
msgstr "Du har ingen gyldige »Bogfør på«-konti. Opret venligst en konto af typen »%s« før du fortsætter med at behandle denne betaling. Måske du først skal oprette en faktura eller regning?"
@@ -2417,9 +2439,9 @@ msgstr "Kopi"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:124
#: ../src/gnome/gnc-plugin-page-register2.c:236
-#: ../src/gnome/gnc-plugin-page-register.c:241
+#: ../src/gnome/gnc-plugin-page-register.c:243
#: ../src/gnome-utils/gnc-main-window.c:315
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1028
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1029
msgid "_Paste"
msgstr "_Indsæt"
@@ -2465,18 +2487,18 @@ msgstr "Gem den aktuelle post"
#. Add the Cancel button for the matcher
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:156
-#: ../src/gnome/window-reconcile2.c:2166 ../src/gnome/window-reconcile.c:2166
+#: ../src/gnome/window-reconcile2.c:2166 ../src/gnome/window-reconcile.c:2206
#: ../src/import-export/csv-imp/assistant-csv-trans-import.c:1473
msgid "_Cancel"
-msgstr "_Annullér"
+msgstr "_Annuller"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:157
msgid "Cancel the current entry"
-msgstr "Afbryd den aktuelle post"
+msgstr "Annuller den aktuelle post"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:161
#: ../src/gnome/gnc-plugin-page-sx-list.c:158
-#: ../src/gnome/window-reconcile2.c:2208 ../src/gnome/window-reconcile.c:2208
+#: ../src/gnome/window-reconcile2.c:2208 ../src/gnome/window-reconcile.c:2248
msgid "_Delete"
msgstr "_Slet"
@@ -2597,13 +2619,13 @@ msgstr "Sortér efter beskrivelse"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:258
#: ../src/gnome/gnc-plugin-page-register2.c:477
-#: ../src/gnome/gnc-plugin-page-register.c:480
+#: ../src/gnome/gnc-plugin-page-register.c:482
msgid "Enter"
msgstr "Retur"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:259
#: ../src/gnome/gnc-plugin-page-register2.c:478
-#: ../src/gnome/gnc-plugin-page-register.c:481
+#: ../src/gnome/gnc-plugin-page-register.c:483
#: ../src/gnome-utils/gnc-cell-renderer-date.c:158
msgid "Cancel"
msgstr "Annullér"
@@ -2612,7 +2634,7 @@ msgstr "Annullér"
#: ../src/gnome/gnc-plugin-page-account-tree.c:345
#: ../src/gnome/gnc-plugin-page-budget.c:177
#: ../src/gnome/gnc-plugin-page-register2.c:479
-#: ../src/gnome/gnc-plugin-page-register.c:482
+#: ../src/gnome/gnc-plugin-page-register.c:484
msgid "Delete"
msgstr "Slet"
@@ -2628,7 +2650,7 @@ msgstr "Ned"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:264
#: ../src/gnome/gnc-plugin-page-register2.c:483
-#: ../src/gnome/gnc-plugin-page-register.c:486
+#: ../src/gnome/gnc-plugin-page-register.c:488
msgid "Blank"
msgstr "Tom"
@@ -2684,7 +2706,7 @@ msgstr "Slet den valgte ejer"
#: ../src/gnome/gnc-plugin-page-account-tree.c:231
#: ../src/gnome/gnc-plugin-page-budget.c:157
#: ../src/gnome/gnc-plugin-page-register2.c:319
-#: ../src/gnome/gnc-plugin-page-register.c:333
+#: ../src/gnome/gnc-plugin-page-register.c:335
#: ../src/gnome-utils/gnc-main-window.c:332
msgid "_Filter By..."
msgstr "_Filtrer efter ..."
@@ -2707,7 +2729,7 @@ msgstr "Opret et nyt bilag"
#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:202
#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:277
-#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:897
+#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:899
msgid "Vendor Listing"
msgstr "Leverandørliste"
@@ -2717,7 +2739,7 @@ msgstr "Vis overblik over leverandøralder for alle leverandører"
#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:207
#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:278
-#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:903
+#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:905
msgid "Customer Listing"
msgstr "Kundeliste"
@@ -2727,7 +2749,7 @@ msgstr "Vis overblik over kundealder for alle kunder"
#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:212
#: ../src/report/business-reports/job-report.scm:580
-#: ../src/report/business-reports/owner-report.scm:829
+#: ../src/report/business-reports/owner-report.scm:828
msgid "Vendor Report"
msgstr "Leverandørrapport"
@@ -2737,7 +2759,7 @@ msgstr "Vis leverandørrapport"
#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:217
#: ../src/report/business-reports/job-report.scm:574
-#: ../src/report/business-reports/owner-report.scm:820
+#: ../src/report/business-reports/owner-report.scm:819
msgid "Customer Report"
msgstr "Kunderapport"
@@ -2747,7 +2769,7 @@ msgstr "Vis kunderapport"
#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:222
#: ../src/report/business-reports/job-report.scm:583
-#: ../src/report/business-reports/owner-report.scm:838
+#: ../src/report/business-reports/owner-report.scm:837
msgid "Employee Report"
msgstr "Medarbejderrapport"
@@ -2778,28 +2800,28 @@ msgstr "Nyt bilag"
msgid "Owners"
msgstr "Ejere"
-#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:608
+#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:610
msgid "Customers"
msgstr "Kunder"
-#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:612
+#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:614
msgid "Jobs"
msgstr "Job"
-#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:616
+#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:618
msgid "Vendors"
msgstr "Leverandører"
-#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:620
+#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:622
msgid "Employees"
msgstr "Medarbejdere"
-#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:1059
+#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:1061
#: ../src/gnome/gnc-plugin-page-account-tree.c:1175
msgid "(no name)"
msgstr "(intet navn)"
-#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:1067
+#: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:1069
#, c-format
msgid ""
"The owner %s will be deleted.\n"
@@ -2923,7 +2945,7 @@ msgstr ""
#: ../src/business/business-gnome/gtkbuilder/business-prefs.glade.h:1
#: ../src/report/business-reports/invoice.scm:826
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1690
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1691
msgid "Printable Invoice"
msgstr "Faktura der kan udskrives"
@@ -2932,19 +2954,19 @@ msgstr "Faktura der kan udskrives"
#: ../src/report/business-reports/taxinvoice.eguile.scm:435
#: ../src/report/business-reports/taxinvoice.scm:334
#: ../src/report/business-reports/taxinvoice.scm:336
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1691
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1692
msgid "Tax Invoice"
msgstr "Skatteopgørelse"
#: ../src/business/business-gnome/gtkbuilder/business-prefs.glade.h:3
#: ../src/report/business-reports/easy-invoice.scm:888
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1692
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1693
msgid "Easy Invoice"
msgstr "Nem faktura"
#: ../src/business/business-gnome/gtkbuilder/business-prefs.glade.h:4
#: ../src/report/business-reports/fancy-invoice.scm:1013
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1693
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1694
msgid "Fancy Invoice"
msgstr "Smart faktura"
@@ -3163,22 +3185,21 @@ msgid "Choose Owner Dialog"
msgstr "Vælg ejerdialog"
#: ../src/business/business-gnome/gtkbuilder/dialog-choose-owner.glade.h:2
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:5
#: ../src/business/business-ledger/gncEntryLedgerModel.c:66
#: ../src/gnome/dialog-find-transactions2.c:154
#: ../src/gnome/dialog-find-transactions.c:153
-#: ../src/gnome/dialog-lot-viewer.c:920 ../src/gnome/dialog-tax-info.c:1352
+#: ../src/gnome/dialog-lot-viewer.c:920 ../src/gnome/dialog-tax-info.c:1355
#: ../src/gnome/reconcile-view.c:377
#: ../src/gnome-utils/gnc-tree-model-budget.c:102
#: ../src/gnome-utils/gnc-tree-view-account.c:749
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2912
#: ../src/import-export/csv-exp/csv-transactions-export.c:419
-#: ../src/import-export/csv-imp/gnc-csv-model.c:67
-#: ../src/import-export/import-main-matcher.c:477
+#: ../src/import-export/csv-imp/gnc-csv-model.c:73
+#: ../src/import-export/import-main-matcher.c:465
#: ../src/import-export/import-match-picker.c:346
#: ../src/import-export/import-match-picker.c:386
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3489
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3526
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3495
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3532
#: ../src/register/ledger-core/split-register-model.c:286
#: ../src/report/business-reports/customer-summary.scm:70
#: ../src/report/business-reports/easy-invoice.scm:112
@@ -3220,7 +3241,9 @@ msgstr "Firmanavn: "
#: ../src/business/business-gnome/gtkbuilder/dialog-job.glade.h:9
#: ../src/business/business-gnome/gtkbuilder/dialog-order.glade.h:14
#: ../src/business/business-gnome/gtkbuilder/dialog-vendor.glade.h:4
-#: ../src/gnome-utils/gnc-tree-view-owner.c:479
+#: ../src/gnome-utils/gnc-tree-view-owner.c:506
+#: ../src/report/business-reports/aging.scm:58
+#: ../src/report/business-reports/aging.scm:713
msgid "Active"
msgstr "Aktiv"
@@ -3275,11 +3298,11 @@ msgstr "Faktureringsadresse"
#: ../src/gnome/dialog-find-transactions2.c:152
#: ../src/gnome/dialog-find-transactions.c:151
#: ../src/gnome-utils/gnc-tree-view-account.c:885
-#: ../src/gnome-utils/gnc-tree-view-owner.c:474
+#: ../src/gnome-utils/gnc-tree-view-owner.c:501
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2914
#: ../src/import-export/csv-exp/csv-transactions-export.c:419
-#: ../src/import-export/csv-imp/gnc-csv-model.c:68
-#: ../src/register/ledger-core/split-register-model.c:468
+#: ../src/import-export/csv-imp/gnc-csv-model.c:74
+#: ../src/register/ledger-core/split-register-model.c:475
#: ../src/report/business-reports/balsheet-eg.scm:301
#: ../src/report/business-reports/taxinvoice.scm:91
#: ../src/report/standard-reports/account-summary.scm:483
@@ -3357,32 +3380,6 @@ msgstr "Leveringsadresse"
msgid "Question"
msgstr "Spørgsmål"
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:2
-msgid "Dummy message"
-msgstr "Tom besked"
-
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:3
-msgid "postd"
-msgstr ""
-
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:4
-msgid "duedate"
-msgstr "forfaldsdato"
-
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:6
-msgid "acct"
-msgstr ""
-
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:7
-msgid "question"
-msgstr "spørgsmål"
-
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:8
-#: ../src/import-export/csv-imp/assistant-csv-account-import.glade.h:25
-#: ../src/import-export/csv-imp/assistant-csv-trans-import.glade.h:46
-msgid "label"
-msgstr "etiket"
-
#: ../src/business/business-gnome/gtkbuilder/dialog-employee.glade.h:2
msgid "Employee Number: "
msgstr "Medarbejdernummer: "
@@ -3417,11 +3414,12 @@ msgid "Default Rate: "
msgstr "Standardrate: "
#: ../src/business/business-gnome/gtkbuilder/dialog-employee.glade.h:18
-#: ../src/gnome-utils/dialog-transfer.c:1976
+#: ../src/gnome-utils/dialog-transfer.c:1960
msgid "Credit Account"
msgstr "Kreditkonto"
#: ../src/business/business-gnome/gtkbuilder/dialog-employee.glade.h:19
+#: ../src/report/business-reports/receivables.scm:71
msgid "Billing"
msgstr "Regningsudarbejdelse"
@@ -3588,12 +3586,12 @@ msgstr "Bogfør på"
#: ../src/gnome/reconcile-view.c:389
#: ../src/gnome-utils/gnc-tree-view-price.c:436
#: ../src/import-export/csv-exp/csv-transactions-export.c:417
-#: ../src/import-export/csv-imp/gnc-csv-model.c:65
-#: ../src/import-export/import-main-matcher.c:473
+#: ../src/import-export/csv-imp/gnc-csv-model.c:71
+#: ../src/import-export/import-main-matcher.c:461
#: ../src/import-export/import-match-picker.c:344
#: ../src/import-export/import-match-picker.c:384
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3481
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3518
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3487
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3524
#: ../src/register/ledger-core/split-register-model.c:224
#: ../src/report/business-reports/customer-summary.scm:67
#: ../src/report/business-reports/easy-invoice.scm:110
@@ -3634,7 +3632,7 @@ msgstr "Dato"
#: ../src/gnome/dialog-find-transactions.c:133
#: ../src/gnome/dialog-find-transactions.c:168
#: ../src/gnome/dialog-find-transactions.c:176
-#: ../src/gnome/gnc-plugin-page-register.c:1838
+#: ../src/gnome/gnc-plugin-page-register.c:1886
#: ../src/gnome-search/dialog-search.c:894
#: ../src/gnome-search/dialog-search.c:902
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2865
@@ -3679,10 +3677,10 @@ msgstr "Tilbagebetaling"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2898
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2916
#: ../src/import-export/csv-exp/csv-transactions-export.c:420
-#: ../src/import-export/import-main-matcher.c:478
+#: ../src/import-export/import-main-matcher.c:466
#: ../src/import-export/import-match-picker.c:347
#: ../src/import-export/import-match-picker.c:387
-#: ../src/register/ledger-core/split-register-model.c:339
+#: ../src/register/ledger-core/split-register-model.c:346
#: ../src/report/standard-reports/general-ledger.scm:81
#: ../src/report/standard-reports/general-ledger.scm:101
#: ../src/report/standard-reports/register.scm:150
@@ -3697,8 +3695,9 @@ msgid "Memo"
msgstr "Note"
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:21
-msgid "(USD)"
-msgstr "(USD)"
+#: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:3
+msgid "Print Check"
+msgstr "Udskriv check"
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:22
msgid "Transaction Details"
@@ -3738,7 +3737,7 @@ msgid "Tax Table:"
msgstr "Skattetabel:"
#: ../src/business/business-gnome/gtkbuilder/dialog-vendor.glade.h:20
-#: ../src/gnome/window-reconcile2.c:466 ../src/gnome/window-reconcile.c:466
+#: ../src/gnome/window-reconcile2.c:466 ../src/gnome/window-reconcile.c:501
msgid "Payment Information"
msgstr "Betalingsinformation"
@@ -3747,19 +3746,17 @@ msgid "You have not selected an owner"
msgstr "Du har ikke valgt en ejer"
#: ../src/business/business-gnome/search-owner.c:258
-#: ../src/gnome-search/search-boolean.c:181
#: ../src/gnome-search/search-reconciled.c:189
msgid "is"
msgstr "er"
#: ../src/business/business-gnome/search-owner.c:259
-#: ../src/gnome-search/search-boolean.c:182
#: ../src/gnome-search/search-reconciled.c:190
msgid "is not"
msgstr "er ikke"
#: ../src/business/business-ledger/gncEntryLedger.c:85
-#: ../src/gnome-utils/dialog-transfer.c:1454
+#: ../src/gnome-utils/dialog-transfer.c:1455
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1959
#: ../src/register/ledger-core/split-register.c:1830
#, c-format
@@ -3787,16 +3784,16 @@ msgid "Material"
msgstr "Materiale"
#: ../src/business/business-ledger/gncEntryLedger.c:902
-#: ../src/business/business-ledger/gncEntryLedgerControl.c:870
+#: ../src/business/business-ledger/gncEntryLedgerControl.c:878
msgid "Save the current entry?"
msgstr "Gem den aktuelle post?"
#: ../src/business/business-ledger/gncEntryLedger.c:904
msgid "The current transaction has been changed. Would you like to record the changes before duplicating this entry, or cancel the duplication?"
-msgstr "Den aktuelle transaktion er blevet ændret. Vil du gemme ændringerne før kopiering af denne post, eller afbryde kopieringen?"
+msgstr "Den aktuelle transaktion er blevet ændret. Vil du gemme ændringerne før kopiering af denne post, eller annullere kopieringen?"
#: ../src/business/business-ledger/gncEntryLedger.c:919
-#: ../src/business/business-ledger/gncEntryLedgerControl.c:892
+#: ../src/business/business-ledger/gncEntryLedgerControl.c:900
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:149
#: ../src/register/ledger-core/split-register.c:467
msgid "_Record"
@@ -3814,20 +3811,20 @@ msgstr "Denne konto skal normalt være af typen indtægt."
msgid "This account should usually be of type expense or asset."
msgstr "Denne konto skal normalt være af typen udgift eller aktiv."
-#: ../src/business/business-ledger/gncEntryLedgerControl.c:755
+#: ../src/business/business-ledger/gncEntryLedgerControl.c:763
#, c-format
msgid "The tax table %s does not exist. Would you like to create it?"
msgstr "Skattetabellen %s findes ikke. Vil du oprette den?"
-#: ../src/business/business-ledger/gncEntryLedgerControl.c:872
+#: ../src/business/business-ledger/gncEntryLedgerControl.c:880
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?"
msgstr "Den aktuelle post er blevet ændret. Denne post er dog del af en eksisterende ordre. Vil du gemme ændringen og reelt ændre din ordre?"
-#: ../src/business/business-ledger/gncEntryLedgerControl.c:890
+#: ../src/business/business-ledger/gncEntryLedgerControl.c:898
msgid "_Don't Record"
msgstr "_Gem ikke"
-#: ../src/business/business-ledger/gncEntryLedgerControl.c:977
+#: ../src/business/business-ledger/gncEntryLedgerControl.c:985
msgid "The current entry has been changed. Would you like to save it?"
msgstr "Den aktuelle transaktion er blevet ændret. Vil du gemme den?"
@@ -3836,8 +3833,8 @@ msgid "sample:X"
msgstr "sample:X"
#: ../src/business/business-ledger/gncEntryLedgerLayout.c:80
-#: ../src/register/ledger-core/split-register-layout.c:618
-#: ../src/register/ledger-core/split-register-layout.c:626
+#: ../src/register/ledger-core/split-register-layout.c:637
+#: ../src/register/ledger-core/split-register-layout.c:645
msgid "sample:12/12/2000"
msgstr "sample:12/12/2000"
@@ -3869,8 +3866,8 @@ msgstr "sample(DH):+%"
#: ../src/business/business-ledger/gncEntryLedgerLayout.c:116
#: ../src/business/business-ledger/gncEntryLedgerLayout.c:121
-#: ../src/register/ledger-core/split-register-layout.c:695
-#: ../src/register/ledger-core/split-register-layout.c:703
+#: ../src/register/ledger-core/split-register-layout.c:722
+#: ../src/register/ledger-core/split-register-layout.c:730
msgid "sample:Expenses:Automobile:Gasoline"
msgstr "sample:Udgifter:Bil:Benzin"
@@ -3904,7 +3901,7 @@ msgstr "$"
#. oli-custom - make a string instead of a table
#: ../src/business/business-ledger/gncEntryLedgerLoad.c:57
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:14
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:15
#: ../src/report/business-reports/easy-invoice.scm:151
#: ../src/report/business-reports/fancy-invoice.scm:163
#: ../src/report/business-reports/invoice.scm:146
@@ -3927,7 +3924,7 @@ msgstr ">"
#: ../src/business/business-ledger/gncEntryLedgerLoad.c:132
#: ../src/business/business-ledger/gncEntryLedgerModel.c:530
#: ../src/business/business-ledger/gncEntryLedgerModel.c:1128
-#: ../src/engine/Account.c:3942
+#: ../src/engine/Account.c:3981
#: ../src/report/report-system/report-utilities.scm:110
msgid "Cash"
msgstr "Kontant"
@@ -3947,7 +3944,7 @@ msgstr "Udgiftskonto"
#: ../src/gnome/dialog-find-transactions.c:129
#: ../src/gnome/dialog-find-transactions.c:166
#: ../src/gnome/dialog-find-transactions.c:174
-#: ../src/gnome/gnc-plugin-page-register.c:1839
+#: ../src/gnome/gnc-plugin-page-register.c:1887
#: ../src/gnome-search/dialog-search.c:892
#: ../src/gnome-search/dialog-search.c:900
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2849
@@ -4041,7 +4038,7 @@ msgstr "Angiv posttypen"
#: ../src/business/business-ledger/gncEntryLedgerModel.c:585
#: ../src/gnome-utils/gnc-tree-util-split-reg.c:460
-#: ../src/register/ledger-core/split-register-model.c:889
+#: ../src/register/ledger-core/split-register-model.c:945
msgid "%A %d %B %Y"
msgstr ""
@@ -4145,7 +4142,7 @@ msgstr "Kan denne post faktureres til en kunde eller job?"
msgid "How did you pay for this item?"
msgstr "Hvordan betalte du for denne enhed?"
-#: ../src/core-utils/gnc-features.c:116
+#: ../src/core-utils/gnc-features.c:117
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:"
msgstr "Dette datasæt indeholder funktioner som ikke er understøttet af denne version af GnuCash. Du er nødt til at bruge en nyere version af GnuCash for at understøtte de følgende funktioner:"
@@ -4225,7 +4222,7 @@ msgstr ""
" %s\n"
"De skal mindst være 'rwx' for brugeren.\n"
-#: ../src/engine/Account.c:168
+#: ../src/engine/Account.c:169
#, c-format
msgid ""
"The separator character \"%s\" is used in one or more account names.\n"
@@ -4242,50 +4239,50 @@ msgstr ""
"Nedenfor kan du se listen over ugyldige kontonavne:\n"
"%s"
-#: ../src/engine/Account.c:3941 ../src/import-export/aqb/gnc-ab-utils.c:460
+#: ../src/engine/Account.c:3980 ../src/import-export/aqb/gnc-ab-utils.c:460
#: ../src/report/report-system/report-utilities.scm:109
msgid "Bank"
msgstr "Bank"
-#: ../src/engine/Account.c:3943
+#: ../src/engine/Account.c:3982
msgid "Asset"
msgstr "Aktiv"
-#: ../src/engine/Account.c:3944
+#: ../src/engine/Account.c:3983
msgid "Credit Card"
msgstr "Kreditkort"
-#: ../src/engine/Account.c:3945
+#: ../src/engine/Account.c:3984
msgid "Liability"
msgstr "Passiv"
-#: ../src/engine/Account.c:3946
+#: ../src/engine/Account.c:3985
msgid "Stock"
msgstr "Aktie"
-#: ../src/engine/Account.c:3947
+#: ../src/engine/Account.c:3986
msgid "Mutual Fund"
msgstr "Investeringsbevis"
-#: ../src/engine/Account.c:3948 ../src/gnome-utils/dialog-commodity.c:818
-#: ../src/gnome-utils/gnc-tree-view-owner.c:413
+#: ../src/engine/Account.c:3987 ../src/gnome-utils/dialog-commodity.c:817
+#: ../src/gnome-utils/gnc-tree-view-owner.c:440
#: ../src/gnome-utils/gnc-tree-view-price.c:430
msgid "Currency"
msgstr "Valuta"
-#: ../src/engine/Account.c:3952
+#: ../src/engine/Account.c:3991
msgid "A/Receivable"
msgstr "A/Tilgodehavende"
-#: ../src/engine/Account.c:3953
+#: ../src/engine/Account.c:3992
msgid "A/Payable"
msgstr "A/Kreditor"
-#: ../src/engine/Account.c:3954
+#: ../src/engine/Account.c:3993
msgid "Root"
msgstr "Rod"
-#: ../src/engine/Account.c:3955 ../src/engine/Scrub.c:401
+#: ../src/engine/Account.c:3994 ../src/engine/Scrub.c:401
#: ../src/engine/Scrub.c:466
#: ../src/report/standard-reports/income-statement.scm:621
msgid "Trading"
@@ -4304,20 +4301,20 @@ msgstr "Realiseret overskud/tab"
msgid "Realized Gains or Losses from Commodity or Trading Accounts that haven't been recorded elsewhere."
msgstr "Realiserede gevinster eller tab fra vare- eller handelskonti, som ikke er blevet registreret et andet sted"
-#: ../src/engine/gnc-budget.c:93 ../src/gnome/gnc-plugin-page-budget.c:838
+#: ../src/engine/gnc-budget.c:93 ../src/gnome/gnc-plugin-page-budget.c:840
msgid "Unnamed Budget"
msgstr "Unavngivet budget"
#. Set memo.
-#: ../src/engine/gncInvoice.c:1569
+#: ../src/engine/gncInvoice.c:1570
msgid "Extra to Charge Card"
msgstr "Ekstra på kreditkortet"
-#: ../src/engine/gncInvoice.c:1609
+#: ../src/engine/gncInvoice.c:1610
msgid "Generated from an invoice. Try unposting the invoice."
msgstr "Oprettet fra en faktura. Prøv at åbne denne faktura."
-#: ../src/engine/gncInvoice.c:2042
+#: ../src/engine/gncInvoice.c:2043
msgid " (posted)"
msgstr " (bogført)"
@@ -4330,11 +4327,11 @@ msgstr ""
msgid " (closed)"
msgstr " (lukket)"
-#: ../src/engine/gncOwner.c:960
+#: ../src/engine/gncOwner.c:991
msgid "Offset between documents: "
msgstr "Forskydning mellem dokumenter: "
-#: ../src/engine/gncOwner.c:1070
+#: ../src/engine/gncOwner.c:1101
msgid "Lot Link"
msgstr ""
@@ -4440,6 +4437,10 @@ msgstr "MÃ¥nedligt"
msgid "Yearly"
msgstr "Ã…rligt"
+#: ../src/engine/ScrubBusiness.c:468
+msgid "Please delete this transaction. Explanation at http://wiki.gnucash.org/wiki/Business_Features_Issues#Double_Posting"
+msgstr ""
+
#. Reason 2: zero Orphan a/c
#: ../src/engine/Scrub.c:89 ../src/report/business-reports/balsheet-eg.scm:511
msgid "Orphan"
@@ -4463,12 +4464,12 @@ msgstr "-- Opdelt transaktion --"
msgid "Displayed account code of the other account in a multi-split transaction|Split"
msgstr ""
-#: ../src/engine/Transaction.c:2417
+#: ../src/engine/Transaction.c:2503
msgid "Voided transaction"
msgstr "Ugyldig transaktion"
#. Dirtying taken care of by SetReadOnly
-#: ../src/engine/Transaction.c:2428
+#: ../src/engine/Transaction.c:2514
msgid "Transaction Voided"
msgstr "Transaktion ugyldig"
@@ -4497,7 +4498,7 @@ msgstr ""
"Du har bedt om at en bog oprettes. Denne bog vil indeholde alle transaktioner op til midnat %s (for samlet %d transaktioner spredt over %d konti).\n"
"\n"
" Ændr titlen og noter eller klik på »Fremad« for at fortsætte.\n"
-" Klik på »Tilbage« for at justere datoerne eller »Afbryd«."
+" Klik på »Tilbage« for at justere datoerne eller »Annuller«."
#: ../src/gnome/assistant-acct-period.c:386
#, c-format
@@ -4507,7 +4508,7 @@ msgstr "Periode %s - %s"
#: ../src/gnome/assistant-acct-period.c:404
#, 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."
-msgstr "Bogen vil blive oprettet med titlen %s når du klikker på »Anvend«. Klik på »Tilbage« for at justere, eller »Afbryd« for ikke at oprette en bog."
+msgstr "Bogen vil blive oprettet med titlen %s når du klikker på »Anvend«. Klik på »Tilbage« for at justere, eller »Annuller« for ikke at oprette en bog."
#. Translation FIXME: Can this %s-containing message please be
#. replaced by one single message? Either this closing went
@@ -4532,48 +4533,48 @@ msgstr "Periode:"
msgid "Closing Date:"
msgstr "Lukkedato:"
-#: ../src/gnome/assistant-hierarchy.c:401
+#: ../src/gnome/assistant-hierarchy.c:440
msgid "Selected"
msgstr "Valgt"
-#: ../src/gnome/assistant-hierarchy.c:413
+#: ../src/gnome/assistant-hierarchy.c:452
#: ../src/gnome-utils/gnc-tree-view-account.c:2183
msgid "Account Types"
msgstr "Kontotyper"
#. Translators: '%s' is the name of the selected account hierarchy template.
-#: ../src/gnome/assistant-hierarchy.c:504
+#: ../src/gnome/assistant-hierarchy.c:543
#, c-format
msgid "Accounts in '%s'"
msgstr "Konti i »%s«"
-#: ../src/gnome/assistant-hierarchy.c:512
+#: ../src/gnome/assistant-hierarchy.c:551
msgid "No description provided."
msgstr "Ingen beskrivelse angivet."
-#: ../src/gnome/assistant-hierarchy.c:527
+#: ../src/gnome/assistant-hierarchy.c:566
msgid "Accounts in Category"
msgstr "Konti i kategori"
-#: ../src/gnome/assistant-hierarchy.c:739
+#: ../src/gnome/assistant-hierarchy.c:778
msgid "zero"
msgstr "nul"
-#: ../src/gnome/assistant-hierarchy.c:752
+#: ../src/gnome/assistant-hierarchy.c:791
msgid "existing account"
msgstr "eksisterende konto"
-#: ../src/gnome/assistant-hierarchy.c:938
+#: ../src/gnome/assistant-hierarchy.c:977
#: ../src/gnome-utils/gnc-tree-view-account.c:904
msgid "Placeholder"
msgstr "Sumkonto"
-#: ../src/gnome/assistant-hierarchy.c:969
+#: ../src/gnome/assistant-hierarchy.c:1008
msgid "Use Existing"
msgstr "Brug eksisterende"
-#: ../src/gnome/assistant-hierarchy.c:1128
-#: ../src/gnome/assistant-hierarchy.c:1139
+#: ../src/gnome/assistant-hierarchy.c:1167
+#: ../src/gnome/assistant-hierarchy.c:1178
#: ../src/gnome-utils/dialog-utils.c:591
msgid "New Book Options"
msgstr "Nye bogindstillinger"
@@ -4683,11 +4684,11 @@ msgstr "Fejl ved tilføjelse af pris."
#: ../src/gnome/dialog-find-transactions.c:107
#: ../src/gnome-utils/gnc-icons.c:38
#: ../src/import-export/aqb/gnc-ab-utils.c:458
-#: ../src/import-export/csv-imp/gnc-csv-model.c:69
-#: ../src/import-export/import-main-matcher.c:474
+#: ../src/import-export/csv-imp/gnc-csv-model.c:75
+#: ../src/import-export/import-main-matcher.c:462
#: ../src/import-export/import-match-picker.c:343
#: ../src/import-export/qif-imp/dialog-account-picker.c:369
-#: ../src/register/ledger-core/split-register-model.c:325
+#: ../src/register/ledger-core/split-register-model.c:332
#: ../src/report/business-reports/job-report.scm:39
#: ../src/report/business-reports/owner-report.scm:48
#: ../src/report/standard-reports/advanced-portfolio.scm:1042
@@ -4713,7 +4714,7 @@ msgstr "Kode"
#: ../src/gnome/assistant-stock-split.c:582
#: ../src/gnome/dialog-find-transactions2.c:121
#: ../src/gnome/dialog-find-transactions.c:120
-#: ../src/register/ledger-core/split-register-model.c:396
+#: ../src/register/ledger-core/split-register-model.c:403
#: ../src/report/standard-reports/advanced-portfolio.scm:1062
#: ../src/report/standard-reports/general-journal.scm:113
#: ../src/report/standard-reports/general-ledger.scm:88
@@ -4789,8 +4790,8 @@ msgstr "Lukkeposter"
#: ../src/gnome/dialog-find-transactions2.c:117
#: ../src/gnome/dialog-find-transactions.c:116
#: ../src/gnome/gnc-plugin-page-register2.c:484
-#: ../src/gnome/gnc-plugin-page-register.c:487
-#: ../src/gnome/window-reconcile2.c:1315 ../src/gnome/window-reconcile.c:1315
+#: ../src/gnome/gnc-plugin-page-register.c:489
+#: ../src/gnome/window-reconcile2.c:1315 ../src/gnome/window-reconcile.c:1352
#: ../src/import-export/csv-exp/csv-transactions-export.c:423
msgid "Reconcile"
msgstr "Afstem"
@@ -4803,7 +4804,7 @@ msgstr "Aktiepris"
#: ../src/gnome/dialog-find-transactions2.c:123
#: ../src/gnome/dialog-find-transactions.c:122
#: ../src/gnome/dialog-lot-viewer.c:932
-#: ../src/gnome/dialog-sx-since-last-run.c:988
+#: ../src/gnome/dialog-sx-since-last-run.c:1023
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2982
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3002
#: ../src/report/standard-reports/advanced-portfolio.scm:1071
@@ -4819,8 +4820,8 @@ msgstr "Værdi"
#: ../src/gnome/dialog-find-transactions.c:128
#: ../src/gnome/dialog-find-transactions.c:167
#: ../src/gnome/dialog-find-transactions.c:173
-#: ../src/gnome/gnc-plugin-page-register.c:1834
-#: ../src/gnome/gnc-plugin-page-register.c:3105
+#: ../src/gnome/gnc-plugin-page-register.c:1882
+#: ../src/gnome/gnc-plugin-page-register.c:3156
#: ../src/gnome-search/dialog-search.c:893
#: ../src/gnome-search/dialog-search.c:899
#: ../src/import-export/csv-exp/csv-transactions-export.c:422
@@ -4834,8 +4835,8 @@ msgstr "Nummer/handling"
#: ../src/gnome/dialog-find-transactions.c:132
#: ../src/gnome/dialog-find-transactions.c:169
#: ../src/gnome/dialog-find-transactions.c:175
-#: ../src/gnome/gnc-plugin-page-register.c:1833
-#: ../src/gnome/gnc-plugin-page-register.c:3104
+#: ../src/gnome/gnc-plugin-page-register.c:1881
+#: ../src/gnome/gnc-plugin-page-register.c:3155
#: ../src/gnome-search/dialog-search.c:895
#: ../src/gnome-search/dialog-search.c:901
#: ../src/import-export/csv-exp/csv-transactions-export.c:418
@@ -4859,7 +4860,7 @@ msgstr "Find transaktion"
#: ../src/gnome/gnc-plugin-page-account-tree.c:339
#: ../src/gnome/gnc-plugin-page-budget.c:176 ../src/gnome-utils/gnc-file.c:100
#: ../src/gnome-utils/gnc-file.c:1034 ../src/gnome/window-reconcile2.c:1700
-#: ../src/gnome/window-reconcile.c:1700
+#: ../src/gnome/window-reconcile.c:1740
msgid "Open"
msgstr "Ã…bn"
@@ -4872,15 +4873,15 @@ msgstr "Titel"
#: ../src/gnome/dialog-lot-viewer.c:863 ../src/gnome/dialog-lot-viewer.c:944
#: ../src/gnome-utils/gnc-tree-view-account.c:775
-#: ../src/gnome-utils/gnc-tree-view-owner.c:458
-#: ../src/gnome-utils/gnc-tree-view-owner.c:466
+#: ../src/gnome-utils/gnc-tree-view-owner.c:485
+#: ../src/gnome-utils/gnc-tree-view-owner.c:493
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3212
-#: ../src/import-export/csv-imp/gnc-csv-model.c:72
+#: ../src/import-export/csv-imp/gnc-csv-model.c:78
#: ../src/register/ledger-core/split-register-model.c:311
-#: ../src/register/ledger-core/split-register-model.c:461
+#: ../src/register/ledger-core/split-register-model.c:468
#: ../src/report/business-reports/customer-summary.scm:184
#: ../src/report/business-reports/job-report.scm:221
-#: ../src/report/business-reports/owner-report.scm:309
+#: ../src/report/business-reports/owner-report.scm:308
#: ../src/report/report-system/html-utilities.scm:727
#: ../src/report/standard-reports/account-summary.scm:460
#: ../src/report/standard-reports/register.scm:174
@@ -4925,17 +4926,15 @@ msgid "You must select a Currency."
msgstr "Du skal vælge en valuta."
#: ../src/gnome/dialog-price-editor.c:229
-#: ../src/gnome-utils/dialog-transfer.c:1731
+#: ../src/gnome-utils/dialog-transfer.c:1712
msgid "You must enter a valid amount."
msgstr "Du skal vælge en gyldig mængde."
-#: ../src/gnome/dialog-print-check2.c:821
-#: ../src/gnome/dialog-print-check.c:821
+#: ../src/gnome/dialog-print-check.c:820
msgid "Cannot save check format file."
msgstr "Kan ikke gemme checkformatfil."
-#: ../src/gnome/dialog-print-check2.c:1509
-#: ../src/gnome/dialog-print-check.c:1509
+#: ../src/gnome/dialog-print-check.c:1508
msgid "There is a duplicate check format file."
msgstr "Der er en kopi af checkformatfilen."
@@ -4946,8 +4945,7 @@ msgstr "Der er en kopi af checkformatfilen."
#. * is the filename of that format; %3$s the type of
#. * the other check format; and %4$s the filename of
#. * that other format.
-#: ../src/gnome/dialog-print-check2.c:1517
-#: ../src/gnome/dialog-print-check.c:1517
+#: ../src/gnome/dialog-print-check.c:1516
#, c-format
msgid "The GUIDs in the %s check format file '%s' and the %s check format file '%s' match."
msgstr "GUID'en i %s checkformatfilen '%s' og %s checkformatfilen '%s' stemmer overens."
@@ -4955,24 +4953,20 @@ msgstr "GUID'en i %s checkformatfilen '%s' og %s checkformatfilen '%s' stemmer o
#. Translators: This is a directory name. It may be presented to
#. * the user to indicate that some data file was defined by the
#. * gnucash application.
-#: ../src/gnome/dialog-print-check2.c:1558
-#: ../src/gnome/dialog-print-check.c:1558
+#: ../src/gnome/dialog-print-check.c:1557
msgid "application"
msgstr "application"
#. Translators: This is a directory name. It may be presented to
#. * the user to indicate that some data file was defined by a
#. * user herself.
-#: ../src/gnome/dialog-print-check2.c:1566
-#: ../src/gnome/dialog-print-check.c:1566
+#: ../src/gnome/dialog-print-check.c:1565
msgid "user"
msgstr "user"
-#: ../src/gnome/dialog-print-check2.c:1590
-#: ../src/gnome/dialog-print-check2.c:2562
-#: ../src/gnome/dialog-print-check.c:1590
-#: ../src/gnome/dialog-print-check.c:2562
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:60
+#: ../src/gnome/dialog-print-check.c:1589
+#: ../src/gnome/dialog-print-check.c:2595
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:61
#: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:40
#: ../src/gnome-utils/gtkbuilder/gnc-date-format.glade.h:20
#: ../src/import-export/csv-exp/assistant-csv-export.glade.h:10
@@ -4980,8 +4974,7 @@ msgstr "user"
msgid "Custom"
msgstr "Tilpasset"
-#: ../src/gnome/dialog-print-check2.c:2554
-#: ../src/gnome/dialog-print-check.c:2554
+#: ../src/gnome/dialog-print-check.c:2587
#: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:37
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:184
msgid "Top"
@@ -4997,15 +4990,15 @@ msgstr "Færdig"
#: ../src/gnome/dialog-sx-editor2.c:166 ../src/gnome/dialog-sx-editor.c:167
#: ../src/gnome/gnc-plugin-page-sx-list.c:146
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:17
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:18
#: ../src/gnome-utils/gnc-main-window.c:260
-#: ../src/gnome/window-reconcile2.c:2203 ../src/gnome/window-reconcile.c:2203
+#: ../src/gnome/window-reconcile2.c:2203 ../src/gnome/window-reconcile.c:2243
#: ../src/report/report-gnome/dialog-report.glade.h:20
msgid "_Edit"
msgstr "_Redigér"
#: ../src/gnome/dialog-sx-editor2.c:167 ../src/gnome/dialog-sx-editor.c:168
-#: ../src/gnome/window-reconcile2.c:2144 ../src/gnome/window-reconcile.c:2144
+#: ../src/gnome/window-reconcile2.c:2144 ../src/gnome/window-reconcile.c:2184
msgid "_Transaction"
msgstr "_Transaktion"
@@ -5021,28 +5014,28 @@ msgstr "_Handlinger"
#: ../src/gnome/dialog-sx-editor2.c:201 ../src/gnome/dialog-sx-editor.c:202
msgid "This Scheduled Transaction has changed; are you sure you want to cancel?"
-msgstr "Denne planlagte transaktion har ændret sig; er du sikker på, at du ønsker at afbryde?"
+msgstr "Denne planlagte transaktion har ændret sig; er du sikker på, at du ønsker at annullere?"
-#: ../src/gnome/dialog-sx-editor2.c:648 ../src/gnome/dialog-sx-editor.c:659
+#: ../src/gnome/dialog-sx-editor2.c:648
#, c-format
msgid "Couldn't parse credit formula for split \"%s\"."
msgstr "Kunne ikke fortolke kreditformel for opdeling »%s«."
-#: ../src/gnome/dialog-sx-editor2.c:676 ../src/gnome/dialog-sx-editor.c:687
+#: ../src/gnome/dialog-sx-editor2.c:676
#, c-format
msgid "Couldn't parse debit formula for split \"%s\"."
msgstr "Kunne ikke fortolke debetformel for opdeling »%s«."
-#: ../src/gnome/dialog-sx-editor2.c:710 ../src/gnome/dialog-sx-editor.c:721
+#: ../src/gnome/dialog-sx-editor2.c:710 ../src/gnome/dialog-sx-editor.c:876
#: ../src/gnome/dialog-sx-from-trans.c:260
msgid "The Scheduled Transaction Editor cannot automatically balance this transaction. Should it still be entered?"
msgstr ""
-#: ../src/gnome/dialog-sx-editor2.c:731 ../src/gnome/dialog-sx-editor.c:742
+#: ../src/gnome/dialog-sx-editor2.c:731 ../src/gnome/dialog-sx-editor.c:493
msgid "Please name the Scheduled Transaction."
msgstr "Angiv venligst navn på den planlagte transaktion."
-#: ../src/gnome/dialog-sx-editor2.c:758 ../src/gnome/dialog-sx-editor.c:770
+#: ../src/gnome/dialog-sx-editor2.c:758 ../src/gnome/dialog-sx-editor.c:519
#, c-format
msgid "A Scheduled Transaction with the name \"%s\" already exists. Are you sure you want to name this one the same?"
msgstr "En planlagt transaktion med navnet »%s« findes allerede. Er du sikker på, at du vil kalde den her det samme?"
@@ -5051,30 +5044,30 @@ msgstr "En planlagt transaktion med navnet »%s« findes allerede. Er du sikker
msgid "Scheduled Transactions with variables cannot be automatically created."
msgstr "Planlagte transaktioner med variabler kan ikke oprettes automatisk."
-#: ../src/gnome/dialog-sx-editor2.c:796 ../src/gnome/dialog-sx-editor.c:809
+#: ../src/gnome/dialog-sx-editor2.c:796 ../src/gnome/dialog-sx-editor.c:628
msgid "Scheduled Transactions without a template transaction cannot be automatically created."
msgstr "Planlagte transaktioner uden en skabelontransaktion kan ikke automatisk oprettes."
-#: ../src/gnome/dialog-sx-editor2.c:811 ../src/gnome/dialog-sx-editor.c:824
+#: ../src/gnome/dialog-sx-editor2.c:811 ../src/gnome/dialog-sx-editor.c:543
msgid "Please provide a valid end selection."
msgstr "Angiv venligst en gyldig slutmarkering."
-#: ../src/gnome/dialog-sx-editor2.c:829 ../src/gnome/dialog-sx-editor.c:842
+#: ../src/gnome/dialog-sx-editor2.c:829 ../src/gnome/dialog-sx-editor.c:558
msgid "There must be some number of occurrences."
msgstr ""
-#: ../src/gnome/dialog-sx-editor2.c:838 ../src/gnome/dialog-sx-editor.c:851
+#: ../src/gnome/dialog-sx-editor2.c:838 ../src/gnome/dialog-sx-editor.c:566
#, c-format
msgid "The number of remaining occurrences (%d) is greater than the number of total occurrences (%d)."
msgstr ""
-#: ../src/gnome/dialog-sx-editor2.c:870 ../src/gnome/dialog-sx-editor.c:883
+#: ../src/gnome/dialog-sx-editor2.c:870 ../src/gnome/dialog-sx-editor.c:595
msgid "You have attempted to create a Scheduled Transaction which will never run. Do you really want to do this?"
msgstr ""
#: ../src/gnome/dialog-sx-editor2.c:1316
msgid "Note: If you have already accepted changes to the Template, Cancel will not revoke them."
-msgstr ""
+msgstr "Bemærk: Hvis du allerede har accepteret ændringer til skabelonen, så vil annuller ikke gendanne dem."
#: ../src/gnome/dialog-sx-editor2.c:1363 ../src/gnome/dialog-sx-editor.c:1386
msgid "(never)"
@@ -5084,25 +5077,51 @@ msgstr "(aldrig)"
msgid "The current template transaction has been changed. Would you like to record the changes?"
msgstr "Den aktuelle skabelontransaktion er blevet ændret. Vil du gemme ændringerne?"
-#: ../src/gnome/dialog-sx-editor2.c:1784 ../src/gnome/dialog-sx-editor.c:1819
+#: ../src/gnome/dialog-sx-editor2.c:1789 ../src/gnome/dialog-sx-editor.c:1825
#: ../src/gnome/gnc-plugin-page-sx-list.c:243
#: ../src/gnome/gnc-plugin-page-sx-list.c:249
msgid "Scheduled Transactions"
msgstr "Planlagte transaktioner"
-#: ../src/gnome/dialog-sx-editor.c:798
-#, fuzzy
-#| msgid "Scheduled Transactions with variables cannot be automatically created."
+#: ../src/gnome/dialog-sx-editor.c:617
msgid "Scheduled Transactions with variables or involving more than one commodity cannot be automatically created."
-msgstr "Planlagte transaktioner med variabler kan ikke oprettes automatisk."
+msgstr "Planlagte transaktioner med variabler eller med mere end en vare kan ikke oprettes automatisk."
+
+#: ../src/gnome/dialog-sx-editor.c:674
+#, c-format
+msgid "Couldn't parse %s for split \"%s\"."
+msgstr "Kunne ikke fortolke %s for opdeling »%s«."
+
+#: ../src/gnome/dialog-sx-editor.c:740
+#, c-format
+msgid "Split with memo %s has an invalid account."
+msgstr "Opdeling med memo %s har en ugyldig konto."
+
+#: ../src/gnome/dialog-sx-editor.c:743
+msgid "Invalid Account in Split"
+msgstr "Ugyldig konto i opdeling"
+
+#: ../src/gnome/dialog-sx-editor.c:755
+#, c-format
+msgid "Split with memo %s has an unparseable Credit Formula."
+msgstr "Opdeling med memo %s har en kreditformel, der ikke kan fortolkes."
+
+#: ../src/gnome/dialog-sx-editor.c:758 ../src/gnome/dialog-sx-editor.c:774
+msgid "Unparsable Formula in Split"
+msgstr "Formel der ikke kan fortolkes i opdeling"
+
+#: ../src/gnome/dialog-sx-editor.c:771
+#, c-format
+msgid "Split with memo %s has an unparseable Debit Formula."
+msgstr "Opdeling med memo %s har en debetformel, der ikke kan fortolkes."
#: ../src/gnome/dialog-sx-from-trans.c:557
msgid "The Scheduled Transaction is unbalanced. You are strongly encouraged to correct this situation."
-msgstr ""
+msgstr "Den planlagte transaktion er ubalanceret. Du anbefales på det kraftigste at rette denne situation."
-#: ../src/gnome/dialog-sx-from-trans.c:781
+#: ../src/gnome/dialog-sx-from-trans.c:782
msgid "Cannot create a Scheduled Transaction from a Transaction currently being edited. Please Enter the Transaction before Scheduling."
-msgstr ""
+msgstr "Kan ikke oprette en planlagt transaktion fra en transaktion under redigering. Indtast transaktionen før planlægning."
#: ../src/gnome/dialog-sx-since-last-run.c:388
msgid "Ignored"
@@ -5133,25 +5152,29 @@ msgstr "Aldrig"
msgid "(Need Value)"
msgstr "(Kræver værdi)"
-#: ../src/gnome/dialog-sx-since-last-run.c:830
+#: ../src/gnome/dialog-sx-since-last-run.c:816
+msgid "Invalid Transactions"
+msgstr "Ugyldige transaktioner"
+
+#: ../src/gnome/dialog-sx-since-last-run.c:863
#, c-format
msgid "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)"
msgstr[0] "Der er ingen Planlagte transaktioner til indtasnting på nuværende tidspunkt. (En transaktion blev automatisk oprettet)"
msgstr[1] "Der er ingen Planlagte transaktioner til indtasnting på nuværende tidspunkt. (%d transaktioner blev automatisk oprettet)"
-#: ../src/gnome/dialog-sx-since-last-run.c:952
+#: ../src/gnome/dialog-sx-since-last-run.c:987
#: ../src/gnome-search/dialog-search.c:1081
msgid "Transaction"
msgstr "Transaktion"
-#: ../src/gnome/dialog-sx-since-last-run.c:968
+#: ../src/gnome/dialog-sx-since-last-run.c:1003
#: ../src/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:23
#: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:24
msgid "Status"
msgstr "Status"
-#: ../src/gnome/dialog-sx-since-last-run.c:1049
+#: ../src/gnome/dialog-sx-since-last-run.c:1084
msgid "Created Transactions"
msgstr "Oprettede transaktioner"
@@ -5173,19 +5196,19 @@ msgstr "Kode"
msgid "now"
msgstr "nu"
-#: ../src/gnome/dialog-tax-info.c:1135
+#: ../src/gnome/dialog-tax-info.c:1138
msgid "Income Tax Identity"
msgstr "Identitet for indtægtsskat"
-#: ../src/gnome/dialog-tax-info.c:1199
+#: ../src/gnome/dialog-tax-info.c:1202
msgid "CAUTION: If you set TXF categories, and later change 'Type', you will need to manually reset those categories one at a time"
msgstr "FORSIGTIG: Hvis du angiver TXF-kategorier og senere ændrer 'Type', så vil du manuelt skulle nulstille disse kategorier en ad gangen"
-#: ../src/gnome/dialog-tax-info.c:1348
+#: ../src/gnome/dialog-tax-info.c:1351
msgid "Form"
msgstr "Formular"
-#: ../src/gnome/gnc-budget-view.c:387
+#: ../src/gnome/gnc-budget-view.c:390
#: ../src/import-export/qif-imp/qif-dialog-utils.scm:79
#: ../src/import-export/qif-imp/qif-dialog-utils.scm:84
#: ../src/report/report-system/report-utilities.scm:118
@@ -5194,7 +5217,7 @@ msgstr "Formular"
msgid "Expenses"
msgstr "Udgifter"
-#: ../src/gnome/gnc-budget-view.c:389
+#: ../src/gnome/gnc-budget-view.c:392
msgid "Transfers"
msgstr "Overførsler"
@@ -5202,10 +5225,10 @@ msgstr "Overførsler"
#. (_ "Total Credit")
#. (_ "Total Due")))
#. Display Grand Total
-#: ../src/gnome/gnc-budget-view.c:391 ../src/gnome/gnc-budget-view.c:1154
+#: ../src/gnome/gnc-budget-view.c:394 ../src/gnome/gnc-budget-view.c:1186
#: ../src/gnome-utils/gnc-tree-view-account.c:844
-#: ../src/report/business-reports/aging.scm:470
-#: ../src/report/business-reports/aging.scm:666
+#: ../src/report/business-reports/aging.scm:562
+#: ../src/report/business-reports/aging.scm:846
#: ../src/report/business-reports/balsheet-eg.eguile.scm:120
#: ../src/report/business-reports/customer-summary.scm:310
#: ../src/report/business-reports/customer-summary.scm:954
@@ -5284,13 +5307,13 @@ msgstr "Eksporter kontohierarkiet til en ny GnuCash-datafil"
# eller find
#: ../src/gnome/gnc-plugin-basic-commands.c:141
#: ../src/gnome/gnc-plugin-page-register2.c:246
-#: ../src/gnome/gnc-plugin-page-register.c:251
+#: ../src/gnome/gnc-plugin-page-register.c:253
msgid "_Find..."
msgstr "_Søg ..."
#: ../src/gnome/gnc-plugin-basic-commands.c:142
#: ../src/gnome/gnc-plugin-page-register2.c:247
-#: ../src/gnome/gnc-plugin-page-register.c:252
+#: ../src/gnome/gnc-plugin-page-register.c:254
msgid "Find transactions with a search"
msgstr "Find transaktioner med en søgning"
@@ -5349,60 +5372,61 @@ msgstr "Luk _bøger"
msgid "Archive old data using accounting periods"
msgstr "Arkiver gamle data med brug af bogføringsperioder"
-#: ../src/gnome/gnc-plugin-basic-commands.c:186
+#. Translators: This entry opens the Price Database window
+#. * and will be renamed to "_Price Database" in v.2.8
+#: ../src/gnome/gnc-plugin-basic-commands.c:188
msgid "_Price Editor"
msgstr "_Prisredigering"
-#: ../src/gnome/gnc-plugin-basic-commands.c:187
+#: ../src/gnome/gnc-plugin-basic-commands.c:189
msgid "View and edit the prices for stocks and mutual funds"
msgstr "Vis og ændr priserne på aktier og investeringsbeviser"
-#: ../src/gnome/gnc-plugin-basic-commands.c:191
+#: ../src/gnome/gnc-plugin-basic-commands.c:193
msgid "_Security Editor"
msgstr "Redigeringsprogram for _værdipapir"
-#: ../src/gnome/gnc-plugin-basic-commands.c:192
+#: ../src/gnome/gnc-plugin-basic-commands.c:194
msgid "View and edit the commodities for stocks and mutual funds"
msgstr "Vis og ændr varerne for aktier og investeringsbeviser"
-#: ../src/gnome/gnc-plugin-basic-commands.c:196
+#: ../src/gnome/gnc-plugin-basic-commands.c:198
msgid "_Loan Repayment Calculator"
msgstr "_Lommeregner for tilbagebetaling af lån"
-#: ../src/gnome/gnc-plugin-basic-commands.c:197
+#: ../src/gnome/gnc-plugin-basic-commands.c:199
msgid "Use the loan/mortgage repayment calculator"
msgstr "Brug tilbagebetalingslommeregneren for lån/boliggæld"
-#: ../src/gnome/gnc-plugin-basic-commands.c:201
+#: ../src/gnome/gnc-plugin-basic-commands.c:203
msgid "_Close Book"
msgstr "_Luk bog"
-#: ../src/gnome/gnc-plugin-basic-commands.c:202
+#: ../src/gnome/gnc-plugin-basic-commands.c:204
msgid "Close the Book at the end of the Period"
msgstr "Luk bogen når perioden slutter"
-#: ../src/gnome/gnc-plugin-basic-commands.c:209
+#: ../src/gnome/gnc-plugin-basic-commands.c:211
msgid "_Tips Of The Day"
msgstr "Dagens _tips"
-#: ../src/gnome/gnc-plugin-basic-commands.c:210
+#: ../src/gnome/gnc-plugin-basic-commands.c:212
msgid "View the Tips of the Day"
msgstr "Vis dagens Tip"
-#: ../src/gnome/gnc-plugin-basic-commands.c:501
+#: ../src/gnome/gnc-plugin-basic-commands.c:503
#: ../src/gnome-utils/gnc-file.c:1571
-#, fuzzy, c-format
-#| msgid "The file %s already exists. Are you sure you want to overwrite it?"
+#, c-format
msgid "Reverting will discard all unsaved changes to %s. Are you sure you want to proceed ?"
-msgstr "Filen %s eksisterer allerede. Er du sikker på, at du vil overskrive den?"
+msgstr "Forkast vil fjerne alle ugemte ændringer til %s. Er du sikker på, at du vil fortsætte?"
-#: ../src/gnome/gnc-plugin-basic-commands.c:550
+#: ../src/gnome/gnc-plugin-basic-commands.c:552
msgid "There are no Scheduled Transactions to be entered at this time."
-msgstr ""
+msgstr "Der er ingen planlagte transaktioner til indtastning på dette tidspunkt."
#. Translators: %d is the number of transactions. This is a
#. ngettext(3) message.
-#: ../src/gnome/gnc-plugin-basic-commands.c:581
+#: ../src/gnome/gnc-plugin-basic-commands.c:583
#, c-format
msgid "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)"
@@ -5494,13 +5518,13 @@ msgstr "Ã…bn den valgte konto og alle dens underkonti i gammel kassekladdestil"
#: ../src/gnome/gnc-plugin-page-account-tree.c:214
#: ../src/gnome/gnc-plugin-page-register2.c:241
-#: ../src/gnome/gnc-plugin-page-register.c:246
+#: ../src/gnome/gnc-plugin-page-register.c:248
msgid "Edit _Account"
msgstr "Rediger _konto"
#: ../src/gnome/gnc-plugin-page-account-tree.c:215
#: ../src/gnome/gnc-plugin-page-register2.c:242
-#: ../src/gnome/gnc-plugin-page-register.c:247
+#: ../src/gnome/gnc-plugin-page-register.c:249
msgid "Edit the selected account"
msgstr "Redigér den valgte konto"
@@ -5522,19 +5546,19 @@ msgstr "Giv underkontiene for den valgte konto nye numre"
#: ../src/gnome/gnc-plugin-page-account-tree.c:237
#: ../src/gnome/gnc-plugin-page-register2.c:336
-#: ../src/gnome/gnc-plugin-page-register.c:345
+#: ../src/gnome/gnc-plugin-page-register.c:347
msgid "_Reconcile..."
msgstr "_Afstem..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:238
#: ../src/gnome/gnc-plugin-page-register2.c:337
-#: ../src/gnome/gnc-plugin-page-register.c:346
+#: ../src/gnome/gnc-plugin-page-register.c:348
msgid "Reconcile the selected account"
msgstr "Afstem den valgte konto"
#: ../src/gnome/gnc-plugin-page-account-tree.c:242
#: ../src/gnome/gnc-plugin-page-register2.c:341
-#: ../src/gnome/gnc-plugin-page-register.c:350
+#: ../src/gnome/gnc-plugin-page-register.c:352
msgid "_Auto-clear..."
msgstr "_Autoryd ..."
@@ -5544,40 +5568,40 @@ msgstr ""
#: ../src/gnome/gnc-plugin-page-account-tree.c:247
#: ../src/gnome/gnc-plugin-page-register2.c:331
-#: ../src/gnome/gnc-plugin-page-register.c:340
+#: ../src/gnome/gnc-plugin-page-register.c:342
#: ../src/gnome-utils/gnc-icons.c:43 ../src/gnome/window-reconcile2.c:2184
-#: ../src/gnome/window-reconcile.c:2184
+#: ../src/gnome/window-reconcile.c:2224
msgid "_Transfer..."
msgstr "_Overfør..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:248
#: ../src/gnome/gnc-plugin-page-register2.c:332
-#: ../src/gnome/gnc-plugin-page-register.c:341
-#: ../src/gnome/window-reconcile2.c:2185 ../src/gnome/window-reconcile.c:2185
+#: ../src/gnome/gnc-plugin-page-register.c:343
+#: ../src/gnome/window-reconcile2.c:2185 ../src/gnome/window-reconcile.c:2225
msgid "Transfer funds from one account to another"
msgstr "Overfør beløb fra en konto til en anden"
#: ../src/gnome/gnc-plugin-page-account-tree.c:252
#: ../src/gnome/gnc-plugin-page-register2.c:346
-#: ../src/gnome/gnc-plugin-page-register.c:355
+#: ../src/gnome/gnc-plugin-page-register.c:357
msgid "Stoc_k Split..."
msgstr "Ak_tieopsplitning..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:253
#: ../src/gnome/gnc-plugin-page-register2.c:347
-#: ../src/gnome/gnc-plugin-page-register.c:356
+#: ../src/gnome/gnc-plugin-page-register.c:358
msgid "Record a stock split or a stock merger"
msgstr "Registrér en aktieopsplitning eller -sammenlægning"
#: ../src/gnome/gnc-plugin-page-account-tree.c:257
#: ../src/gnome/gnc-plugin-page-register2.c:351
-#: ../src/gnome/gnc-plugin-page-register.c:360
+#: ../src/gnome/gnc-plugin-page-register.c:362
msgid "View _Lots..."
msgstr "Vis _afkast ..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:258
#: ../src/gnome/gnc-plugin-page-register2.c:352
-#: ../src/gnome/gnc-plugin-page-register.c:361
+#: ../src/gnome/gnc-plugin-page-register.c:363
msgid "Bring up the lot viewer/editor window"
msgstr "Vis fremviseren/redigeringsvinduet for afkast"
@@ -5586,7 +5610,7 @@ msgid "Check & Repair A_ccount"
msgstr "Kontroller og reparer _konto"
#: ../src/gnome/gnc-plugin-page-account-tree.c:263
-#: ../src/gnome/window-reconcile2.c:2190 ../src/gnome/window-reconcile.c:2190
+#: ../src/gnome/window-reconcile2.c:2190 ../src/gnome/window-reconcile.c:2230
msgid "Check for and repair unbalanced transactions and orphan splits in this account"
msgstr "Kontroller og reparer ubalancerede transaktioner og opdelinger uden ejer i denne konto"
@@ -5730,7 +5754,7 @@ msgstr "Estimer en budgetværdi for de valgte konti ud fra tidligere transaktion
#: ../src/gnome/gnc-plugin-page-budget.c:178
#: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:12
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1088
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1089
msgid "Options"
msgstr "Indstillinger"
@@ -5740,7 +5764,7 @@ msgstr "Estimer"
#: ../src/gnome/gnc-plugin-page-budget.c:272
#: ../src/gnome/gnc-plugin-page-budget.c:314
-#: ../src/gnome/gnc-plugin-page-budget.c:801
+#: ../src/gnome/gnc-plugin-page-budget.c:803
#: ../src/report/standard-reports/budget-balance-sheet.scm:111
#: ../src/report/standard-reports/budget-barchart.scm:45
#: ../src/report/standard-reports/budget-barchart.scm:106
@@ -5750,12 +5774,12 @@ msgstr "Estimer"
msgid "Budget"
msgstr "Budget"
-#: ../src/gnome/gnc-plugin-page-budget.c:840
+#: ../src/gnome/gnc-plugin-page-budget.c:842
#, c-format
msgid "Delete %s?"
msgstr "Slet %s?"
-#: ../src/gnome/gnc-plugin-page-budget.c:911
+#: ../src/gnome/gnc-plugin-page-budget.c:913
msgid "You must select at least one account to estimate."
msgstr "Du skal vælge mindst én konto at estimere."
@@ -5763,146 +5787,146 @@ msgstr "Du skal vælge mindst én konto at estimere."
#. Actions
#. **********************************************************
#: ../src/gnome/gnc-plugin-page-register2.c:190
-#: ../src/gnome/gnc-plugin-page-register.c:192
+#: ../src/gnome/gnc-plugin-page-register.c:194
msgid "Cu_t Transaction"
msgstr "_Klip transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:191
-#: ../src/gnome/gnc-plugin-page-register.c:193
+#: ../src/gnome/gnc-plugin-page-register.c:195
msgid "_Copy Transaction"
msgstr "_Kopier transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:192
-#: ../src/gnome/gnc-plugin-page-register.c:194
+#: ../src/gnome/gnc-plugin-page-register.c:196
msgid "_Paste Transaction"
msgstr "_Indsæt transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:193
-#: ../src/gnome/gnc-plugin-page-register.c:195
+#: ../src/gnome/gnc-plugin-page-register.c:197
msgid "Dup_licate Transaction"
msgstr "_Dupliker transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:194
-#: ../src/gnome/gnc-plugin-page-register.c:196
+#: ../src/gnome/gnc-plugin-page-register.c:198
#: ../src/gnome/gnc-split-reg.c:1335
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1065
msgid "_Delete Transaction"
msgstr "_Slet transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:195
-#: ../src/gnome/gnc-plugin-page-register.c:200
+#: ../src/gnome/gnc-plugin-page-register.c:202
msgid "Cu_t Split"
msgstr "_Klip opdeling"
#: ../src/gnome/gnc-plugin-page-register2.c:196
-#: ../src/gnome/gnc-plugin-page-register.c:201
+#: ../src/gnome/gnc-plugin-page-register.c:203
msgid "_Copy Split"
msgstr "_Kopier opdeling"
#: ../src/gnome/gnc-plugin-page-register2.c:197
-#: ../src/gnome/gnc-plugin-page-register.c:202
+#: ../src/gnome/gnc-plugin-page-register.c:204
msgid "_Paste Split"
msgstr "_Indsæt opdeling"
#: ../src/gnome/gnc-plugin-page-register2.c:198
-#: ../src/gnome/gnc-plugin-page-register.c:203
+#: ../src/gnome/gnc-plugin-page-register.c:205
msgid "Dup_licate Split"
msgstr "_Dupliker opdeling"
#: ../src/gnome/gnc-plugin-page-register2.c:199
-#: ../src/gnome/gnc-plugin-page-register.c:204
+#: ../src/gnome/gnc-plugin-page-register.c:206
#: ../src/gnome/gnc-split-reg.c:1295
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1025
msgid "_Delete Split"
msgstr "_Slet opdeling"
#: ../src/gnome/gnc-plugin-page-register2.c:200
-#: ../src/gnome/gnc-plugin-page-register.c:205
+#: ../src/gnome/gnc-plugin-page-register.c:207
msgid "Cut the selected transaction into clipboard"
msgstr "Klip den valgte transaktion til udklipsholderen"
#: ../src/gnome/gnc-plugin-page-register2.c:201
-#: ../src/gnome/gnc-plugin-page-register.c:206
+#: ../src/gnome/gnc-plugin-page-register.c:208
msgid "Copy the selected transaction into clipboard"
msgstr "Kopier den valgte transaktion til udklipsholderen"
#: ../src/gnome/gnc-plugin-page-register2.c:202
-#: ../src/gnome/gnc-plugin-page-register.c:207
+#: ../src/gnome/gnc-plugin-page-register.c:209
msgid "Paste the transaction from the clipboard"
msgstr "Indsæt transaktionen fra udklipsholderen"
#: ../src/gnome/gnc-plugin-page-register2.c:203
-#: ../src/gnome/gnc-plugin-page-register.c:208
+#: ../src/gnome/gnc-plugin-page-register.c:210
msgid "Make a copy of the current transaction"
msgstr "Lav en kopi af den nuværende transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:204
-#: ../src/gnome/gnc-plugin-page-register.c:209
+#: ../src/gnome/gnc-plugin-page-register.c:211
msgid "Delete the current transaction"
msgstr "Slet den nuværende transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:205
-#: ../src/gnome/gnc-plugin-page-register.c:213
+#: ../src/gnome/gnc-plugin-page-register.c:215
msgid "Cut the selected split into clipboard"
msgstr "Klip den valgte opdeling til udklipsholderen"
#: ../src/gnome/gnc-plugin-page-register2.c:206
-#: ../src/gnome/gnc-plugin-page-register.c:214
+#: ../src/gnome/gnc-plugin-page-register.c:216
msgid "Copy the selected split into clipboard"
msgstr "Kopier den valgte opdeling til udklipsholderen"
#: ../src/gnome/gnc-plugin-page-register2.c:207
-#: ../src/gnome/gnc-plugin-page-register.c:215
+#: ../src/gnome/gnc-plugin-page-register.c:217
msgid "Paste the split from the clipboard"
msgstr "Indsæt opdelingen fra udklipsholderen"
#: ../src/gnome/gnc-plugin-page-register2.c:208
-#: ../src/gnome/gnc-plugin-page-register.c:216
+#: ../src/gnome/gnc-plugin-page-register.c:218
msgid "Make a copy of the current split"
msgstr "Lav en kopi af den nuværende opdeling"
#: ../src/gnome/gnc-plugin-page-register2.c:209
-#: ../src/gnome/gnc-plugin-page-register.c:217
+#: ../src/gnome/gnc-plugin-page-register.c:219
msgid "Delete the current split"
msgstr "Slet den nuværende opdeling"
#: ../src/gnome/gnc-plugin-page-register2.c:219
-#: ../src/gnome/gnc-plugin-page-register.c:224
+#: ../src/gnome/gnc-plugin-page-register.c:226
msgid "_Print Checks..."
msgstr "_Udskriv check ..."
#: ../src/gnome/gnc-plugin-page-register2.c:226
-#: ../src/gnome/gnc-plugin-page-register.c:231
+#: ../src/gnome/gnc-plugin-page-register.c:233
#: ../src/gnome-utils/gnc-main-window.c:305
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1018
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1019
msgid "Cu_t"
msgstr "_Klip"
#: ../src/gnome/gnc-plugin-page-register2.c:227
-#: ../src/gnome/gnc-plugin-page-register.c:232
+#: ../src/gnome/gnc-plugin-page-register.c:234
#: ../src/gnome-utils/gnc-main-window.c:306
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1019
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1020
msgid "Cut the current selection and copy it to clipboard"
msgstr "Klip den nuværende markering og kopier den til udklipsholderen"
#: ../src/gnome/gnc-plugin-page-register2.c:231
-#: ../src/gnome/gnc-plugin-page-register.c:236
+#: ../src/gnome/gnc-plugin-page-register.c:238
#: ../src/gnome-utils/gnc-main-window.c:310
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1023
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1024
msgid "_Copy"
msgstr "_Kopier"
#: ../src/gnome/gnc-plugin-page-register2.c:232
-#: ../src/gnome/gnc-plugin-page-register.c:237
+#: ../src/gnome/gnc-plugin-page-register.c:239
#: ../src/gnome-utils/gnc-main-window.c:311
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1024
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1025
msgid "Copy the current selection to clipboard"
msgstr "Kopier den nuværende markering til udklipsholderen"
#: ../src/gnome/gnc-plugin-page-register2.c:237
-#: ../src/gnome/gnc-plugin-page-register.c:242
+#: ../src/gnome/gnc-plugin-page-register.c:244
#: ../src/gnome-utils/gnc-main-window.c:316
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1029
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1030
msgid "Paste the clipboard content at the cursor position"
msgstr "Indsæt indholdet fra udklipsholderen ved markørens position"
@@ -5911,42 +5935,42 @@ msgid "Remo_ve All Splits"
msgstr "_Fjern alle opdelinger"
#: ../src/gnome/gnc-plugin-page-register2.c:280
-#: ../src/gnome/gnc-plugin-page-register.c:285
+#: ../src/gnome/gnc-plugin-page-register.c:287
msgid "Remove all splits in the current transaction"
msgstr "Fjern alle opdelinger i den nuværende transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:284
-#: ../src/gnome/gnc-plugin-page-register.c:289
+#: ../src/gnome/gnc-plugin-page-register.c:291
msgid "_Enter Transaction"
msgstr "_Indtast transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:285
-#: ../src/gnome/gnc-plugin-page-register.c:290
+#: ../src/gnome/gnc-plugin-page-register.c:292
msgid "Record the current transaction"
msgstr "Optag den aktuelle transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:289
-#: ../src/gnome/gnc-plugin-page-register.c:294
+#: ../src/gnome/gnc-plugin-page-register.c:296
msgid "Ca_ncel Transaction"
msgstr "_Afbryd transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:290
-#: ../src/gnome/gnc-plugin-page-register.c:295
+#: ../src/gnome/gnc-plugin-page-register.c:297
msgid "Cancel the current transaction"
-msgstr "Afbryd den nuværende transaktion"
+msgstr "Annuller den nuværende transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:294
-#: ../src/gnome/gnc-plugin-page-register.c:299
+#: ../src/gnome/gnc-plugin-page-register.c:301
msgid "_Void Transaction"
msgstr "Gør transaktionen _ugyldig"
#: ../src/gnome/gnc-plugin-page-register2.c:298
-#: ../src/gnome/gnc-plugin-page-register.c:303
+#: ../src/gnome/gnc-plugin-page-register.c:305
msgid "_Unvoid Transaction"
msgstr "Gør transaktionen _gyldig"
#: ../src/gnome/gnc-plugin-page-register2.c:302
-#: ../src/gnome/gnc-plugin-page-register.c:307
+#: ../src/gnome/gnc-plugin-page-register.c:309
msgid "Add _Reversing Transaction"
msgstr "Tilføj _omvendt transaktion"
@@ -5968,99 +5992,99 @@ msgstr "Flyt den nuværende transaktion en række ned. Kun tilgængelig hvis dat
#: ../src/gnome/gnc-plugin-page-register2.c:323
#: ../src/gnome-utils/gnc-main-window.c:336
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1033
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1034
msgid "_Refresh"
msgstr "Opdate_r"
#: ../src/gnome/gnc-plugin-page-register2.c:324
#: ../src/gnome-utils/gnc-main-window.c:337
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1034
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1035
msgid "Refresh this window"
msgstr "Opdater dette vindue"
#: ../src/gnome/gnc-plugin-page-register2.c:342
-#: ../src/gnome/gnc-plugin-page-register.c:351
+#: ../src/gnome/gnc-plugin-page-register.c:353
msgid "Automatically clear individual transactions, so as to reach a certain cleared amount"
msgstr ""
#: ../src/gnome/gnc-plugin-page-register2.c:356
-#: ../src/gnome/gnc-plugin-page-register.c:365
+#: ../src/gnome/gnc-plugin-page-register.c:367
msgid "_Blank Transaction"
msgstr "_Tom transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:357
-#: ../src/gnome/gnc-plugin-page-register.c:366
+#: ../src/gnome/gnc-plugin-page-register.c:368
msgid "Move to the blank transaction at the bottom of the register"
msgstr "Flyt til den tomme transaktion i slutningen af kassekladden"
#: ../src/gnome/gnc-plugin-page-register2.c:361
-#: ../src/gnome/gnc-plugin-page-register.c:370
+#: ../src/gnome/gnc-plugin-page-register.c:372
msgid "Edit E_xchange Rate"
msgstr "Rediger _vekselkurs"
#: ../src/gnome/gnc-plugin-page-register2.c:362
-#: ../src/gnome/gnc-plugin-page-register.c:371
+#: ../src/gnome/gnc-plugin-page-register.c:373
msgid "Edit the exchange rate for the current transaction"
msgstr "Rediger vekselkursen for den nuværende transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:366
-#: ../src/gnome/gnc-plugin-page-register.c:375
+#: ../src/gnome/gnc-plugin-page-register.c:377
#: ../src/gnome-utils/gnc-icons.c:45
msgid "_Jump"
msgstr "_Spring"
#: ../src/gnome/gnc-plugin-page-register2.c:367
-#: ../src/gnome/gnc-plugin-page-register.c:376
+#: ../src/gnome/gnc-plugin-page-register.c:378
msgid "Jump to the corresponding transaction in the other account"
msgstr "Spring til den tilsvarende transaktion i den anden konto."
#: ../src/gnome/gnc-plugin-page-register2.c:371
-#: ../src/gnome/gnc-plugin-page-register.c:380
+#: ../src/gnome/gnc-plugin-page-register.c:382
msgid "Sche_dule..."
msgstr "_Planlæg ..."
#: ../src/gnome/gnc-plugin-page-register2.c:372
-#: ../src/gnome/gnc-plugin-page-register.c:381
+#: ../src/gnome/gnc-plugin-page-register.c:383
msgid "Create a Scheduled Transaction with the current transaction as a template"
msgstr "Opret en planlagt transaktion med den nuværende transaktion som skabelon"
#: ../src/gnome/gnc-plugin-page-register2.c:376
-#: ../src/gnome/gnc-plugin-page-register.c:385
+#: ../src/gnome/gnc-plugin-page-register.c:387
msgid "_All transactions"
msgstr "_Alle transaktioner"
#: ../src/gnome/gnc-plugin-page-register2.c:380
-#: ../src/gnome/gnc-plugin-page-register.c:389
+#: ../src/gnome/gnc-plugin-page-register.c:391
msgid "_This transaction"
msgstr "_Denne transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:387
-#: ../src/gnome/gnc-plugin-page-register.c:396
+#: ../src/gnome/gnc-plugin-page-register.c:398
msgid "Account Report"
msgstr "Kontorapport"
#: ../src/gnome/gnc-plugin-page-register2.c:388
-#: ../src/gnome/gnc-plugin-page-register.c:397
+#: ../src/gnome/gnc-plugin-page-register.c:399
msgid "Open a register report for this Account"
msgstr "Ã…bn en kassekladerapport for denne konto"
#: ../src/gnome/gnc-plugin-page-register2.c:392
-#: ../src/gnome/gnc-plugin-page-register.c:401
+#: ../src/gnome/gnc-plugin-page-register.c:403
msgid "Account Report - Single Transaction"
msgstr "Kontorapporte - En transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:393
-#: ../src/gnome/gnc-plugin-page-register.c:402
+#: ../src/gnome/gnc-plugin-page-register.c:404
msgid "Open a register report for the selected Transaction"
msgstr "Ã…bn en kassekladerapport for den valgte transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:403
-#: ../src/gnome/gnc-plugin-page-register.c:412
+#: ../src/gnome/gnc-plugin-page-register.c:414
msgid "_Double Line"
msgstr "_Dobbelt linje"
#: ../src/gnome/gnc-plugin-page-register2.c:404
-#: ../src/gnome/gnc-plugin-page-register.c:413
+#: ../src/gnome/gnc-plugin-page-register.c:415
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:89
msgid "Show two lines of information for each transaction"
msgstr "Vis to linjer med oplysninger for hver transaktion"
@@ -6074,71 +6098,71 @@ msgid "Show entered and reconciled dates"
msgstr "Vis indtastede og afstemte datoer"
#: ../src/gnome/gnc-plugin-page-register2.c:415
-#: ../src/gnome/gnc-plugin-page-register.c:418
+#: ../src/gnome/gnc-plugin-page-register.c:420
#: ../src/gnome-utils/gnc-icons.c:44
msgid "S_plit Transaction"
msgstr "_Opdel transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:416
-#: ../src/gnome/gnc-plugin-page-register.c:419
+#: ../src/gnome/gnc-plugin-page-register.c:421
msgid "Show all splits in the current transaction"
msgstr "Vis alle opsplitninger i den aktuelle transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:427
-#: ../src/gnome/gnc-plugin-page-register.c:430
+#: ../src/gnome/gnc-plugin-page-register.c:432
msgid "_Basic Ledger"
msgstr "_Basishovedbog"
#: ../src/gnome/gnc-plugin-page-register2.c:428
-#: ../src/gnome/gnc-plugin-page-register.c:431
+#: ../src/gnome/gnc-plugin-page-register.c:433
msgid "Show transactions on one or two lines"
msgstr "Vis transaktioner på én eller to linjer"
#: ../src/gnome/gnc-plugin-page-register2.c:432
-#: ../src/gnome/gnc-plugin-page-register.c:435
+#: ../src/gnome/gnc-plugin-page-register.c:437
msgid "_Auto-Split Ledger"
msgstr "_Autoopdel hovedbog"
#: ../src/gnome/gnc-plugin-page-register2.c:433
-#: ../src/gnome/gnc-plugin-page-register.c:436
+#: ../src/gnome/gnc-plugin-page-register.c:438
msgid "Show transactions on one or two lines and expand the current transaction"
msgstr "Vis transaktioner på én eller to linjer og ekspander den aktuelle transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:437
-#: ../src/gnome/gnc-plugin-page-register.c:440
+#: ../src/gnome/gnc-plugin-page-register.c:442
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:141
msgid "Transaction _Journal"
msgstr "Transaktions_rapport"
#: ../src/gnome/gnc-plugin-page-register2.c:438
-#: ../src/gnome/gnc-plugin-page-register.c:441
+#: ../src/gnome/gnc-plugin-page-register.c:443
msgid "Show expanded transactions with all splits"
msgstr "Vis ekspanderede transaktioner med alle opdelinger"
#: ../src/gnome/gnc-plugin-page-register2.c:476
-#: ../src/gnome/gnc-plugin-page-register.c:479
+#: ../src/gnome/gnc-plugin-page-register.c:481
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2900
#: ../src/register/ledger-core/split-register.c:2489
-#: ../src/register/ledger-core/split-register-layout.c:687
-#: ../src/register/ledger-core/split-register-model.c:332
+#: ../src/register/ledger-core/split-register-layout.c:714
+#: ../src/register/ledger-core/split-register-model.c:339
#: ../src/report/standard-reports/register.scm:154
msgid "Transfer"
msgstr "Overfør"
#: ../src/gnome/gnc-plugin-page-register2.c:481
-#: ../src/gnome/gnc-plugin-page-register.c:484
+#: ../src/gnome/gnc-plugin-page-register.c:486
#: ../src/gnome-search/dialog-search.c:1085
msgid "Split"
msgstr "Del"
#: ../src/gnome/gnc-plugin-page-register2.c:482
-#: ../src/gnome/gnc-plugin-page-register.c:485
+#: ../src/gnome/gnc-plugin-page-register.c:487
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:24
msgid "Schedule"
msgstr "Planlæg"
#: ../src/gnome/gnc-plugin-page-register2.c:485
-#: ../src/gnome/gnc-plugin-page-register.c:488
+#: ../src/gnome/gnc-plugin-page-register.c:490
#: ../src/gnome/window-autoclear.c:92
msgid "Auto-clear"
msgstr ""
@@ -6154,23 +6178,23 @@ msgstr "Hovedbog2"
#. Translators: %s is the name
#. of the tab page
#: ../src/gnome/gnc-plugin-page-register2.c:1613
-#: ../src/gnome/gnc-plugin-page-register.c:1544
+#: ../src/gnome/gnc-plugin-page-register.c:1553
#, c-format
msgid "Save changes to %s?"
msgstr "Gem ændringer til %s?"
#: ../src/gnome/gnc-plugin-page-register2.c:1617
-#: ../src/gnome/gnc-plugin-page-register.c:1548
+#: ../src/gnome/gnc-plugin-page-register.c:1557
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?"
-msgstr "Denne kassekladde har igangværende ændringer til en transaktion. Vil du gemme ændringerne til denne transaktion, fjerne transaktionen eller afbryde handlingen?"
+msgstr "Denne kassekladde har igangværende ændringer til en transaktion. Vil du gemme ændringerne til denne transaktion, fjerne transaktionen eller annullere handlingen?"
#: ../src/gnome/gnc-plugin-page-register2.c:1620
-#: ../src/gnome/gnc-plugin-page-register.c:1551
+#: ../src/gnome/gnc-plugin-page-register.c:1560
msgid "_Discard Transaction"
msgstr "_Fjern transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:1624
-#: ../src/gnome/gnc-plugin-page-register.c:1555
+#: ../src/gnome/gnc-plugin-page-register.c:1564
msgid "_Save Transaction"
msgstr "_Gem transaktion"
@@ -6179,35 +6203,35 @@ msgstr "_Gem transaktion"
#: ../src/gnome/gnc-plugin-page-register2.c:1700
#: ../src/gnome/gnc-plugin-page-register2.c:1723
#: ../src/gnome/gnc-plugin-page-register2.c:1773
-#: ../src/gnome/gnc-plugin-page-register.c:1587
-#: ../src/gnome/gnc-plugin-page-register.c:1622
-#: ../src/gnome/gnc-plugin-page-register.c:1634
-#: ../src/gnome/gnc-plugin-page-register.c:1657
-#: ../src/gnome/gnc-plugin-page-register.c:1707
-#: ../src/gnome/gnc-plugin-page-register.c:1751
+#: ../src/gnome/gnc-plugin-page-register.c:1596
+#: ../src/gnome/gnc-plugin-page-register.c:1631
+#: ../src/gnome/gnc-plugin-page-register.c:1643
+#: ../src/gnome/gnc-plugin-page-register.c:1666
+#: ../src/gnome/gnc-plugin-page-register.c:1716
+#: ../src/gnome/gnc-plugin-page-register.c:1799
msgid "unknown"
msgstr "ukendt"
#: ../src/gnome/gnc-plugin-page-register2.c:1674
#: ../src/gnome/gnc-plugin-page-register2.c:2395
-#: ../src/gnome/gnc-plugin-page-register.c:758
-#: ../src/gnome/gnc-plugin-page-register.c:1608
-#: ../src/gnome/gnc-plugin-page-register.c:2563
+#: ../src/gnome/gnc-plugin-page-register.c:761
+#: ../src/gnome/gnc-plugin-page-register.c:1617
+#: ../src/gnome/gnc-plugin-page-register.c:2606
#: ../src/report/standard-reports/general-ledger.scm:40
msgid "General Ledger"
msgstr "Hovedbog"
#: ../src/gnome/gnc-plugin-page-register2.c:1676
#: ../src/gnome/gnc-plugin-page-register2.c:2401
-#: ../src/gnome/gnc-plugin-page-register.c:1610
-#: ../src/gnome/gnc-plugin-page-register.c:2569
+#: ../src/gnome/gnc-plugin-page-register.c:1619
+#: ../src/gnome/gnc-plugin-page-register.c:2612
msgid "Portfolio"
msgstr "Portefølje"
#: ../src/gnome/gnc-plugin-page-register2.c:1678
#: ../src/gnome/gnc-plugin-page-register2.c:2407
-#: ../src/gnome/gnc-plugin-page-register.c:1612
-#: ../src/gnome/gnc-plugin-page-register.c:2575
+#: ../src/gnome/gnc-plugin-page-register.c:1621
+#: ../src/gnome/gnc-plugin-page-register.c:2618
msgid "Search Results"
msgstr "Søgeresultater"
@@ -6216,17 +6240,17 @@ msgid "General Ledger Report"
msgstr "Hovedbogsrapport"
#: ../src/gnome/gnc-plugin-page-register2.c:2403
-#: ../src/gnome/gnc-plugin-page-register.c:2571
+#: ../src/gnome/gnc-plugin-page-register.c:2614
msgid "Portfolio Report"
msgstr "Porteføljerapport"
#: ../src/gnome/gnc-plugin-page-register2.c:2409
-#: ../src/gnome/gnc-plugin-page-register.c:2577
+#: ../src/gnome/gnc-plugin-page-register.c:2620
msgid "Search Results Report"
msgstr "Søgeresultat-rapport"
#: ../src/gnome/gnc-plugin-page-register2.c:2413
-#: ../src/gnome/gnc-plugin-page-register.c:2581
+#: ../src/gnome/gnc-plugin-page-register.c:2624
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:134
#: ../src/report/standard-reports/general-journal.scm:38
#: ../src/report/standard-reports/register.scm:894
@@ -6239,108 +6263,115 @@ msgid "Register Report"
msgstr "Kassekladderapport"
#: ../src/gnome/gnc-plugin-page-register2.c:2431
-#: ../src/gnome/gnc-plugin-page-register.c:2599
+#: ../src/gnome/gnc-plugin-page-register.c:2642
msgid "and subaccounts"
msgstr "og underkonti"
-#: ../src/gnome/gnc-plugin-page-register2.c:2630
-#: ../src/gnome/gnc-plugin-page-register.c:2762
+#: ../src/gnome/gnc-plugin-page-register2.c:2632
+#: ../src/gnome/gnc-plugin-page-register.c:2807
msgid "Print checks from multiple accounts?"
msgstr "Udskriv check fra flere konti?"
-#: ../src/gnome/gnc-plugin-page-register2.c:2632
-#: ../src/gnome/gnc-plugin-page-register.c:2764
+#: ../src/gnome/gnc-plugin-page-register2.c:2634
+#: ../src/gnome/gnc-plugin-page-register.c:2809
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?"
msgstr ""
-#: ../src/gnome/gnc-plugin-page-register2.c:2643
-#: ../src/gnome/gnc-plugin-page-register.c:2775
+#: ../src/gnome/gnc-plugin-page-register2.c:2644
+#: ../src/gnome/gnc-plugin-page-register.c:2819
msgid "_Print checks"
msgstr "_Udskriv check"
-#: ../src/gnome/gnc-plugin-page-register2.c:2662
-#: ../src/gnome/gnc-plugin-page-register.c:2794
+#: ../src/gnome/gnc-plugin-page-register2.c:2663
+#: ../src/gnome/gnc-plugin-page-register.c:2838
msgid "You can only print checks from a bank account register or search results."
msgstr "Du kan kun udskrive check fra en bankkontokassekladde eller søgeresultater."
-#: ../src/gnome/gnc-plugin-page-register2.c:2854
-#: ../src/gnome/gnc-plugin-page-register.c:2954
+#: ../src/gnome/gnc-plugin-page-register2.c:2855
+#: ../src/gnome/gnc-plugin-page-register.c:2998
msgid "You cannot void a transaction with reconciled or cleared splits."
msgstr "Du kan ikke gøre en transaktion ugyldig som har afstemte eller ryddede opdelinger."
#. Translators: The %s is the name of the plugin page
-#: ../src/gnome/gnc-plugin-page-register2.c:2998
-#: ../src/gnome/gnc-plugin-page-register.c:3153
+#: ../src/gnome/gnc-plugin-page-register2.c:2999
+#: ../src/gnome/gnc-plugin-page-register.c:3204
#: ../src/gnome-utils/gnc-tree-view-account.c:2145
-#: ../src/gnome-utils/gnc-tree-view-owner.c:1178
+#: ../src/gnome-utils/gnc-tree-view-owner.c:1205
#, c-format
msgid "Filter %s by..."
msgstr "Filtrer %s efter ..."
-#: ../src/gnome/gnc-plugin-page-register.c:197
+#: ../src/gnome/gnc-plugin-page-register.c:199
msgid "_Associate File with Transaction"
msgstr "_Forbind fil med transaktion"
-#: ../src/gnome/gnc-plugin-page-register.c:198
+#: ../src/gnome/gnc-plugin-page-register.c:200
msgid "_Associate Location with Transaction"
msgstr "_Forbind placering med transaktion"
-#: ../src/gnome/gnc-plugin-page-register.c:199
+#: ../src/gnome/gnc-plugin-page-register.c:201
msgid "_Open Associated File/Location"
msgstr "_Ã…bn forbundet fil/placering"
-#: ../src/gnome/gnc-plugin-page-register.c:210
+#: ../src/gnome/gnc-plugin-page-register.c:212
msgid "Associate a file with the current transaction"
msgstr "Forbind en fil med den nuværende transaktion"
-#: ../src/gnome/gnc-plugin-page-register.c:211
+#: ../src/gnome/gnc-plugin-page-register.c:213
msgid "Associate a location with the current transaction"
msgstr "Forbind en placering med den nuværende transaktion"
-#: ../src/gnome/gnc-plugin-page-register.c:212
+#: ../src/gnome/gnc-plugin-page-register.c:214
msgid "Open the associated file or location with the current transaction"
msgstr "Opret en forbundet fil eller placering med den nuværende transaktion"
-#: ../src/gnome/gnc-plugin-page-register.c:284
+#: ../src/gnome/gnc-plugin-page-register.c:286
msgid "Remo_ve Other Splits"
msgstr "_Fjern andre opdelinger"
-#: ../src/gnome/gnc-plugin-page-register.c:329
+#: ../src/gnome/gnc-plugin-page-register.c:331
#: ../src/gnome-utils/gnc-main-window.c:328
msgid "_Sort By..."
msgstr "_Sorter efter ..."
-#: ../src/gnome/gnc-plugin-page-register.c:489
+#: ../src/gnome/gnc-plugin-page-register.c:491
msgid "Associate File"
msgstr "Forbind fil"
-#: ../src/gnome/gnc-plugin-page-register.c:490
+#: ../src/gnome/gnc-plugin-page-register.c:492
msgid "Associate Location"
msgstr "Forbind placering"
-#: ../src/gnome/gnc-plugin-page-register.c:491
+#: ../src/gnome/gnc-plugin-page-register.c:493
msgid "Open File/Location"
msgstr "Ã…bn fil/placering"
-#: ../src/gnome/gnc-plugin-page-register.c:685
+#: ../src/gnome/gnc-plugin-page-register.c:688
msgid "You have tried to open an account in the old register while it is open in the new register."
msgstr "Du har forsøgt at åbne en fil i den gamle kassekladde, mens den er åben i den nye klassekladde. "
#. Define the strings here to avoid typos and make changes easier.
-#: ../src/gnome/gnc-plugin-page-register.c:2565
-#: ../src/gnome/gnc-plugin-page-register.c:2583
+#: ../src/gnome/gnc-plugin-page-register.c:2608
+#: ../src/gnome/gnc-plugin-page-register.c:2626
#: ../src/report/standard-reports/transaction.scm:48
msgid "Transaction Report"
msgstr "Transaktionsrapport"
-#: ../src/gnome/gnc-plugin-page-register.c:3025
+#: ../src/gnome/gnc-plugin-page-register.c:3004
+#: ../src/gnome/gnc-split-reg.c:909
+#: ../src/gnome-utils/gnc-tree-control-split-reg.c:68
+#, c-format
+msgid "This transaction is marked read-only with the comment: '%s'"
+msgstr "Denne transaktion er markeret skrivebeskyttet med kommentaren: »%s«"
+
+#: ../src/gnome/gnc-plugin-page-register.c:3075
#: ../src/gnome/gnc-split-reg.c:880
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1123
msgid "A reversing entry has already been created for this transaction."
msgstr ""
#. Translations: The %s is the name of the plugin page
-#: ../src/gnome/gnc-plugin-page-register.c:3076
+#: ../src/gnome/gnc-plugin-page-register.c:3126
#, c-format
msgid "Sort %s by..."
msgstr "Sorter %s efter ..."
@@ -6425,59 +6456,59 @@ msgstr "Ã…bn et hovedbogsvindue i gammel stil"
msgid "Open general ledger window"
msgstr "Ã…bn hovedbogsvindue"
-#: ../src/gnome/gnc-split-reg2.c:625 ../src/gnome/gnc-split-reg.c:634
+#: ../src/gnome/gnc-split-reg2.c:626 ../src/gnome/gnc-split-reg.c:634
msgid "<No information>"
msgstr "<ingen information>"
-#: ../src/gnome/gnc-split-reg2.c:764 ../src/gnome/gnc-split-reg.c:1622
+#: ../src/gnome/gnc-split-reg2.c:765 ../src/gnome/gnc-split-reg.c:1622
msgid "Balancing entry from reconcilation"
msgstr ""
-#: ../src/gnome/gnc-split-reg2.c:935 ../src/gnome/gnc-split-reg.c:2070
+#: ../src/gnome/gnc-split-reg2.c:936 ../src/gnome/gnc-split-reg.c:2075
msgid "Present:"
msgstr "Nutidig:"
-#: ../src/gnome/gnc-split-reg2.c:936 ../src/gnome/gnc-split-reg.c:2071
+#: ../src/gnome/gnc-split-reg2.c:937 ../src/gnome/gnc-split-reg.c:2076
msgid "Future:"
msgstr "Fremtidig:"
-#: ../src/gnome/gnc-split-reg2.c:937 ../src/gnome/gnc-split-reg.c:2072
+#: ../src/gnome/gnc-split-reg2.c:938 ../src/gnome/gnc-split-reg.c:2077
msgid "Cleared:"
msgstr "Kontrolleret:"
-#: ../src/gnome/gnc-split-reg2.c:938 ../src/gnome/gnc-split-reg.c:2073
+#: ../src/gnome/gnc-split-reg2.c:939 ../src/gnome/gnc-split-reg.c:2078
msgid "Reconciled:"
msgstr "Afstemt:"
-#: ../src/gnome/gnc-split-reg2.c:939 ../src/gnome/gnc-split-reg.c:2074
+#: ../src/gnome/gnc-split-reg2.c:940 ../src/gnome/gnc-split-reg.c:2079
msgid "Projected Minimum:"
msgstr ""
-#: ../src/gnome/gnc-split-reg2.c:943 ../src/gnome/gnc-split-reg.c:2078
+#: ../src/gnome/gnc-split-reg2.c:944 ../src/gnome/gnc-split-reg.c:2083
msgid "Shares:"
msgstr "Aktier:"
-#: ../src/gnome/gnc-split-reg2.c:944 ../src/gnome/gnc-split-reg.c:2079
+#: ../src/gnome/gnc-split-reg2.c:945 ../src/gnome/gnc-split-reg.c:2084
msgid "Current Value:"
msgstr "Nutidsværdi:"
-#: ../src/gnome/gnc-split-reg2.c:1019
+#: ../src/gnome/gnc-split-reg2.c:1020
msgid "Account Payable / Receivable Register"
msgstr "Kassekladde for betalingskonti og tilgodehavender"
-#: ../src/gnome/gnc-split-reg2.c:1021
+#: ../src/gnome/gnc-split-reg2.c:1022
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."
msgstr "Den viste kassekladde er for betalingskonti eller tilgodehavender. Ændring af posterne kan medføre skade, så brug venligst forretningsindstillingerne til at ændre posterne."
-#: ../src/gnome/gnc-split-reg2.c:1068 ../src/gnome/gnc-split-reg.c:2153
+#: ../src/gnome/gnc-split-reg2.c:1069 ../src/gnome/gnc-split-reg.c:2158
msgid "This account register is read-only."
msgstr "Denne kontokasseklade er skrivebeskyttet."
-#: ../src/gnome/gnc-split-reg2.c:1111 ../src/gnome/gnc-split-reg.c:2196
+#: ../src/gnome/gnc-split-reg2.c:1112 ../src/gnome/gnc-split-reg.c:2201
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."
msgstr "Denne konto kan ikke redigeres. Hvis du ønsker at redigere transaktioner i denne kassekladde så åbn venligst kontoindstillingerne og fjern tjekboksen for sumkonto."
-#: ../src/gnome/gnc-split-reg2.c:1118 ../src/gnome/gnc-split-reg.c:2203
+#: ../src/gnome/gnc-split-reg2.c:1119 ../src/gnome/gnc-split-reg.c:2208
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."
msgstr "En af de valgte underkonti kan ikke redigeres. Hvis du ønsker at redigere transaktioner i denne kasseklade, så åbn venligst indstillingerne for underkonti og fjern tjekboksen for sumkonto. Du kan også åbne en individuel konto fremfor et sæt af konti."
@@ -6486,12 +6517,6 @@ msgstr "En af de valgte underkonti kan ikke redigeres. Hvis du ønsker at redige
msgid "Cannot modify or delete this transaction."
msgstr "Kan ikke ændre eller slette denne transaktion."
-#: ../src/gnome/gnc-split-reg.c:909
-#: ../src/gnome-utils/gnc-tree-control-split-reg.c:68
-#, c-format
-msgid "This transaction is marked read-only with the comment: '%s'"
-msgstr "Denne transaktion er markeret skrivebeskyttet med kommentaren: »%s«"
-
#: ../src/gnome/gnc-split-reg.c:921
#: ../src/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."
@@ -6727,7 +6752,7 @@ msgstr "Placering af den vandrette panelopdeler."
#: ../src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:5
msgid "This setting indicates whether to search in all items in the current class, or only in 'active' items in the current class."
-msgstr ""
+msgstr "Denne indstilling angiver, om der skal søges i alle elementer i den nuværende klasse, eller kun i »aktive« elementer i den nuværende klasse."
#: ../src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:6
#: ../src/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in.h:17
@@ -6745,12 +6770,11 @@ msgstr "Sidste stinavn brugt"
#: ../src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in.h:2
#: ../src/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in.h:7
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."
-msgstr ""
+msgstr "Dette felt indeholder det sidste stinavn brugt af dette vindue. Det vil blive brugt som opstartsfilnavn og -stinavn den næste gang dette vindue åbnes."
#: ../src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:8
-#, fuzzy
msgid "Position of the vertical pane divider."
-msgstr "Markørens farve"
+msgstr "Position for den lodrette panelopdeler."
#: ../src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:9
msgid "Show the new user window"
@@ -6766,11 +6790,11 @@ msgstr "Nyt hierarkivindue på »Ny fil«"
#: ../src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:12
msgid "If active, the \"New Hierarchy\" window will be shown whenever the \"New File\" menu item is chosen. Otherwise it will not be shown."
-msgstr ""
+msgstr "Hvis aktiv vil vinduet »Nyt hierarki« blive vist, når menupunktet »Ny fil« vælges. Ellers vil det ikke blive vist."
#: ../src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:13
msgid "Default to 'new search' if fewer than this number of items is returned"
-msgstr ""
+msgstr "Brug standarden »ny søgning« hvis færre end dette antal elementer returneres"
#: ../src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:1
msgid "Pre-select cleared transactions"
@@ -6778,11 +6802,11 @@ msgstr "Forhåndsvælg ryddede transaktioner"
#: ../src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:2
msgid "If active, all transactions marked as cleared in the register will appear already selected in the reconcile dialog. Otherwise no transactions will be initially selected."
-msgstr ""
+msgstr "Hvis aktiv vil alle transaktioner markeret som ryddet i kassekladden fremgå som allerede valgte i afstemningsdialogen. Ellers vil ingen transaktioner blive valgt på forhånd."
#: ../src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:3
msgid "Prompt for interest charges"
-msgstr ""
+msgstr "Spørg om renteændringer"
#: ../src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:4
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:118
@@ -6790,14 +6814,12 @@ msgid "Prior to reconciling an account which charges or pays interest, prompt th
msgstr ""
#: ../src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:5
-#, fuzzy
msgid "Prompt for credit card payment"
-msgstr "Automatiske kreditkortbetalinger"
+msgstr "Spørg om kreditkortbetaling"
#: ../src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:6
-#, fuzzy
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."
-msgstr "Bed brugeren angive en kreditkorts-indbetaling efter afstemning af et kreditkortsudtog"
+msgstr "Hvis aktiv, så anmod brugeren om at indtaste en kreditkortbetaling efter afstemning af en kreditkortkonto. I andre tilfælde skal brugeren ikke spørges."
#: ../src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:7
msgid "Always reconcile to today"
@@ -6808,20 +6830,16 @@ msgid "If active, always open the reconcile dialog using today's date for the st
msgstr ""
#: ../src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:3
-#, fuzzy
-#| msgid "Show the \"since last run\" window when a file is opened."
msgid "Run \"since last run\" dialog when a file is opened."
-msgstr "Vis »siden sidste kørsel«-vinduet når en fil åbnes."
+msgstr "Kør »siden sidste kørsel«-vinduet når en fil åbnes."
#: ../src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:4
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."
msgstr ""
#: ../src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:5
-#, fuzzy
-#| msgid "Show the \"since last run\" window when a file is opened."
msgid "Show \"since last run\" notification dialog when a file is opened."
-msgstr "Vis »siden sidste kørsel«-vinduet når en fil åbnes."
+msgstr "Vis »siden sidste kørsel«-påmindelsesvinduet når en fil åbnes."
#: ../src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:6
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."
@@ -6840,9 +6858,8 @@ msgid "How many days in advance to notify the user."
msgstr "Hvor mange dage i forvejen, brugeren skal have besked."
#: ../src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:10
-#, fuzzy
msgid "Set the \"notify\" flag by default"
-msgstr "Sæt valgmuligheden til dens standardværdi"
+msgstr "Sæt flaget »notify« til dets standardværdi"
#: ../src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:11
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."
@@ -6873,9 +6890,8 @@ msgid "If active, the size and location of each dialog window will be saved when
msgstr ""
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:3
-#, fuzzy
msgid "Character to use as separator between account names"
-msgstr "Tegnet bruges til at adskille fuldt kvalificerede kontonavne"
+msgstr "Tegn der skal bruges til at adskille kontonavne"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:4
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\"."
@@ -6890,13 +6906,12 @@ msgid "Enables file compression when writing the data file."
msgstr "Aktiverer filkomprimering når datafilen skrives."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:7
-#, fuzzy
msgid "Show auto-save explanation"
-msgstr "Vis GnuCash's brugsbeskrivelse"
+msgstr "Vis auto-save-beskrivelse"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:8
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."
-msgstr ""
+msgstr "Hvis aktiv viser GnuCash en beskrivelse af funktionen auto-save den første gang funktionen startes. Ellers vises ikke en ekstra beskrivelse."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:9
msgid "Auto-save time interval"
@@ -6905,12 +6920,12 @@ msgstr "Gem automatisk tidsinterval"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:10
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:85
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."
-msgstr ""
+msgstr "Antallet af minutter før lagring af datafilen på harddisken vil blive startet automatisk. Hvis nul, vil ingen lagring blive startet automatisk."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:11
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:95
msgid "Enable timeout on \"Save changes on closing\" question"
-msgstr ""
+msgstr "Aktiver tidsudløb på spørgsmålet »Gem ændringer ved nedlukning«"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:12
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:96
@@ -6935,33 +6950,30 @@ msgid "Automatically insert a decimal point"
msgstr "Indsæt automatisk et decimaltegn"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:17
-#, fuzzy
msgid "If active, GnuCash will automatically insert a decimal point into values that are entered without one. Otherwise GnuCash will not modify entered numbers."
-msgstr "Indsæt automatisk et decimaltegn i værdier, der indtastes uden et sådant."
+msgstr "Hvis aktiv, vil GnuCash automatisk indsætte et decimaltegn i værdier, der indtastes uden et sådant. Ellers vil GnuCash ikke ændre indtastede tal."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:18
-#, fuzzy
msgid "Number of automatic decimal places"
-msgstr "Hvor mange pladser efter kommaet der skal udfyldes."
+msgstr "Antal automatiske decimaler"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:19
-#, fuzzy
msgid "This field specifies the number of automatic decimal places that will be filled in."
-msgstr "Hvor mange pladser efter kommaet der skal udfyldes."
+msgstr "Dette felt angiver antallet af automatiske decimaler, der skal udfyldes."
+# evt planmæssigt i stedte for med succes
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:20
msgid "Tool to migrate preferences from old backend (CGonf) to new one (GSettings) has run successfully."
-msgstr ""
+msgstr "Værktøj til at migrere præferencer fra gammel motor (CGonf) til den nye (GSettings) er afviklet med succes."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:21
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."
-msgstr ""
+msgstr "GnuCash skiftede til en anden motor for lagring af brugerpræferencer mellem 2.4 og 2.6. For at gøre overgangen nemmere vil de fleste præferencer blive migreret den første gang en 2.6-version af GnuCash afvikles. Denne migrering skal kun afvikles en gang. Denne præference holder styr på hvorvidt dette migreringsværktøj er afviklet med succes."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:22
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:90
-#, fuzzy
msgid "Do not create log/backup files."
-msgstr "Kunne ikke oprette åbningssaldo"
+msgstr "Opret ikke log-/sikkerhedskopifiler."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:23
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'"
@@ -6996,15 +7008,13 @@ msgstr ""
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:30
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:25
-#, fuzzy
msgid "Sign reverse balances on the following: Credit Card, Payable, Liability, Equity, and Income."
-msgstr "Skift fortegn for kreditkort-, passiv-, udlignings- og indtægtskonti."
+msgstr "Skift fortegn for følgende: kreditkort, betalingskonti, passivkonti, egenkapitalkonti og indtægtskonti."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:31
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:27
-#, fuzzy
msgid "Sign reverse balances on income and expense accounts."
-msgstr "Skift fortegn for indtægts- og udgiftskonti"
+msgstr "Skift fortegn for indtægts- og udgiftskonti."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:32
msgid "Use account colors in the account hierarchy"
@@ -7023,9 +7033,8 @@ msgid "If active the account register tabs will be colored using the account's c
msgstr ""
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:36
-#, fuzzy
msgid "Use formal account labels"
-msgstr "Brug bogføringsetiketter"
+msgstr "Brug formelle kontoetiketter"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:37
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."
@@ -7256,9 +7265,8 @@ msgid "Show two lines of information for each transaction in a register. This is
msgstr "Vis to linjer med information for hver transaktion i en klassekladde. Dette er standardinstillingen for første gang en klassekladde åbnes. Indstillingen kan ændres på ethvert tidspunkt via menupunktet »Vis->dobbeltlinje«."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:91
-#, fuzzy
msgid "Only display leaf account names."
-msgstr "Vis kontoen?"
+msgstr "Vis kun bladkontonavne."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:92
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."
@@ -7270,39 +7278,35 @@ msgstr "Vis de indtastede og afstemte datoer"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:94
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:154
-#, fuzzy
msgid "Show the date when the transaction was entered below the posted date and reconciled date on split row."
-msgstr "Opret transaktionen dette antal dage før dets effektive dato."
+msgstr "Vis datoen når transaktionen blev indtastet under den registrerede dato og afstemningsdatoen på opdelingsrækken."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:95
msgid "Show entered and reconciled dates on selection"
-msgstr "Vis indtastede og afstemte datoer for markering"
+msgstr "Vis indtastede datoer og afstemningsdatoer ved markering"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:96
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:160
-#, fuzzy
msgid "Show the entered date and reconciled date on transaction selection."
-msgstr "Vælg »R« for at afstemme sammenhængende transaktioner."
+msgstr "Vis den indtastede dato og afstemningsdato ved transaktionsmarkering."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:97
-#, fuzzy
msgid "Show the calendar buttons"
-msgstr "Vis navnekolonnen"
+msgstr "Vis kalenderknapperne"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:98
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:156
msgid "Show the calendar buttons Cancel, Today and Select."
-msgstr ""
+msgstr "Vis kalenderknapperne annuller, i dag og vælg."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:99
-#, fuzzy
msgid "Move the selection to the blank split on expand"
-msgstr "Flyt den valgte transaktionsskabelon en række op"
+msgstr "Flyt markeringen til den blanke opdeling ved udvidelse"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:100
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:158
msgid "This will move the selection to the blank split when the transaction is expanded."
-msgstr ""
+msgstr "Dette vil flytte markeringen til den blanke opdeling når transaktionen udvides."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:101
msgid "Number of transactions to show in a register."
@@ -7358,9 +7362,8 @@ msgid "This setting chooses the file name for PDF export. This is a sprintf(3) s
msgstr ""
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:114
-#, fuzzy
msgid "PDF export file name date format choice"
-msgstr "Valg af datoformat"
+msgstr "Valg af datoformat for PDF-eksportfil"
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:115
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."
@@ -7376,30 +7379,27 @@ msgstr ""
#: ../src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:1
msgid "Show a grand total of all accounts converted to the default report currency"
-msgstr ""
+msgstr "Vis en samlet sum for alle konti konverteret til rapportens standardvaluta"
#: ../src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:2
-#, fuzzy
msgid "Show non currency commodities"
-msgstr "Vis fremmede valutaer"
+msgstr "Vis varer uden valuta"
#: ../src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:3
msgid "If active, non currency commodities (stocks) will be shown. Otherwise they will be hidden."
-msgstr ""
+msgstr "Hvis aktiv, vil varer uden valuta (aktiver) blive vist. Ellers vil de blive skjult."
#: ../src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:4
-#, fuzzy
msgid "Use relative profit/loss starting date"
-msgstr "Brug nærmeste på transaktionsdato"
+msgstr "Brug relativ profit/tab-startdato"
#: ../src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:5
msgid "This setting controls the type of starting date used in profit/loss calculations. If set to \"absolute\" then GnuCash will retrieve the starting date specified by the start-date key. If set to anything else, GnuCash will retrieve the starting date specified by the start-period key."
msgstr ""
#: ../src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:6
-#, fuzzy
msgid "Use absolute profit/loss starting date"
-msgstr "Brug nærmeste på transaktionsdato"
+msgstr "Brug absolut profit/tab-startdato"
#: ../src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:7
msgid "Starting date (in seconds from Jan 1, 1970)"
@@ -7431,7 +7431,7 @@ msgstr ""
#: ../src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:14
msgid "Ending date (in seconds from Jan 1, 1970)"
-msgstr ""
+msgstr "Slutdato (i sekunder fra 1. januar 1970)"
#: ../src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:15
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."
@@ -7446,18 +7446,16 @@ msgid "This setting controls the ending date set in profit/loss calculations if
msgstr ""
#: ../src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:1
-#, fuzzy
msgid "Display this column"
-msgstr "Vis kontoen?"
+msgstr "Vis denne kolonne"
#: ../src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:2
msgid "This setting controls whether the given column will be visible in the view. TRUE means visible, FALSE means hidden."
-msgstr ""
+msgstr "Denne indstilling kontrollerer hvorvidt den angivne kolonne vil være synlig i visningen. SAND (TRUE) betyder synlig, FALSK (FALSE) betyder skjult."
#: ../src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:3
-#, fuzzy
msgid "Width of this column"
-msgstr "_Udvid denne kolonne"
+msgstr "Bredde for denne kolonne"
#: ../src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:4
msgid "This setting stores the width of the given column in pixels."
@@ -7471,9 +7469,8 @@ msgid ""
msgstr ""
#: ../src/gnome/gtkbuilder/assistant-acct-period.glade.h:4
-#, fuzzy
msgid "Setup Account Period"
-msgstr "Sætter konti op"
+msgstr "Opsæt kontoperiode"
#: ../src/gnome/gtkbuilder/assistant-acct-period.glade.h:5
msgid ""
@@ -7492,9 +7489,8 @@ msgid "Book Closing Dates"
msgstr ""
#: ../src/gnome/gtkbuilder/assistant-acct-period.glade.h:11
-#, fuzzy
msgid "Title:"
-msgstr "Titel"
+msgstr "Titel:"
#: ../src/gnome/gtkbuilder/assistant-acct-period.glade.h:12
#: ../src/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:13
@@ -7507,18 +7503,16 @@ msgid "Close Book"
msgstr "Luk bog"
#: ../src/gnome/gtkbuilder/assistant-acct-period.glade.h:14
-#, fuzzy
msgid "Account Period Finish"
-msgstr "Kontonummer"
+msgstr "Kontoperiodeslutning"
#: ../src/gnome/gtkbuilder/assistant-acct-period.glade.h:15
msgid "Press 'Close' to Exit."
-msgstr ""
+msgstr "Tryk »Luk« for at afslutte."
#: ../src/gnome/gtkbuilder/assistant-acct-period.glade.h:16
-#, fuzzy
msgid "Summary Page"
-msgstr "Resu_mebjælke"
+msgstr "Resumeside"
#: ../src/gnome/gtkbuilder/assistant-hierarchy.glade.h:1
msgid ""
@@ -7590,12 +7584,10 @@ msgid ""
msgstr ""
#: ../src/gnome/gtkbuilder/assistant-hierarchy.glade.h:24
-#, fuzzy
msgid "Setup selected accounts"
-msgstr "Slet den valgte konto"
+msgstr "Opsæt valgte konti"
#: ../src/gnome/gtkbuilder/assistant-hierarchy.glade.h:25
-#, fuzzy
msgid ""
"Press `Apply' to create your new accounts. You will then be able to save them to a file or database.\n"
"\n"
@@ -7603,11 +7595,11 @@ msgid ""
"\n"
"Press `Cancel' to close this dialog without creating any new accounts."
msgstr ""
-"Tryk 'Afslut' for at oprette dine nye konti.\n"
+"Tryk »Anvend« for at oprette dine nye konti. Du kan så gemme dem til en fil eller en database.\n"
"\n"
-"Tryk 'Tilbage' for at efterse dine valg.\n"
+"Tryk »Tilbage« for at efterse dine valg.\n"
"\n"
-"Tryk 'Annullér' for at lukke dette vindue uden at oprette nye konti."
+"Tryk »Annuller« for at lukke dette vindue uden at oprette nye konti."
#: ../src/gnome/gtkbuilder/assistant-hierarchy.glade.h:30
msgid "Finish Account Setup"
@@ -7621,24 +7613,21 @@ msgid ""
msgstr ""
#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:4
-#, fuzzy
msgid "Loan / Mortgage Repayment Setup"
-msgstr "Brug finanslommeregneren"
+msgstr "Tilbagebetaling af lån/boliggæld"
#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:5
msgid "Enter the Loan Details, as a minimum enter a valid Loan Account and Amount.\n"
-msgstr ""
+msgstr "Indtast lånets detaljer. Som et minimum indtastes en gyldig lånekonto og et beløb.\n"
#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:7
-#, fuzzy
msgid "Interest Rate:"
-msgstr "Rente"
+msgstr "Rente:"
#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:8
#: ../src/gnome/gtkbuilder/dialog-sx.glade.h:52
#: ../src/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:8
#: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:2
-#, fuzzy
msgid "Start Date:"
msgstr "Startdato:"
@@ -7665,259 +7654,252 @@ msgstr "LÃ¥nkonto:"
msgid "Enter the number of months still to be paid off. This determines both the remaining principle and the duration of the scheduled transaction."
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:15
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:13
+msgid "Enter the annual interest rate in percent. Accepts values from 0.001 - 100. The Mortgage Assistant does not support zero-interest loans."
+msgstr ""
+
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:16
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:17
#: ../src/gnome/gtkbuilder/dialog-tax-info.glade.h:4
msgid "Type:"
msgstr "Type:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:16
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:17
msgid "Months Remaining:"
msgstr "Tilbageværende måneder:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:17
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:18
msgid "Interest Rate Change Frequency"
-msgstr "Rente"
+msgstr "Ændringsfrekvens for renten"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:18
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:19
msgid "Loan Details"
-msgstr ""
+msgstr "LÃ¥nedetaljer"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:19
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:20
msgid ""
"\n"
"Do you utilise an escrow account, if so an account must be specified..."
msgstr ""
+"\n"
+"Anvender du en escrow-konto? Hvis ja, skal der angives en konto ..."
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:21
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:22
msgid "... utilize an escrow account for payments?"
msgstr "... anvend en escrowkonto til betalinger?"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:22
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:23
msgid "Escrow Account:"
msgstr "Escrowkonto:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:23
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:24
msgid "Loan Repayment Options"
-msgstr "Finanslommeregner"
+msgstr "Indstillinger for tilbagebetaling af lån"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:24
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:25
msgid ""
"\n"
"All accounts must have valid entries to continue.\n"
msgstr ""
+"\n"
+"Alle konti skal have gyldige poster for at fortsætte.\n"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:27
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:28
msgid "Payment From:"
msgstr "Betaling fra:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:28
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:29
msgid "Principal To:"
msgstr "Hovedstol til:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:29
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:30
#: ../src/gnome/gtkbuilder/dialog-sx.glade.h:50
#: ../src/gnome/gtkbuilder/dialog-tax-info.glade.h:3
msgid "Name:"
msgstr "Navn:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:30
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:31
msgid "Interest To:"
-msgstr "Renter"
+msgstr "Rente til:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:31
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:32
msgid "Repayment Frequency"
msgstr "Genbetalingsfrekvens"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:32
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:33
msgid "Loan Repayment"
-msgstr "Genbetaling"
+msgstr "Tilbagebetaling af lån"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:33
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:34
msgid ""
"\n"
"All enabled option pages must contain valid entries to continue.\n"
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:36
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:37
msgid "Payment To (Escrow):"
msgstr "Betaling til (Escrow):"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:37
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:38
msgid "Payment From (Escrow):"
msgstr "Betaling fra (Escrow):"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:38
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:39
msgid "Payment To:"
msgstr "Betaling til:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:39
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:40
msgid "Specify Source Account"
msgstr "Angiv kildekonto"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:40
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:41
msgid "Use Escrow Account"
msgstr "Brug Escrowkonto"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:41
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:42
msgid "Part of Payment Transaction"
msgstr "Del af betalingstransaktion"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:42
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:43
#: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:58
#: ../src/report/standard-reports/account-piecharts.scm:404
#: ../src/report/standard-reports/category-barchart.scm:491
msgid "Other"
msgstr "Andet"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:43
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:44
msgid "Payment Frequency"
msgstr "Betalingsfrekvens"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:44
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:45
msgid "Previous Option"
-msgstr "Første Option"
+msgstr "Forrige indstilling"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:45
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:46
msgid "Next Option"
-msgstr "Nummervalg"
+msgstr "Næste indstilling"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:46
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:47
msgid "Loan Payment"
-msgstr "Skattebetaling"
+msgstr "Betaling af lån"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:47
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:48
msgid ""
"\n"
"Review the details below and if correct press Apply to create the schedule."
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:49
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:50
msgid "Range: "
msgstr "Interval: "
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:50
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:51
#: ../src/gnome/gtkbuilder/dialog-sx.glade.h:54
msgid "End Date:"
msgstr "Slutdato:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:51
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:52
#: ../src/report/business-reports/job-report.scm:632
-#: ../src/report/business-reports/owner-report.scm:772
+#: ../src/report/business-reports/owner-report.scm:771
msgid "Date Range"
msgstr "Datointerval"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:52
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:53
msgid "Loan Review"
-msgstr "Overblik"
+msgstr "Oversigt over lån"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:53
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:54
msgid "Schedule added successfully."
-msgstr "Bogen blev lukket med succes."
+msgstr "Planlægning tilføjet med succes."
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:54
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:55
msgid "Loan Summary"
-msgstr "Kontoopsummering"
+msgstr "Resume for lån"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:55
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:56
#: ../src/gnome-utils/gnc-date-delta.c:220
#: ../src/report/standard-reports/price-scatter.scm:231
msgid "Months"
msgstr "MÃ¥neder"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:56
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:57
#: ../src/gnome-utils/gnc-date-delta.c:222
#: ../src/report/standard-reports/price-scatter.scm:232
msgid "Years"
msgstr "Ã…r"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:57
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:58
msgid "Current Year"
-msgstr "Valuta"
+msgstr "Nuværende år"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:58
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:59
msgid "Now + 1 Year"
-msgstr ""
+msgstr "Nu + 1 år"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:59
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:60
msgid "Whole Loan"
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:61
-#, fuzzy
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:62
msgid "Interest Rate"
msgstr "Rente"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:62
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:63
msgid "APR (Compounded Daily)"
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:63
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:64
msgid "APR (Compounded Weekly)"
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:64
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:65
msgid "APR (Compounded Monthly)"
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:65
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:66
msgid "APR (Compounded Quarterly)"
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:66
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:67
msgid "APR (Compounded Annually)"
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:67
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:68
#, fuzzy
msgid "Fixed Rate"
msgstr "Match dato"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:68
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:69
msgid "3/1 Year ARM"
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:69
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:70
msgid "5/1 Year ARM"
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:70
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:71
msgid "7/1 Year ARM"
msgstr ""
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:71
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:72
msgid "10/1 Year ARM"
msgstr ""
#: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:1
-#, fuzzy
msgid "This assistant will help you record a stock split or stock merger.\n"
-msgstr "Denne assistent vil hjælpe dig med at registrere en aktieopsplitning eller -sammenlægning."
+msgstr "Denne assistent vil hjælpe dig med at registrere en aktieopsplitning eller -sammenlægning.\n"
#: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:3
-#, fuzzy
msgid "Stock Split Assistant"
-msgstr "Aktieopdelingsdetaljer"
+msgstr "Aktieopdelingsassistent"
#: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:4
msgid "Select the account for which you want to record a stock split or merger."
msgstr "Vælg den konto, du ønsker at registrere en aktieopsplitning eller -sammenlægning."
#: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:5
-#, fuzzy
msgid "Stock Split Account"
-msgstr "Aktiekonto"
+msgstr "Aktieopsplitningskonto"
#: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:6
#, fuzzy
@@ -7949,11 +7931,8 @@ msgid "Stock Split"
msgstr "Aktieopdeling"
#: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:11
-#, fuzzy
msgid "If you want to record a stock price for the split, enter it below. You may safely leave it blank."
-msgstr ""
-"Hvis du vil registrere aktiekursen for opsplitninger, kan du indtaste\n"
-"den herunder. Du kan også lade den være tom."
+msgstr "Hvis du vil registrere aktiekursen for opsplitninger, kan du indtaste den herunder. Du kan også lade den være tom."
#: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:12
msgid "New _Price:"
@@ -7968,11 +7947,8 @@ msgid "Stock Split Details"
msgstr "Aktieopdelingsdetaljer"
#: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:15
-#, fuzzy
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'."
-msgstr ""
-"Hvis du modtog en kontant udbetaling som følge af aktieopsplitningen,\n"
-"kan du indtaste detaljer om denne betaling her. Hvis ikke, klik 'Næste'."
+msgstr "Hvis du modtog en kontant udbetaling som følge af aktieopsplitningen, kan du indtaste detaljer om denne betaling her. Hvis ikke, klik »Næste«."
#: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:16
msgid "_Amount:"
@@ -8006,7 +7982,7 @@ msgid "If you are finished creating the stock split or merger, press `Apply'. Yo
msgstr ""
"Tryk \"Afslut\", hvis du har afsluttet oprettelsen af aktieopdeling eller \n"
"-sammenlægning. Du kan også trykke \"Tilbage\" for at tjekke dine valg eller \n"
-"\"Annullér\" for at afslutte uden at udføre nogen ændringer."
+"\"Annuller\" for at afslutte uden at udføre nogen ændringer."
#: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:23
#, fuzzy
@@ -8014,32 +7990,28 @@ msgid "Stock Split Finish"
msgstr "Aktieopdeling"
#: ../src/gnome/gtkbuilder/dialog-commodities.glade.h:1
-#, fuzzy
msgid "Securities"
-msgstr "Værdipapir"
+msgstr "Værdipapirer"
#: ../src/gnome/gtkbuilder/dialog-commodities.glade.h:2
msgid "<b>Securities</b>"
-msgstr ""
+msgstr "<b>Værdipapirer</b>"
#: ../src/gnome/gtkbuilder/dialog-commodities.glade.h:3
msgid "Show National Currencies"
msgstr "Vis nationale valutaer"
#: ../src/gnome/gtkbuilder/dialog-commodities.glade.h:4
-#, fuzzy
msgid "Add a new commodity."
-msgstr "Tilføj en ny pris."
+msgstr "Tilføj en ny vare."
#: ../src/gnome/gtkbuilder/dialog-commodities.glade.h:5
-#, fuzzy
msgid "Remove the current commodity."
-msgstr "Gem den aktuelle pris"
+msgstr "Fjern den nuværende vare."
#: ../src/gnome/gtkbuilder/dialog-commodities.glade.h:6
-#, fuzzy
msgid "Edit the current commodity."
-msgstr "Gem den aktuelle pris"
+msgstr "Rediger den nuværende vare."
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:1
#, fuzzy
@@ -8048,20 +8020,17 @@ msgstr "Finanslommeregner"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:2
msgid "<b>Calculations</b>"
-msgstr ""
+msgstr "<b>Beregninger</b>"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:3
-#, fuzzy
msgid "Payment periods"
-msgstr "Løbeperioder"
+msgstr "Betalingsperioder"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:4
-#, fuzzy
msgid "Clear the entry."
-msgstr "Slet punktet"
+msgstr "Slet punktet."
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:5
-#, fuzzy
msgid "Interest rate"
msgstr "Rente"
@@ -8070,17 +8039,14 @@ msgid "Clear the entry"
msgstr "Slet punktet"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:7
-#, fuzzy
msgid "Present value"
-msgstr "Nuværdi"
+msgstr "Nutidsværdi"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:8
-#, fuzzy
msgid "Periodic payment"
msgstr "Periodisk betaling"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:9
-#, fuzzy
msgid "Future value"
msgstr "Fremtidig værdi"
@@ -8094,68 +8060,63 @@ msgstr "Beregn"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:12
msgid "<b>Payment Options</b>"
-msgstr ""
+msgstr "<b>Betalingsindstillinger</b>"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:13
msgid "Payment Total:"
-msgstr "Totale betalinger:"
+msgstr "Samlede betalinger:"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:14
msgid "total"
-msgstr "total"
+msgstr "i alt"
+# hør udviklere, sammen med dem lidt længere nede
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:15
-#, fuzzy
msgid "Discrete"
-msgstr "Udlod"
+msgstr ""
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:16
-#, fuzzy
msgid "Continuous"
-msgstr "Indhold"
+msgstr ""
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:18
#: ../src/gnome/gtkbuilder/dialog-sx.glade.h:51
#: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:1
-#, fuzzy
msgid "Frequency:"
-msgstr "Valuta:"
+msgstr "Frekvens:"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:19
msgid "When paid:"
-msgstr ""
+msgstr "NÃ¥r betalt:"
+# jeg var meget i tvivl om de her var begyndelse/slutning eller som nedenfor
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:20
msgid "Beginning"
-msgstr ""
+msgstr "Begynd"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:21
-#, fuzzy
msgid "End"
-msgstr "Slutter "
+msgstr "Slut"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:22
-#, fuzzy
msgid "<b>Compounding:</b>"
-msgstr "Renters rente:"
+msgstr "<b>Renters rente:</b>"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:23
-#, fuzzy
msgid "<b>Period:</b>"
-msgstr "Periode:"
+msgstr "<b>Periode:</b>"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:25
msgid "Annual"
-msgstr ""
+msgstr "Ã…rligt"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:26
-#, fuzzy
msgid "Semi-annual"
-msgstr "Halvmånedligt"
+msgstr "Halvårligt"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:27
msgid "Tri-annual"
-msgstr ""
+msgstr "Tre gange årligt"
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:28
#: ../src/gnome/gtkbuilder/dialog-sx.glade.h:44
@@ -8263,7 +8224,7 @@ msgstr ""
#: ../src/gnome/gtkbuilder/dialog-new-user.glade.h:4
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."
-msgstr ""
+msgstr "Der er nogle prædefinerede handlinger tilgængelige, som de fleste nye brugere foretrækker for at komme i gang med GnuCash. Vælg en af disse handlinger fra herunder og klik på knappen <i>O.k.</i> eller tryk på knappen <i>Annuller</i>, hvis du ikke ønsker at udføre nogen af dem."
#: ../src/gnome/gtkbuilder/dialog-new-user.glade.h:5
msgid "C_reate a new set of accounts"
@@ -8323,58 +8284,63 @@ msgstr "K_ilde:"
msgid "_Price:"
msgstr "_Pris:"
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:14
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:14
+#: ../src/report/standard-reports/price-scatter.scm:96
+msgid "Price Database"
+msgstr "Prisdatabase"
+
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:15
msgid "Add a new price."
msgstr "Tilføj en ny pris."
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:15
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:16
msgid "Remove the current price."
msgstr "Fjern den aktuelle pris."
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:16
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:17
msgid "Edit the current price."
msgstr "Redigér den nuværende pris."
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:18
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:19
msgid "Remove prices older than a user-entered date."
msgstr "Fjern priser, der er ældre end en brugerangivet dato."
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:19
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:20
msgid "Remove _Old"
msgstr "Fjern _gammel"
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:20
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:21
msgid "Get new online quotes for stock accounts."
msgstr "Hent nye online-kurser for aktiekonti."
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:21
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:22
msgid "Get _Quotes"
msgstr "Hent _kurser"
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:22
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:23
msgid "Bid"
msgstr ""
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:23
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:24
msgid "Ask"
msgstr ""
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:24
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:25
#, fuzzy
msgid "Last"
msgstr "Sidste"
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:25
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:26
#, fuzzy
msgid "Net Asset Value"
msgstr "Nettoaktiver:"
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:27
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:28
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:26
msgid "Dummy commodity Line"
msgstr ""
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:28
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:29
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:27
msgid "Dummy namespace Line"
msgstr ""
@@ -8387,10 +8353,6 @@ msgstr "Gem eget checkformat"
msgid "Enter a title for this custom format. This title will appear in the \"Check format\" selector of the Print Check dialog. Using the title of an existing custom format will cause that format to be overwritten."
msgstr "Indtast en titel for dette eget format. Denne titel vil fremgå i »Checkformat«-vælgeren i dialogen Udskriv check. Brug af en eksisterende titel vil gøre at formatet bliver overskrevet."
-#: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:3
-msgid "Print Check"
-msgstr "Udskriv check"
-
#: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:4
msgid "Check _format:"
msgstr "Check_format:"
@@ -9119,7 +9081,7 @@ msgstr "Udskrifts_dato:"
#. starting balance title/value
#: ../src/gnome/gtkbuilder/window-reconcile.glade.h:3
-#: ../src/gnome/window-reconcile2.c:1810 ../src/gnome/window-reconcile.c:1810
+#: ../src/gnome/window-reconcile2.c:1810 ../src/gnome/window-reconcile.c:1850
msgid "Starting Balance:"
msgstr "Startsaldo:"
@@ -9128,12 +9090,16 @@ msgid "Include _subaccounts"
msgstr "Inkluder _underkonti"
#: ../src/gnome/gtkbuilder/window-reconcile.glade.h:6
-#: ../src/gnome/window-reconcile2.c:762 ../src/gnome/window-reconcile.c:762
+msgid "Include all descendant accounts in the reconcile. All of them must use the same commodity as this one."
+msgstr ""
+
+#: ../src/gnome/gtkbuilder/window-reconcile.glade.h:7
+#: ../src/gnome/window-reconcile2.c:762 ../src/gnome/window-reconcile.c:799
msgid "Enter _Interest Payment..."
msgstr "Indtast rentebetal_ing ..."
#: ../src/gnome/reconcile-view.c:368
-#: ../src/register/ledger-core/split-register-layout.c:671
+#: ../src/register/ledger-core/split-register-layout.c:690
#: ../src/register/ledger-core/split-register-model.c:303
msgid "Reconciled:R"
msgstr "Reconciled:A"
@@ -9257,11 +9223,6 @@ msgstr "Vælg konti der skal findes"
msgid "Select the Accounts to Compare"
msgstr "Vælg konti der skal sammenlignes"
-#. Build and connect the toggle
-#: ../src/gnome-search/search-boolean.c:205
-msgid "set true"
-msgstr "sæt sand (true)"
-
#: ../src/gnome-search/search-date.c:195
msgid "is before"
msgstr "er før"
@@ -9387,7 +9348,7 @@ msgstr "Du skal indtaste en søgetekst."
#: ../src/gnome-search/search-string.c:220
#: ../src/import-export/csv-imp/csv-account-import.c:112
-#: ../src/plugins/bi_import/dialog-bi-import.c:122
+#: ../src/plugins/bi_import/dialog-bi-import.c:123
#: ../src/plugins/customer_import/dialog-customer-import.c:102
#, c-format
msgid ""
@@ -9711,6 +9672,8 @@ msgid ""
"\n"
"Mnemonic (Ticker symbol or similar): "
msgstr ""
+"\n"
+"Mnemonic (Tickersymbol eller lignende): "
#: ../src/gnome-utils/dialog-commodity.c:284
msgid "Select security/currency"
@@ -9733,44 +9696,44 @@ msgstr "Vælg valuta"
msgid "You must select a commodity. To create a new one, click \"New\""
msgstr "Du skal vælge en vare. Tryk »Ny« for at oprette en ny."
-#: ../src/gnome-utils/dialog-commodity.c:913
+#: ../src/gnome-utils/dialog-commodity.c:912
msgid "Use local time"
msgstr "Brug lokal tid"
-#: ../src/gnome-utils/dialog-commodity.c:1042
+#: ../src/gnome-utils/dialog-commodity.c:1041
msgid "Edit currency"
msgstr "Rediger valuta"
-#: ../src/gnome-utils/dialog-commodity.c:1043
+#: ../src/gnome-utils/dialog-commodity.c:1042
msgid "Currency Information"
msgstr "Valutainformation"
-#: ../src/gnome-utils/dialog-commodity.c:1048
+#: ../src/gnome-utils/dialog-commodity.c:1047
msgid "Edit security"
msgstr "Rediger værdipapir"
-#: ../src/gnome-utils/dialog-commodity.c:1048
+#: ../src/gnome-utils/dialog-commodity.c:1047
msgid "New security"
msgstr "Nyt værdipapir"
-#: ../src/gnome-utils/dialog-commodity.c:1049
+#: ../src/gnome-utils/dialog-commodity.c:1048
msgid "Security Information"
msgstr "Information om værdipapir"
-#: ../src/gnome-utils/dialog-commodity.c:1325
+#: ../src/gnome-utils/dialog-commodity.c:1324
msgid "You may not create a new national currency."
msgstr "Du kan ikke oprette en ny national valuta."
-#: ../src/gnome-utils/dialog-commodity.c:1335
+#: ../src/gnome-utils/dialog-commodity.c:1334
#, c-format
msgid "%s is a reserved commodity type. Please use something else."
msgstr ""
-#: ../src/gnome-utils/dialog-commodity.c:1350
+#: ../src/gnome-utils/dialog-commodity.c:1349
msgid "That commodity already exists."
msgstr "Den vare findes allerede."
-#: ../src/gnome-utils/dialog-commodity.c:1399
+#: ../src/gnome-utils/dialog-commodity.c:1398
msgid "You must enter a non-empty \"Full name\", \"Symbol/abbreviation\", and \"Type\" for the commodity."
msgstr "Du skal vælge en udfyldt »Fulde navn«, »Kode/forkortelse« og »Type« for varen."
@@ -9789,7 +9752,7 @@ msgstr "Gem som ..."
#: ../src/gnome-utils/dialog-file-access.c:311
#: ../src/gnome-utils/gnc-file.c:119 ../src/gnome-utils/gnc-file.c:289
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1087
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1088
msgid "Export"
msgstr "Eksportér"
@@ -9857,23 +9820,23 @@ msgstr "Nulstil standarder"
msgid "Reset all values to their defaults."
msgstr "Nulstil alle værdier til deres standarder."
-#: ../src/gnome-utils/dialog-options.c:1457
+#: ../src/gnome-utils/dialog-options.c:1459
msgid "Page"
msgstr "Side"
-#: ../src/gnome-utils/dialog-options.c:2072
+#: ../src/gnome-utils/dialog-options.c:2074
msgid "Clear"
msgstr "Slet"
-#: ../src/gnome-utils/dialog-options.c:2073
+#: ../src/gnome-utils/dialog-options.c:2075
msgid "Clear any selected image file."
msgstr "Ryd alle valgte billedfiler."
-#: ../src/gnome-utils/dialog-options.c:2075
+#: ../src/gnome-utils/dialog-options.c:2077
msgid "Select image"
msgstr "Vælg billede"
-#: ../src/gnome-utils/dialog-options.c:2077
+#: ../src/gnome-utils/dialog-options.c:2079
msgid "Select an image file."
msgstr "Vælg en billedfil"
@@ -9926,55 +9889,55 @@ msgstr "Vis indtægts- og udgiftskonti"
msgid "Error"
msgstr "Fejl"
-#: ../src/gnome-utils/dialog-transfer.c:1327
+#: ../src/gnome-utils/dialog-transfer.c:1328
msgid "Retrieve the current online quote. This will fail if there is a manually-created price for today."
msgstr "Hent den nuværende onlinekurs. Dette vil fejle, hvis der er en manuelt oprettet pris for i dag."
-#: ../src/gnome-utils/dialog-transfer.c:1331
+#: ../src/gnome-utils/dialog-transfer.c:1332
msgid "Finance::Quote must be installed to enable this button."
msgstr "Finance::Quote skal være installeret for at aktivere denne knap."
-#: ../src/gnome-utils/dialog-transfer.c:1433
+#: ../src/gnome-utils/dialog-transfer.c:1434
msgid "You must specify an account to transfer from, or to, or both, for this transaction. Otherwise, it will not be recorded."
msgstr "Du skal angive en konto at overføre fra, til, eller både og for denne transaktion. Ellers vil den ikke blive registreret."
-#: ../src/gnome-utils/dialog-transfer.c:1443
+#: ../src/gnome-utils/dialog-transfer.c:1444
msgid "You can't transfer from and to the same account!"
msgstr "Du kan ikke overføre fra og til den samme konto!"
-#: ../src/gnome-utils/dialog-transfer.c:1470
+#: ../src/gnome-utils/dialog-transfer.c:1471
msgid "You can't transfer from a non-currency account. Try reversing the \"from\" and \"to\" accounts and making the \"amount\" negative."
msgstr ""
-#: ../src/gnome-utils/dialog-transfer.c:1488
+#: ../src/gnome-utils/dialog-transfer.c:1489
msgid "You must enter a valid price."
msgstr "Du skal vælge en gyldig pris."
-#: ../src/gnome-utils/dialog-transfer.c:1500
+#: ../src/gnome-utils/dialog-transfer.c:1501
msgid "You must enter a valid `to' amount."
msgstr "Du skal vælge en gyldig 'til'-mængde."
-#: ../src/gnome-utils/dialog-transfer.c:1740
+#: ../src/gnome-utils/dialog-transfer.c:1721
msgid "You must enter an amount to transfer."
msgstr "Du skal vælge en mængde at overføre."
-#: ../src/gnome-utils/dialog-transfer.c:1980
+#: ../src/gnome-utils/dialog-transfer.c:1964
msgid "Debit Account"
msgstr "Debetkonto"
-#: ../src/gnome-utils/dialog-transfer.c:1998
+#: ../src/gnome-utils/dialog-transfer.c:1982
msgid "Transfer From"
msgstr "Overfør fra"
-#: ../src/gnome-utils/dialog-transfer.c:2002
+#: ../src/gnome-utils/dialog-transfer.c:1986
msgid "Transfer To"
msgstr "Overfør til"
-#: ../src/gnome-utils/dialog-transfer.c:2059
+#: ../src/gnome-utils/dialog-transfer.c:2043
msgid "Debit Amount:"
msgstr "Debetbeløb:"
-#: ../src/gnome-utils/dialog-transfer.c:2064
+#: ../src/gnome-utils/dialog-transfer.c:2048
#: ../src/gnome-utils/gtkbuilder/dialog-transfer.glade.h:14
msgid "To Amount:"
msgstr "Til-beløb:"
@@ -10261,7 +10224,7 @@ msgstr ""
#: ../src/gnome-utils/gnc-file.c:416
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."
-msgstr "Denne database er fra en ældre version af GnuCash. Vælg O.k. for at opgradere den til den nuværende version, Afbryd for at markere den skrivebeskyttet."
+msgstr "Denne database er fra en ældre version af GnuCash. Vælg O.k. for at opgradere den til den nuværende version, Annuller for at markere den skrivebeskyttet."
#: ../src/gnome-utils/gnc-file.c:425
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."
@@ -10339,7 +10302,7 @@ msgstr "Gemmer brugerdata igen ..."
#: ../src/gnome-utils/gnc-file.c:1207 ../src/gnome-utils/gnc-file.c:1442
#: ../src/import-export/csv-exp/assistant-csv-export.c:123
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1456
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1457
#, c-format
msgid "The file %s already exists. Are you sure you want to overwrite it?"
msgstr "Filen %s findes allerede. Er du sikker på, at du vil overskrive den?"
@@ -10390,11 +10353,11 @@ msgstr "GnuCash kunne ikke finde filerne med dokumentationen."
msgid "GnuCash could not find the associated file."
msgstr "GnuCash kunne ikke finde den associerede fil."
-#: ../src/gnome-utils/gnc-gnome-utils.c:452
+#: ../src/gnome-utils/gnc-gnome-utils.c:453
msgid "GnuCash could not find the associated file"
msgstr "GnuCash kunne ikke finde den associerede fil"
-#: ../src/gnome-utils/gnc-gnome-utils.c:478
+#: ../src/gnome-utils/gnc-gnome-utils.c:480
msgid "GnuCash could not open the associated URI:"
msgstr "GnuCash kunne ikke åbne den associerede URI:"
@@ -10403,7 +10366,7 @@ msgid "_Delete Account"
msgstr "_Slet konto"
#: ../src/gnome-utils/gnc-icons.c:40 ../src/gnome/window-reconcile2.c:2179
-#: ../src/gnome/window-reconcile.c:2179
+#: ../src/gnome/window-reconcile.c:2219
msgid "_Edit Account"
msgstr "_Redigér konto"
@@ -10412,7 +10375,7 @@ msgid "_New Account"
msgstr "_Ny konto"
#: ../src/gnome-utils/gnc-icons.c:42 ../src/gnome/window-reconcile2.c:2174
-#: ../src/gnome/window-reconcile.c:2174
+#: ../src/gnome/window-reconcile.c:2214
msgid "_Open Account"
msgstr "_Ã…bn konto"
@@ -10456,7 +10419,7 @@ msgstr "_Vinduer"
#. Add the help button for the matcher
#: ../src/gnome-utils/gnc-main-window.c:268
#: ../src/gnome/window-reconcile2.c:2145 ../src/gnome/window-reconcile2.c:2226
-#: ../src/gnome/window-reconcile.c:2145 ../src/gnome/window-reconcile.c:2226
+#: ../src/gnome/window-reconcile.c:2185 ../src/gnome/window-reconcile.c:2266
#: ../src/import-export/csv-imp/assistant-csv-trans-import.c:1531
msgid "_Help"
msgstr "_Hjælp"
@@ -10519,7 +10482,7 @@ msgstr "Vis de kontotyper som skal vises."
#. Actions menu
#: ../src/gnome-utils/gnc-main-window.c:343
-#: ../src/gnome/window-reconcile2.c:2189 ../src/gnome/window-reconcile.c:2189
+#: ../src/gnome/window-reconcile2.c:2189 ../src/gnome/window-reconcile.c:2229
msgid "_Check & Repair"
msgstr "_Tjek og reparer"
@@ -10696,23 +10659,25 @@ msgstr "Kan ikke gemme til databasen."
msgid "Unable to save to database: Book is marked read-only."
msgstr "Kan ikke gemme til databasen: Bog er markeret som skrivebeskyttet."
-#: ../src/gnome-utils/gnc-main-window.c:3981
+#: ../src/gnome-utils/gnc-main-window.c:3984
msgid "Book Options"
msgstr "Bogindstillinger"
-#: ../src/gnome-utils/gnc-main-window.c:4367
+#: ../src/gnome-utils/gnc-main-window.c:4370
msgid "The GnuCash personal finance manager. The GNU way to manage your money!"
msgstr "GnuCashs personlige økonomiværktøj. En GNU måde at håndtere dine penge på!"
-#: ../src/gnome-utils/gnc-main-window.c:4369
-msgid "© 1997-2015 Contributors"
+#: ../src/gnome-utils/gnc-main-window.c:4372
+#, fuzzy
+#| msgid "© 1997-2015 Contributors"
+msgid "© 1997-2016 Contributors"
msgstr "1997-2015 bidragydere"
#. Translators: the following string will be shown in Help->About->Credits
#. * Enter your name or that of your team and an email contact for feedback.
#. * The string can have multiple rows, so you can also add a list of
#. * contributors.
-#: ../src/gnome-utils/gnc-main-window.c:4406
+#: ../src/gnome-utils/gnc-main-window.c:4409
msgid "translator_credits"
msgstr ""
"Kenneth Christiansen, 2000.\n"
@@ -10756,7 +10721,7 @@ msgstr "Slutningen af forrige regnskabsperiode"
#. 2nd %s is the scm type (svn/svk/git/bzr);
#. 3rd %s is the scm revision number;
#. 4th %s is the build date
-#: ../src/gnome-utils/gnc-splash.c:95
+#: ../src/gnome-utils/gnc-splash.c:96
#, c-format
msgid "Version: GnuCash-%s %s (rev %s built %s)"
msgstr "Version: GnuCash-%s %s (rev %s bygning %s)"
@@ -10765,12 +10730,12 @@ msgstr "Version: GnuCash-%s %s (rev %s bygning %s)"
#. Translators: 1st %s is the GnuCash version (eg 2.4.11);
#. 2nd %s is the scm (svn/svk/git/bzr) revision number;
#. 3rd %s is the build date
-#: ../src/gnome-utils/gnc-splash.c:103
+#: ../src/gnome-utils/gnc-splash.c:104
#, c-format
msgid "Version: GnuCash-%s (rev %s built %s)"
msgstr "Version: GnuCash-%s (rev %s bygning %s)"
-#: ../src/gnome-utils/gnc-splash.c:120
+#: ../src/gnome-utils/gnc-splash.c:121
msgid "Loading..."
msgstr "Indlæser ..."
@@ -10788,7 +10753,7 @@ msgstr "Gem transaktion før du fortsætter?"
#: ../src/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?"
-msgstr "Den nuværende transaktion er blevet ændret. Vil du gemme ændringerne før du fortsætter, eller afbryde?"
+msgstr "Den nuværende transaktion er blevet ændret. Vil du gemme ændringerne før du fortsætter, eller annullere?"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:185
msgid "This transaction is being edited in a different register."
@@ -10831,20 +10796,20 @@ msgstr "_Rebalancere"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:405
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:413
-#: ../src/register/ledger-core/split-register-control.c:1320
-#: ../src/register/ledger-core/split-register-control.c:1333
+#: ../src/register/ledger-core/split-register-control.c:1324
+#: ../src/register/ledger-core/split-register-control.c:1337
msgid "This register does not support editing exchange rates."
msgstr "Denne kassekladde understøtter ikke redigering af valutakurser."
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:421
-#: ../src/register/ledger-core/split-register-control.c:1374
-#: ../src/register/ledger-core/split-register-control.c:1449
+#: ../src/register/ledger-core/split-register-control.c:1378
+#: ../src/register/ledger-core/split-register-control.c:1453
msgid "You need to expand the transaction in order to modify its exchange rates."
msgstr "Du skal udvide transaktionen for at ændre dens valutakurser."
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:461
-#: ../src/register/ledger-core/split-register-control.c:1421
-#: ../src/register/ledger-core/split-register-control.c:1434
+#: ../src/register/ledger-core/split-register-control.c:1425
+#: ../src/register/ledger-core/split-register-control.c:1438
msgid "The two currencies involved equal each other."
msgstr ""
@@ -10874,9 +10839,8 @@ msgid "Not enough information for Blank Transaction?"
msgstr "Ikke nok information for tom transaktion?"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1727
-#, fuzzy
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 "Den aktuelle transaktion er blevet ændret. Vil du gemme ændringerne før kopiering af transaktionen, eller afbryde kopieringen?"
+msgstr "Den tomme transaktion har ikke nok information til at blive gemt. Ønsker du at returnere til transkationen for at opdatere, eller annullere?"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1738
#, fuzzy
@@ -10884,12 +10848,12 @@ msgid "_Return"
msgstr "Kapitalgevinst"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1781
-#: ../src/register/ledger-core/split-register-control.c:1831
+#: ../src/register/ledger-core/split-register-control.c:1835
msgid "Mark split as unreconciled?"
msgstr ""
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1783
-#: ../src/register/ledger-core/split-register-control.c:1833
+#: ../src/register/ledger-core/split-register-control.c:1837
#, fuzzy
msgid "You are about to mark a reconciled split as unreconciled. Doing so might make future reconciliation difficult! Continue with this change?"
msgstr ""
@@ -10897,18 +10861,18 @@ msgstr ""
"Hvis du gør det kan fremtidige afstemninger blive svære!"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1827
-#: ../src/register/ledger-core/split-register-control.c:1850
+#: ../src/register/ledger-core/split-register-control.c:1854
#, fuzzy
msgid "_Unreconcile"
msgstr "_Afstem"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1912
-#: ../src/register/ledger-core/split-register-model.c:2008
+#: ../src/register/ledger-core/split-register-model.c:2064
msgid "Change reconciled split?"
msgstr ""
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1914
-#: ../src/register/ledger-core/split-register-model.c:2010
+#: ../src/register/ledger-core/split-register-model.c:2066
#, fuzzy
msgid "You are about to change a reconciled split. Doing so might make future reconciliation difficult! Continue with this change?"
msgstr ""
@@ -10916,12 +10880,12 @@ msgstr ""
"Hvis du gør det kan fremtidige afstemninger blive svære!"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1919
-#: ../src/register/ledger-core/split-register-model.c:2015
+#: ../src/register/ledger-core/split-register-model.c:2071
msgid "Change split linked to a reconciled split?"
msgstr ""
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1921
-#: ../src/register/ledger-core/split-register-model.c:2017
+#: ../src/register/ledger-core/split-register-model.c:2073
#, fuzzy
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?"
msgstr ""
@@ -10929,7 +10893,7 @@ msgstr ""
"Hvis du gør det kan fremtidige afstemninger blive svære!"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1935
-#: ../src/register/ledger-core/split-register-model.c:2031
+#: ../src/register/ledger-core/split-register-model.c:2087
#, fuzzy
msgid "Chan_ge Split"
msgstr "_Opdel"
@@ -10991,8 +10955,9 @@ msgid "POS"
msgstr "POS"
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2893
-#: ../src/gnome-utils/gnc-tree-view-owner.c:443
+#: ../src/gnome-utils/gnc-tree-view-owner.c:470
#: ../src/register/ledger-core/split-register.c:2482
+#: ../src/report/business-reports/aging.scm:707
#: ../src/report/business-reports/taxinvoice.eguile.scm:185
msgid "Phone"
msgstr "Telefon"
@@ -11045,7 +11010,7 @@ msgstr "Check"
#: ../src/gnome-utils/gnc-tree-view-price.c:454
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3036
#: ../src/register/ledger-core/split-register.c:2555
-#: ../src/register/ledger-core/split-register-model.c:379
+#: ../src/register/ledger-core/split-register-model.c:386
#: ../src/report/business-reports/easy-invoice.scm:269
#: ../src/report/business-reports/fancy-invoice.scm:279
#: ../src/report/business-reports/invoice.scm:264
@@ -11254,7 +11219,7 @@ msgstr "Nutidig:"
#. Translators: %s is a currency mnemonic.
#: ../src/gnome-utils/gnc-tree-view-account.c:1704
-#: ../src/gnome-utils/gnc-tree-view-owner.c:927
+#: ../src/gnome-utils/gnc-tree-view-owner.c:954
#, c-format
msgid "Balance (%s)"
msgstr "Saldo (%s)"
@@ -11330,55 +11295,75 @@ msgstr "Kilde"
msgid "Timezone"
msgstr "Tidszone"
-#: ../src/gnome-utils/gnc-tree-view-owner.c:397
+#: ../src/gnome-utils/gnc-tree-view-owner.c:381
#, fuzzy
-msgid "Owner Name"
-msgstr "Ejernavn "
+#| msgid "Customer Number: "
+msgid "Customer Number"
+msgstr "Kundenummer: "
-#: ../src/gnome-utils/gnc-tree-view-owner.c:408
+#: ../src/gnome-utils/gnc-tree-view-owner.c:389
#, fuzzy
-msgid "Owner ID"
-msgstr "Ordre-id"
+#| msgid "Vendor Number: "
+msgid "Vendor Number"
+msgstr "Leverandørnummer: "
+
+#: ../src/gnome-utils/gnc-tree-view-owner.c:393
+#, fuzzy
+#| msgid "Employee Number: "
+msgid "Employee Number"
+msgstr "Medarbejdernummer: "
-#: ../src/gnome-utils/gnc-tree-view-owner.c:418
+#. Billing or Shipping addresses
+#: ../src/gnome-utils/gnc-tree-view-owner.c:445
+#: ../src/report/business-reports/aging.scm:50
+#: ../src/report/business-reports/aging.scm:697
#, fuzzy
msgid "Address Name"
msgstr "Adresse: "
-#: ../src/gnome-utils/gnc-tree-view-owner.c:423
+#: ../src/gnome-utils/gnc-tree-view-owner.c:450
+#: ../src/report/business-reports/aging.scm:51
+#: ../src/report/business-reports/aging.scm:699
#, fuzzy
msgid "Address 1"
msgstr "Adresse: "
-#: ../src/gnome-utils/gnc-tree-view-owner.c:428
+#: ../src/gnome-utils/gnc-tree-view-owner.c:455
+#: ../src/report/business-reports/aging.scm:52
+#: ../src/report/business-reports/aging.scm:701
#, fuzzy
msgid "Address 2"
msgstr "Adresse: "
-#: ../src/gnome-utils/gnc-tree-view-owner.c:433
+#: ../src/gnome-utils/gnc-tree-view-owner.c:460
+#: ../src/report/business-reports/aging.scm:53
+#: ../src/report/business-reports/aging.scm:703
#, fuzzy
msgid "Address 3"
msgstr "Adresse: "
-#: ../src/gnome-utils/gnc-tree-view-owner.c:438
+#: ../src/gnome-utils/gnc-tree-view-owner.c:465
+#: ../src/report/business-reports/aging.scm:54
+#: ../src/report/business-reports/aging.scm:705
#, fuzzy
msgid "Address 4"
msgstr "Adresse: "
-#: ../src/gnome-utils/gnc-tree-view-owner.c:448
+#: ../src/gnome-utils/gnc-tree-view-owner.c:475
+#: ../src/report/business-reports/aging.scm:709
#: ../src/report/business-reports/taxinvoice.eguile.scm:191
#, fuzzy
msgid "Fax"
msgstr "Fax:"
-#: ../src/gnome-utils/gnc-tree-view-owner.c:453
+#: ../src/gnome-utils/gnc-tree-view-owner.c:480
#, fuzzy
msgid "E-mail"
msgstr "E-post:"
#. Translators: This string has a context prefix; the translation
#. must only contain the part after the | character.
-#: ../src/gnome-utils/gnc-tree-view-owner.c:482
+#: ../src/gnome-utils/gnc-tree-view-owner.c:509
#, fuzzy
msgid "Column letter for 'Active'|A"
msgstr "S"
@@ -11398,7 +11383,7 @@ msgid " Scheduled "
msgstr "Planlæg"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2413
-#: ../src/register/ledger-core/split-register-control.c:1534
+#: ../src/register/ledger-core/split-register-control.c:1538
#, fuzzy
msgid "Save the changed transaction?"
msgstr "Afbryd den nuværende transaktion"
@@ -11409,13 +11394,13 @@ msgid "The current transaction has changed. Would you like to record the changes
msgstr "Den aktuelle skabelontransaktion er blevet ændret. Vil du gemme ændringerne?"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2453
-#: ../src/register/ledger-core/split-register-control.c:1549
+#: ../src/register/ledger-core/split-register-control.c:1553
#, fuzzy
msgid "_Discard Changes"
msgstr "Bekræft ændringer"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2455
-#: ../src/register/ledger-core/split-register-control.c:1551
+#: ../src/register/ledger-core/split-register-control.c:1555
#, fuzzy
msgid "_Record Changes"
msgstr "Bekræft ændringer"
@@ -11467,7 +11452,7 @@ msgid "Accounts / Void Reason"
msgstr "Kontonummer"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2962
-#: ../src/import-export/import-main-matcher.c:484
+#: ../src/import-export/import-main-matcher.c:472
msgid "R"
msgstr ""
@@ -11481,12 +11466,12 @@ msgid "Rate"
msgstr "Skatte_relateret"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3112
-#: ../src/register/ledger-core/split-register-model.c:482
+#: ../src/register/ledger-core/split-register-model.c:489
msgid "Credit Formula"
msgstr "Kredit-formel"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3193
-#: ../src/register/ledger-core/split-register-model.c:475
+#: ../src/register/ledger-core/split-register-model.c:482
msgid "Debit Formula"
msgstr "Debet-formel"
@@ -11508,43 +11493,43 @@ msgid "Enter the transaction number, such as the check number"
msgstr "Indtast transaktionsnummeret (f.eks. checknummeret)"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3293
-#: ../src/register/ledger-core/split-register-model.c:1021
+#: ../src/register/ledger-core/split-register-model.c:1077
msgid "Enter the name of the Customer"
msgstr "Angiv navnet på kunden"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3295
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3304
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3313
-#: ../src/register/ledger-core/split-register-model.c:1058
+#: ../src/register/ledger-core/split-register-model.c:1114
msgid "Enter notes for the transaction"
msgstr "Indtast bemærkninger til transaktionen"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3297
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3306
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3315
-#: ../src/register/ledger-core/split-register-model.c:1217
+#: ../src/register/ledger-core/split-register-model.c:1273
msgid "Enter a description of the split"
msgstr "Angiv en beskrivelse af opsplitningen"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3302
-#: ../src/register/ledger-core/split-register-model.c:1024
+#: ../src/register/ledger-core/split-register-model.c:1080
msgid "Enter the name of the Vendor"
msgstr "Angiv navnet på leverandøren"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3311
-#: ../src/register/ledger-core/split-register-model.c:1027
+#: ../src/register/ledger-core/split-register-model.c:1083
msgid "Enter a description of the transaction"
msgstr "Indtast en beskrivelse af transaktionen"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3325
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3329
-#: ../src/register/ledger-core/split-register-model.c:1376
-#: ../src/register/ledger-core/split-register-model.c:1442
+#: ../src/register/ledger-core/split-register-model.c:1432
+#: ../src/register/ledger-core/split-register-model.c:1498
msgid "Enter the account to transfer from, or choose one from the list"
msgstr "Vælg kontoen at overføre fra, eller vælg en fra listen"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3327
-#: ../src/register/ledger-core/split-register-model.c:1091
+#: ../src/register/ledger-core/split-register-model.c:1147
#, fuzzy
msgid "Reason the transaction was voided"
msgstr "Indsæt fra transaktionsklippebordet"
@@ -11567,7 +11552,7 @@ msgstr "Indtast antallet af købte eller solgte aktier"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3369
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3381
-#: ../src/register/ledger-core/split-register-model.c:1325
+#: ../src/register/ledger-core/split-register-model.c:1381
msgid "Enter the number of shares bought or sold"
msgstr "Indtast antallet af købte eller solgte aktier"
@@ -11582,18 +11567,18 @@ msgid "Enter the rate"
msgstr "Rente"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3411
-#: ../src/register/ledger-core/split-register-model.c:1289
+#: ../src/register/ledger-core/split-register-model.c:1345
msgid "Enter the effective share price"
msgstr "Indtast den effektive aktiepris"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3421
-#: ../src/register/ledger-core/split-register-model.c:2147
+#: ../src/register/ledger-core/split-register-model.c:2203
#, fuzzy
msgid "Enter credit formula for real transaction"
msgstr "Indtast noter for transaktionen"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3431
-#: ../src/register/ledger-core/split-register-model.c:2117
+#: ../src/register/ledger-core/split-register-model.c:2173
#, fuzzy
msgid "Enter debit formula for real transaction"
msgstr "Indtast noter for transaktionen"
@@ -11659,7 +11644,7 @@ msgstr "Kopiering af en ændret fakturapost"
#: ../src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:6
msgid "This dialog is presented when you attempt to duplicate a modified invoice entry. The changed data must be saved or the duplication canceled."
-msgstr "Denne dialog præsenteres, når du forsøger at kopiere en ændret fakturapost. De ændrede data skal gemmes ellers bliver kopien slettet"
+msgstr "Denne dialog præsenteres, når du forsøger at kopiere en ændret fakturapost. De ændrede data skal gemmes ellers bliver kopien annulleret."
#: ../src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:7
msgid "Delete a commodity"
@@ -11767,7 +11752,7 @@ msgstr "Kopier en ændret transaktion"
#: ../src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:33
msgid "This dialog is presented when you attempt to duplicate a modified transaction. The changed data must be saved or the duplication canceled."
-msgstr "Denne dialog præsenteres, når du forsøger at kopiere en ændret transaktion. De ændrede data skal gemmes ellers afbrydes kopieringen."
+msgstr "Denne dialog præsenteres, når du forsøger at kopiere en ændret transaktion. De ændrede data skal gemmes ellers bliver duplikeringen annulleret."
#: ../src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:34
msgid "Commit changes to a transaction"
@@ -11779,7 +11764,7 @@ msgstr ""
#: ../src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:1
msgid "Edit the list of encodings"
-msgstr ""
+msgstr "Rediger listen af kodninger"
#: ../src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:2
msgid "<b>S_ystem input encodings</b>"
@@ -12125,15 +12110,15 @@ msgstr "Vælg brugerinformation her..."
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:4
msgid "Enter the full name of the commodity. Example: Cisco Systems Inc., or Apple Computer, Inc."
-msgstr "Angiv det fulde navn for varen. Eksempel: Cisco Sytems Inc. eller Apple Computer, Inc."
+msgstr "Angiv det fulde navn for aktien. Eksempel: Cisco Sytems Inc. eller Apple Computer, Inc."
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:5
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). "
-msgstr ""
+msgstr "Indtast tickersymbolet for aktien (f.eks. CSCO eller AAPL). Hvis du henter kurser på nettet, så skal dette felt præcist matche tickersymbolet brugt af kilden (inklusive store/små bogstaver)."
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:6
msgid "Enter a unique code used to identify the commodity. Or, you may safely leave this field blank."
-msgstr "Angiv en unik kode, der identificerer varen. Du kan også lade feltet være tomt."
+msgstr "Angiv en unik kode, der identificerer aktien. Du kan også lade feltet være tomt."
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:7
msgid "1 /"
@@ -12141,17 +12126,15 @@ msgstr "1 /"
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:8
msgid "Enter the smallest fraction of the commodity which can be traded. For stocks which can only be traded in whole numbers, enter 1."
-msgstr "Angiv den mindste del af varen, der kan handles. For aktier, som kun kan handles i hele antal, skal du vælge 1."
+msgstr "Angiv den mindste del af aktien, der kan handles. For aktier, som kun kan handles i hele antal, skal du vælge 1."
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:9
-#, fuzzy
msgid "<b>Quote Source Information</b>"
-msgstr "Prisinformation"
+msgstr "<b>Kurskildeinformation</b>"
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:10
-#, fuzzy
msgid "Type of quote source:"
-msgstr "Søgetype"
+msgstr "Type af kurskilde:"
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:11
msgid "_Full name:"
@@ -12209,12 +12192,11 @@ msgstr "Tids_zone:"
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:24
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."
-msgstr ""
+msgstr "Indtast et visningssymbol. Dette kan efterlades tomt, hvorefter tickersymbolet eller valutaens ISO-kode vil blive anvendt."
#: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:25
-#, fuzzy
msgid "_Display symbol"
-msgstr "Vis totalerne?"
+msgstr "_Vis symbol"
#: ../src/gnome-utils/gtkbuilder/dialog-file-access.glade.h:1
msgid "<b>Data Format:</b>"
@@ -12511,7 +12493,7 @@ msgstr "Automatiske _decimaler:"
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:73
msgid "How many automatic decimal places will be filled in."
-msgstr "Hvor mange pladser efter kommaet der skal udfyldes."
+msgstr "Antal decimaler der autommatisk vil blive udfyldt."
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:74
msgid "_Automatic decimal point"
@@ -12909,7 +12891,7 @@ msgstr "2013-07-31"
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:203
#: ../src/gnome-utils/gtkbuilder/gnc-date-format.glade.h:19
-#: ../src/import-export/csv-imp/gnc-csv-model.c:58
+#: ../src/import-export/csv-imp/gnc-csv-model.c:64
msgid "Locale"
msgstr "Sprog"
@@ -13552,166 +13534,166 @@ msgstr ""
msgid "The selected amount cannot be cleared."
msgstr "Det valgte beløb kan ikke ryddes."
-#: ../src/gnome/window-reconcile2.c:455 ../src/gnome/window-reconcile.c:455
+#: ../src/gnome/window-reconcile2.c:455 ../src/gnome/window-reconcile.c:490
msgid "Interest Payment"
msgstr "Rentebetaling"
-#: ../src/gnome/window-reconcile2.c:458 ../src/gnome/window-reconcile.c:458
+#: ../src/gnome/window-reconcile2.c:458 ../src/gnome/window-reconcile.c:493
msgid "Interest Charge"
msgstr "Renteopkrævning"
-#: ../src/gnome/window-reconcile2.c:476 ../src/gnome/window-reconcile.c:476
+#: ../src/gnome/window-reconcile2.c:476 ../src/gnome/window-reconcile.c:511
msgid "Payment From"
msgstr "Betaling fra"
#: ../src/gnome/window-reconcile2.c:482 ../src/gnome/window-reconcile2.c:492
-#: ../src/gnome/window-reconcile.c:482 ../src/gnome/window-reconcile.c:492
+#: ../src/gnome/window-reconcile.c:517 ../src/gnome/window-reconcile.c:527
msgid "Reconcile Account"
msgstr "Afstem konto"
-#: ../src/gnome/window-reconcile2.c:497 ../src/gnome/window-reconcile.c:497
+#: ../src/gnome/window-reconcile2.c:497 ../src/gnome/window-reconcile.c:532
msgid "Payment To"
msgstr "Betaling til"
-#: ../src/gnome/window-reconcile2.c:510 ../src/gnome/window-reconcile.c:510
+#: ../src/gnome/window-reconcile2.c:510 ../src/gnome/window-reconcile.c:545
msgid "No Auto Interest Payments for this Account"
msgstr "Ingen automatiske rentebetalinger for denne konto"
-#: ../src/gnome/window-reconcile2.c:511 ../src/gnome/window-reconcile.c:511
+#: ../src/gnome/window-reconcile2.c:511 ../src/gnome/window-reconcile.c:546
msgid "No Auto Interest Charges for this Account"
msgstr "Ingen automatiske renteopkrævninger for denne konto"
-#: ../src/gnome/window-reconcile2.c:764 ../src/gnome/window-reconcile.c:764
+#: ../src/gnome/window-reconcile2.c:764 ../src/gnome/window-reconcile.c:801
msgid "Enter _Interest Charge..."
msgstr "Indtast renteopkrævn_ing..."
-#: ../src/gnome/window-reconcile2.c:1068 ../src/gnome/window-reconcile.c:1068
+#: ../src/gnome/window-reconcile2.c:1068 ../src/gnome/window-reconcile.c:1105
#: ../src/report/business-reports/owner-report.scm:56
msgid "Debits"
msgstr "Debet"
-#: ../src/gnome/window-reconcile2.c:1078 ../src/gnome/window-reconcile.c:1078
+#: ../src/gnome/window-reconcile2.c:1078 ../src/gnome/window-reconcile.c:1115
#: ../src/report/business-reports/owner-report.scm:55
#: ../src/report/report-system/report-utilities.scm:111
msgid "Credits"
msgstr "Kreditter"
-#: ../src/gnome/window-reconcile2.c:1270 ../src/gnome/window-reconcile.c:1270
+#: ../src/gnome/window-reconcile2.c:1270 ../src/gnome/window-reconcile.c:1307
msgid "Are you sure you want to delete the selected transaction?"
msgstr "Er du sikker på, at du vil slette den valgte transaktion?"
#. statement date title/value
-#: ../src/gnome/window-reconcile2.c:1800 ../src/gnome/window-reconcile.c:1800
+#: ../src/gnome/window-reconcile2.c:1800 ../src/gnome/window-reconcile.c:1840
#, fuzzy
msgid "Statement Date:"
msgstr "Udskriftsdato:"
#. ending balance title/value
-#: ../src/gnome/window-reconcile2.c:1820 ../src/gnome/window-reconcile.c:1820
+#: ../src/gnome/window-reconcile2.c:1820 ../src/gnome/window-reconcile.c:1860
msgid "Ending Balance:"
msgstr "Slutsaldo:"
#. reconciled balance title/value
-#: ../src/gnome/window-reconcile2.c:1830 ../src/gnome/window-reconcile.c:1830
+#: ../src/gnome/window-reconcile2.c:1830 ../src/gnome/window-reconcile.c:1870
msgid "Reconciled Balance:"
msgstr "Afstemt saldo:"
#. difference title/value
-#: ../src/gnome/window-reconcile2.c:1840 ../src/gnome/window-reconcile.c:1840
+#: ../src/gnome/window-reconcile2.c:1840 ../src/gnome/window-reconcile.c:1880
msgid "Difference:"
msgstr "Difference:"
-#: ../src/gnome/window-reconcile2.c:1929 ../src/gnome/window-reconcile.c:1929
+#: ../src/gnome/window-reconcile2.c:1929 ../src/gnome/window-reconcile.c:1969
msgid "You have made changes to this reconcile window. Are you sure you want to cancel?"
-msgstr "Du har lavet ændringer i dette afstemningsvindue. Er du sikker på, at du vil afbryde?"
+msgstr "Du har lavet ændringer i dette afstemningsvindue. Er du sikker på, at du vil annullere?"
-#: ../src/gnome/window-reconcile2.c:2047 ../src/gnome/window-reconcile.c:2047
+#: ../src/gnome/window-reconcile2.c:2047 ../src/gnome/window-reconcile.c:2087
msgid "The account is not balanced. Are you sure you want to finish?"
msgstr "Kontoen er ikke i balance. Er du sikker på, at du vil afslutte?"
-#: ../src/gnome/window-reconcile2.c:2104 ../src/gnome/window-reconcile.c:2104
+#: ../src/gnome/window-reconcile2.c:2104 ../src/gnome/window-reconcile.c:2144
msgid "Do you want to postpone this reconciliation and finish it later?"
msgstr "Vil du udsætte denne afstemning og afslutte den senere?"
#. Toplevel
-#: ../src/gnome/window-reconcile2.c:2142 ../src/gnome/window-reconcile.c:2142
+#: ../src/gnome/window-reconcile2.c:2142 ../src/gnome/window-reconcile.c:2182
msgid "_Reconcile"
msgstr "_Afstem"
-#: ../src/gnome/window-reconcile2.c:2143 ../src/gnome/window-reconcile.c:2143
+#: ../src/gnome/window-reconcile2.c:2143 ../src/gnome/window-reconcile.c:2183
msgid "_Account"
msgstr "_Konto"
-#: ../src/gnome/window-reconcile2.c:2150 ../src/gnome/window-reconcile.c:2150
+#: ../src/gnome/window-reconcile2.c:2150 ../src/gnome/window-reconcile.c:2190
msgid "_Reconcile Information..."
msgstr "_Afstemningsinformation..."
-#: ../src/gnome/window-reconcile2.c:2151 ../src/gnome/window-reconcile.c:2151
+#: ../src/gnome/window-reconcile2.c:2151 ../src/gnome/window-reconcile.c:2191
msgid "Change the reconcile information including statement date and ending balance."
msgstr "Ændr afstemningsoplysninger, inklusiv udskriftsdato og slutsaldo."
-#: ../src/gnome/window-reconcile2.c:2156 ../src/gnome/window-reconcile.c:2156
+#: ../src/gnome/window-reconcile2.c:2156 ../src/gnome/window-reconcile.c:2196
msgid "_Finish"
msgstr "_Fuldfør"
-#: ../src/gnome/window-reconcile2.c:2157 ../src/gnome/window-reconcile.c:2157
+#: ../src/gnome/window-reconcile2.c:2157 ../src/gnome/window-reconcile.c:2197
msgid "Finish the reconciliation of this account"
msgstr "Afslut afstemning af denne konto"
-#: ../src/gnome/window-reconcile2.c:2161 ../src/gnome/window-reconcile.c:2161
+#: ../src/gnome/window-reconcile2.c:2161 ../src/gnome/window-reconcile.c:2201
msgid "_Postpone"
msgstr "_Udsæt"
-#: ../src/gnome/window-reconcile2.c:2162 ../src/gnome/window-reconcile.c:2162
+#: ../src/gnome/window-reconcile2.c:2162 ../src/gnome/window-reconcile.c:2202
msgid "Postpone the reconciliation of this account"
msgstr "Udsæt afstemningen af denne konto"
-#: ../src/gnome/window-reconcile2.c:2167 ../src/gnome/window-reconcile.c:2167
+#: ../src/gnome/window-reconcile2.c:2167 ../src/gnome/window-reconcile.c:2207
msgid "Cancel the reconciliation of this account"
-msgstr "Afbryd afstemning af denne konto"
+msgstr "Annuller afstemning af denne konto"
-#: ../src/gnome/window-reconcile2.c:2175 ../src/gnome/window-reconcile.c:2175
+#: ../src/gnome/window-reconcile2.c:2175 ../src/gnome/window-reconcile.c:2215
msgid "Open the account"
msgstr "Ã…bn kontoen"
-#: ../src/gnome/window-reconcile2.c:2180 ../src/gnome/window-reconcile.c:2180
+#: ../src/gnome/window-reconcile2.c:2180 ../src/gnome/window-reconcile.c:2220
msgid "Edit the main account for this register"
msgstr "Rediger hovedkontoen for denne kassekladde"
-#: ../src/gnome/window-reconcile2.c:2198 ../src/gnome/window-reconcile.c:2198
+#: ../src/gnome/window-reconcile2.c:2198 ../src/gnome/window-reconcile.c:2238
msgid "_Balance"
msgstr "_Balance"
-#: ../src/gnome/window-reconcile2.c:2199 ../src/gnome/window-reconcile.c:2199
+#: ../src/gnome/window-reconcile2.c:2199 ../src/gnome/window-reconcile.c:2239
#, fuzzy
msgid "Add a new balancing entry to the account"
msgstr "Tilføj en ny transaktion til kontoen"
-#: ../src/gnome/window-reconcile2.c:2204 ../src/gnome/window-reconcile.c:2204
+#: ../src/gnome/window-reconcile2.c:2204 ../src/gnome/window-reconcile.c:2244
msgid "Edit the current transaction"
msgstr "Rediger den nuværende transaktion"
-#: ../src/gnome/window-reconcile2.c:2209 ../src/gnome/window-reconcile.c:2209
+#: ../src/gnome/window-reconcile2.c:2209 ../src/gnome/window-reconcile.c:2249
msgid "Delete the selected transaction"
msgstr "Slet den valgte transaktion"
-#: ../src/gnome/window-reconcile2.c:2213 ../src/gnome/window-reconcile.c:2213
+#: ../src/gnome/window-reconcile2.c:2213 ../src/gnome/window-reconcile.c:2253
msgid "_Reconcile Selection"
msgstr "_Afstem markering"
-#: ../src/gnome/window-reconcile2.c:2214 ../src/gnome/window-reconcile.c:2214
+#: ../src/gnome/window-reconcile2.c:2214 ../src/gnome/window-reconcile.c:2254
msgid "Reconcile the selected transactions"
msgstr "Afstem de valgte transaktioner"
-#: ../src/gnome/window-reconcile2.c:2218 ../src/gnome/window-reconcile.c:2218
+#: ../src/gnome/window-reconcile2.c:2218 ../src/gnome/window-reconcile.c:2258
msgid "_Unreconcile Selection"
msgstr "_Fjern afstemning for markering"
-#: ../src/gnome/window-reconcile2.c:2219 ../src/gnome/window-reconcile.c:2219
+#: ../src/gnome/window-reconcile2.c:2219 ../src/gnome/window-reconcile.c:2259
msgid "Unreconcile the selected transactions"
msgstr "Fjern afstemning for de valgte transaktioner"
-#: ../src/gnome/window-reconcile2.c:2227 ../src/gnome/window-reconcile.c:2227
+#: ../src/gnome/window-reconcile2.c:2227 ../src/gnome/window-reconcile.c:2267
msgid "Open the GnuCash help window"
msgstr "Åbn GnuCash hjælpevinduet"
@@ -13768,29 +13750,30 @@ msgstr ""
"\n"
"Hvis du allerede har installeret Qt, så skal du tilpasse PATH-variablen på dit system. Kontakt GnuCash-udviklerne hvis du har brug for yderligere assistance om hvordan Qt installeres korrekt.\n"
"\n"
-"Netbank kan ikke opsættes uden Qt. Tryk »Luk« nu, så »Afbryd« for at afbryde opsætningen af netbank."
+"Netbank kan ikke opsættes uden Qt. Tryk »Luk« nu, så »Annuller« for at annullere opsætningen af netbank."
#: ../src/import-export/aqb/assistant-ab-initial.c:550
#, fuzzy
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 "Det eksterne program »AqBanking Setup Wizard« kunne ikke køres. Netbank kan kun opsættes hvis guiden er kørt igennem. Prøv at køre »AqBanking Setup Wizard« igen."
-#. Translators: Strings are 1. Account code, 2. Bank name, 3. Bank code.
-#: ../src/import-export/aqb/assistant-ab-initial.c:581
+#. Translators: Strings are 1. Bank code, 2. Bank name,
+#. * 3. Account Number, 4. Subaccount ID
+#: ../src/import-export/aqb/assistant-ab-initial.c:582
#, c-format
msgid "Bank code %s (%s), Account %s (%s)"
msgstr ""
-#: ../src/import-export/aqb/assistant-ab-initial.c:874
+#: ../src/import-export/aqb/assistant-ab-initial.c:875
msgid "Online Banking Account Name"
msgstr "Netbank-kontonavn"
-#: ../src/import-export/aqb/assistant-ab-initial.c:879
+#: ../src/import-export/aqb/assistant-ab-initial.c:880
msgid "GnuCash Account Name"
msgstr "GnuCash-kontonavn"
-#: ../src/import-export/aqb/assistant-ab-initial.c:885
-#: ../src/import-export/qif-imp/assistant-qif-import.c:545
+#: ../src/import-export/aqb/assistant-ab-initial.c:886
+#: ../src/import-export/qif-imp/assistant-qif-import.c:546
#: ../src/import-export/qif-imp/dialog-account-picker.c:379
msgid "New?"
msgstr "Ny?"
@@ -13831,7 +13814,7 @@ msgstr ""
"\n"
"BEMÆRK: DER GIVES INGEN GARANTI. Nogle banker kører en dårlig implementeret netbankserver. Du skal ikke stole på at kunne udføre tidskritiske overførsler via netbank, da banken undertiden ikke giver korrekt tilbagemeldning når en overførsel afvises.\n"
"\n"
-"Tryk på »Afbryd« hvis du ikke ønsker at opsætte en netbanksforbindelse på nuværende tidspunkt."
+"Tryk på »Annuller« hvis du ikke ønsker at opsætte en netbanksforbindelse på nuværende tidspunkt."
#: ../src/import-export/aqb/assistant-ab-initial.glade.h:18
msgid "Initial Online Banking Setup"
@@ -14438,7 +14421,7 @@ msgstr ""
#: ../src/import-export/aqb/gnc-gwen-gui.c:1565
msgid "The Online Banking job is still running; are you sure you want to cancel?"
-msgstr "Netbankjobbet kører stadig; er du sikker på, at du ønsker at afbryde?"
+msgstr "Netbankjobbet kører stadig; er du sikker på, at du ønsker at annullere?"
#: ../src/import-export/aqb/gncmod-aqbanking.c:79
#: ../src/import-export/gncmod-generic-import.c:79
@@ -14729,7 +14712,7 @@ msgid ""
"Cancel to abort."
msgstr ""
"Vælg Anvend for at oprette eksportfil.\n"
-"Afbryd for at afbryde."
+"Annuller for at afbryde."
#: ../src/import-export/csv-exp/assistant-csv-export.glade.h:40
msgid "Export Now..."
@@ -14869,13 +14852,13 @@ msgid "The input file can not be opened."
msgstr "Inddatafilen kan ikke åbnes."
#: ../src/import-export/csv-imp/assistant-csv-account-import.c:261
-#: ../src/plugins/bi_import/dialog-bi-import-gui.c:334
+#: ../src/plugins/bi_import/dialog-bi-import-gui.c:339
#: ../src/plugins/customer_import/dialog-customer-import-gui.c:319
msgid "Adjust regular expression used for import"
msgstr "Juster regulært udtryk brugt ved import"
#: ../src/import-export/csv-imp/assistant-csv-account-import.c:261
-#: ../src/plugins/bi_import/dialog-bi-import-gui.c:334
+#: ../src/plugins/bi_import/dialog-bi-import-gui.c:339
#: ../src/plugins/customer_import/dialog-customer-import-gui.c:319
msgid "This regular expression is used to parse the import file. Modify according to your needs.\n"
msgstr "Dette regulære udtryk bruges til at fortolke importfilen. Ændr til dine behov.\n"
@@ -14974,6 +14957,11 @@ msgstr ""
msgid "Import Accounts Now"
msgstr "Eksporter _konti"
+#: ../src/import-export/csv-imp/assistant-csv-account-import.glade.h:25
+#: ../src/import-export/csv-imp/assistant-csv-trans-import.glade.h:46
+msgid "label"
+msgstr "etiket"
+
#: ../src/import-export/csv-imp/assistant-csv-account-import.glade.h:26
#: ../src/import-export/csv-imp/assistant-csv-trans-import.glade.h:48
#, fuzzy
@@ -15175,54 +15163,54 @@ msgstr "Række %u, vare %s / %s blev ikke fundet\n"
msgid "Row %u, account %s not in %s\n"
msgstr "Række %u, konto %s er ikke i %s\n"
-#: ../src/import-export/csv-imp/gnc-csv-model.c:50
+#: ../src/import-export/csv-imp/gnc-csv-model.c:56
msgid "y-m-d"
msgstr "Ã¥-m-d"
-#: ../src/import-export/csv-imp/gnc-csv-model.c:51
+#: ../src/import-export/csv-imp/gnc-csv-model.c:57
msgid "d-m-y"
msgstr "d-m-Ã¥"
-#: ../src/import-export/csv-imp/gnc-csv-model.c:52
+#: ../src/import-export/csv-imp/gnc-csv-model.c:58
msgid "m-d-y"
msgstr "m-d-Ã¥"
-#: ../src/import-export/csv-imp/gnc-csv-model.c:53
+#: ../src/import-export/csv-imp/gnc-csv-model.c:59
msgid "d-m"
msgstr "d-m"
-#: ../src/import-export/csv-imp/gnc-csv-model.c:54
+#: ../src/import-export/csv-imp/gnc-csv-model.c:60
msgid "m-d"
msgstr "m-d"
-#: ../src/import-export/csv-imp/gnc-csv-model.c:59
+#: ../src/import-export/csv-imp/gnc-csv-model.c:65
#: ../src/import-export/import-format-dialog.c:62
msgid "Period: 123,456.78"
msgstr "Punktum: 123,456.78"
-#: ../src/import-export/csv-imp/gnc-csv-model.c:60
+#: ../src/import-export/csv-imp/gnc-csv-model.c:66
#: ../src/import-export/import-format-dialog.c:70
msgid "Comma: 123.456,78"
msgstr "Komma: 123.456,78"
-#: ../src/import-export/csv-imp/gnc-csv-model.c:476
+#: ../src/import-export/csv-imp/gnc-csv-model.c:490
msgid "File opening failed."
msgstr "Kunne ikke åbne fil."
-#: ../src/import-export/csv-imp/gnc-csv-model.c:491
-#: ../src/import-export/csv-imp/gnc-csv-model.c:499
+#: ../src/import-export/csv-imp/gnc-csv-model.c:505
+#: ../src/import-export/csv-imp/gnc-csv-model.c:513
msgid "Unknown encoding."
msgstr "Ukendt kodning."
-#: ../src/import-export/csv-imp/gnc-csv-model.c:830
+#: ../src/import-export/csv-imp/gnc-csv-model.c:844
msgid "No date column."
msgstr "Ingen datokolonne."
-#: ../src/import-export/csv-imp/gnc-csv-model.c:831
+#: ../src/import-export/csv-imp/gnc-csv-model.c:845
msgid "No balance, deposit, or withdrawal column."
msgstr "Ingen balance-, indskuds- eller hævningskolonne."
-#: ../src/import-export/csv-imp/gnc-csv-model.c:1125
+#: ../src/import-export/csv-imp/gnc-csv-model.c:1139
#, c-format
msgid "%s column could not be understood."
msgstr "%s kolonne kunne ikke forstås."
@@ -15491,7 +15479,7 @@ msgstr "Kontoen %s er en sumkonto, og transaktioner er ikke tilladt. Vælg venli
msgid "(Full account ID: "
msgstr "(Fuld konto-id: "
-#: ../src/import-export/import-commodity-matcher.c:115
+#: ../src/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."
msgstr ""
@@ -15511,68 +15499,68 @@ msgstr "Ã¥/m/d"
msgid "y/d/m"
msgstr "Ã¥/d/m"
-#: ../src/import-export/import-main-matcher.c:255
+#: ../src/import-export/import-main-matcher.c:250
msgid "Destination account for the auto-balance split."
msgstr ""
-#: ../src/import-export/import-main-matcher.c:479
+#: ../src/import-export/import-main-matcher.c:467
msgid "A"
msgstr ""
-#: ../src/import-export/import-main-matcher.c:481
+#: ../src/import-export/import-main-matcher.c:469
msgid "U+R"
msgstr ""
-#: ../src/import-export/import-main-matcher.c:490
+#: ../src/import-export/import-main-matcher.c:478
msgid "Info"
msgstr "Info"
-#: ../src/import-export/import-main-matcher.c:726
+#: ../src/import-export/import-main-matcher.c:714
msgid "New, already balanced"
msgstr ""
#. Translators: %1$s is the amount to be
#. transferred. %2$s is the destination account.
-#: ../src/import-export/import-main-matcher.c:752
+#: ../src/import-export/import-main-matcher.c:740
#, c-format
msgid "New, transfer %s to (manual) \"%s\""
msgstr "Ny, overfør %s til (manuelt) »%s«"
#. Translators: %1$s is the amount to be
#. transferred. %2$s is the destination account.
-#: ../src/import-export/import-main-matcher.c:760
+#: ../src/import-export/import-main-matcher.c:748
#, c-format
msgid "New, transfer %s to (auto) \"%s\""
msgstr "Ny, overfør %s til (automatisk) »%s«"
#. Translators: %s is the amount to be transferred.
-#: ../src/import-export/import-main-matcher.c:771
+#: ../src/import-export/import-main-matcher.c:759
#, c-format
msgid "New, UNBALANCED (need acct to transfer %s)!"
msgstr ""
-#: ../src/import-export/import-main-matcher.c:783
+#: ../src/import-export/import-main-matcher.c:771
msgid "Reconcile (manual) match"
msgstr "Afstem (manuelt) ens"
-#: ../src/import-export/import-main-matcher.c:787
+#: ../src/import-export/import-main-matcher.c:775
msgid "Reconcile (auto) match"
msgstr "Afstem (auto) ens"
-#: ../src/import-export/import-main-matcher.c:793
-#: ../src/import-export/import-main-matcher.c:812
+#: ../src/import-export/import-main-matcher.c:781
+#: ../src/import-export/import-main-matcher.c:800
msgid "Match missing!"
msgstr "Ingen ens!"
-#: ../src/import-export/import-main-matcher.c:802
+#: ../src/import-export/import-main-matcher.c:790
msgid "Update and reconcile (manual) match"
msgstr "Opdater og afstem (manuelt) match"
-#: ../src/import-export/import-main-matcher.c:806
+#: ../src/import-export/import-main-matcher.c:794
msgid "Update and reconcile (auto) match"
msgstr "Opdater og afstem (auto) match"
-#: ../src/import-export/import-main-matcher.c:817
+#: ../src/import-export/import-main-matcher.c:805
msgid "Do not import (no action selected)"
msgstr "Importer ikke (ingen handling valgt)"
@@ -15622,7 +15610,7 @@ msgstr "Genafspil en GnuCash-logfil efter et nedbrud. Dette kan ikke fortrydes."
#. name. It MUST NOT contain the
#. character ':' anywhere in it or
#. in any translations.
-#: ../src/import-export/ofx/gnc-ofx-import.c:563
+#: ../src/import-export/ofx/gnc-ofx-import.c:586
#, c-format
msgid "Stock account for security \"%s\""
msgstr "Aktiekonto for værdipapir »%s«"
@@ -15631,44 +15619,44 @@ msgstr "Aktiekonto for værdipapir »%s«"
#. name. It MUST NOT contain the
#. character ':' anywhere in it or
#. in any translations.
-#: ../src/import-export/ofx/gnc-ofx-import.c:729
+#: ../src/import-export/ofx/gnc-ofx-import.c:752
#, c-format
msgid "Income account for security \"%s\""
msgstr "Indtægtkonto for værdipapir »%s«"
-#: ../src/import-export/ofx/gnc-ofx-import.c:842
+#: ../src/import-export/ofx/gnc-ofx-import.c:865
msgid "Unknown OFX account"
msgstr "Ukendt OFX-konto"
-#: ../src/import-export/ofx/gnc-ofx-import.c:865
+#: ../src/import-export/ofx/gnc-ofx-import.c:888
msgid "Unknown OFX checking account"
msgstr "Ukendt OFX-checkkonto"
-#: ../src/import-export/ofx/gnc-ofx-import.c:869
+#: ../src/import-export/ofx/gnc-ofx-import.c:892
msgid "Unknown OFX savings account"
msgstr "Ukendt OFX-opsparingskonto"
-#: ../src/import-export/ofx/gnc-ofx-import.c:873
+#: ../src/import-export/ofx/gnc-ofx-import.c:896
msgid "Unknown OFX money market account"
msgstr "Ukendt OFX-pengemarkedskonto"
-#: ../src/import-export/ofx/gnc-ofx-import.c:877
+#: ../src/import-export/ofx/gnc-ofx-import.c:900
msgid "Unknown OFX credit line account"
msgstr ""
-#: ../src/import-export/ofx/gnc-ofx-import.c:881
+#: ../src/import-export/ofx/gnc-ofx-import.c:904
msgid "Unknown OFX CMA account"
msgstr "Ukendt OFX CMA-konto"
-#: ../src/import-export/ofx/gnc-ofx-import.c:885
+#: ../src/import-export/ofx/gnc-ofx-import.c:908
msgid "Unknown OFX credit card account"
msgstr "Ukendt OFX-kreditkortkonto"
-#: ../src/import-export/ofx/gnc-ofx-import.c:889
+#: ../src/import-export/ofx/gnc-ofx-import.c:912
msgid "Unknown OFX investment account"
msgstr "Ukendt OFX-investeringskonto"
-#: ../src/import-export/ofx/gnc-ofx-import.c:972
+#: ../src/import-export/ofx/gnc-ofx-import.c:995
msgid "Select an OFX/QFX file to process"
msgstr "Vælg en OFX-/QFX-fil, der skal behandles"
@@ -15680,93 +15668,93 @@ msgstr "Indlæs _OFX/QFX..."
msgid "Process an OFX/QFX response file"
msgstr "Behandl en OFX-/QFX-svarfil"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:531
+#: ../src/import-export/qif-imp/assistant-qif-import.c:532
msgid "GnuCash account name"
msgstr "GnuCash-kontonavn"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:833
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2666
+#: ../src/import-export/qif-imp/assistant-qif-import.c:834
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2672
msgid "Enter a name or short description, such as \"Red Hat Stock\"."
msgstr "Angiv et navn eller en kort beskrivelse, såsom »Red Hat-aktie«."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:835
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2673
+#: ../src/import-export/qif-imp/assistant-qif-import.c:836
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2679
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."
-msgstr ""
+msgstr "Indtast tickersymbolet eller anden kendt forkortelse, såsom »RHT«. Hvis en sådan ikke findes, eller du ikke kender den, så opret din egen."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:838
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2681
+#: ../src/import-export/qif-imp/assistant-qif-import.c:839
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2687
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."
msgstr ""
-#: ../src/import-export/qif-imp/assistant-qif-import.c:863
+#: ../src/import-export/qif-imp/assistant-qif-import.c:864
#, fuzzy
msgid "Enter information about"
msgstr "Indtast oplysninger om \"%s\""
-#: ../src/import-export/qif-imp/assistant-qif-import.c:879
+#: ../src/import-export/qif-imp/assistant-qif-import.c:880
msgid "_Name or description:"
msgstr "_Navn eller beskrivelse:"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:899
+#: ../src/import-export/qif-imp/assistant-qif-import.c:900
#, fuzzy
msgid "_Ticker symbol or other abbreviation:"
msgstr "Kode/forkortelse:"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:924
+#: ../src/import-export/qif-imp/assistant-qif-import.c:925
#, fuzzy
msgid "_Exchange or abbreviation type:"
msgstr "Vekselkurs:"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1123
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3103
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1124
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3109
msgid "(split)"
msgstr "(Opdel)"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1518
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1519
msgid "Please select a file to load."
msgstr "Angiv den fil, der skal indlæses."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1521
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1522
msgid "File not found or read permission denied. Please select another file."
msgstr "Fil ikke fundet eller læseadgang nægtet. Vælg venligst en anden fil."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1532
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1533
msgid "That QIF file is already loaded. Please select another file."
msgstr "Den QIF-fil er allerede indlæst. Vælg venligst en anden fil."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1600
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1601
msgid "Select QIF File"
msgstr "Vælg QIF-fil"
#. Swap the button label between pause and resume.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1663
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1667
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2774
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2778
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1664
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1668
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2780
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2784
msgid "_Resume"
msgstr "_Genoptag"
#. Inform the user.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1752
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1822
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2860
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1753
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1824
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2866
msgid "Canceled"
msgstr "Annulleret"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1766
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1770
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1767
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1771
msgid "An error occurred while loading the QIF file."
msgstr "Der opstod en fejl under indlæsning af QIF-filen."
#. Inform the user.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1767
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1785
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1841
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1897
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2880
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2901
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2948
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1768
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1786
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1843
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1899
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2886
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2907
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2954
msgid "Failed"
msgstr "Mislykkedes"
@@ -15774,97 +15762,97 @@ msgstr "Mislykkedes"
#. Remove any converted data.
#. An error occurred during duplicate checking.
#. Remove any converted data.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1818
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1835
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2856
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2874
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2897
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2942
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1820
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1837
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2862
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2880
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2903
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2948
msgid "Cleaning up"
msgstr "Rydder op"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1840
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1844
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1842
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1846
msgid "A bug was detected while parsing the QIF file."
msgstr "Der opstod en fejl under tolkning af QIF-filen."
#. The file was loaded successfully.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1916
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1918
msgid "Loading completed"
msgstr "Indlæsning færdig"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1947
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1949
#, fuzzy
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. Otherwise, the details will be shown below for your review."
msgstr "GnuCash vil nu indlæse din QIF-fil. Hvis der ingen fejl eller advarsler er, vil du automatisk fortsætte til det næste trin. Ellers vil detaljer blive vist nedenfor."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2512
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2518
#: ../src/import-export/qif-imp/assistant-qif-import.glade.h:60
msgid "Choose the QIF file currency and select Book Options"
msgstr ""
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2519
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2525
#, fuzzy
msgid "Choose the QIF file currency"
msgstr "Indtast aktieprisen"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2701
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2707
msgid "You must enter an existing national currency or enter a different type."
msgstr "Du skal enten angive en eksisterende national valuta eller angive en anden type."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2879
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2883
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2885
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2889
msgid "A bug was detected while converting the QIF data."
msgstr "En fejl opstod under konvertering af QIF-dataene."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2933
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2939
msgid "Canceling"
msgstr "Annullerer"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2947
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2951
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2953
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2957
msgid "A bug was detected while detecting duplicates."
msgstr "En fejl blev detekteret under detektering af duplikater."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2970
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2976
msgid "Conversion completed"
msgstr "Konvertering færdig"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3002
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3008
#, fuzzy
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. Otherwise, the details will be shown below for your review."
msgstr "GnuCash importerer nu dine QIF-data. Hvis du ikke møder nogen fejl eller advarsler, vil du automatisk blive sendt videre til det næste trin. Ellers vises detaljer nedenfor."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3198
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3204
msgid "GnuCash was unable to save your mapping preferences."
msgstr "GnuCash kunne ikke gemme dine oversættelsespræferencer."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3231
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3237
#, c-format
msgid "There was a problem with the import."
msgstr "Der opstod et problem med indlæsningen."
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3233
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3239
#, c-format
msgid "QIF Import Completed."
msgstr "QIF-indlæsning færdig."
#. Set up the QIF account to GnuCash account matcher.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3456
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3462
msgid "QIF account name"
msgstr "QIF-kontonavn"
#. Set up the QIF category to GnuCash account matcher.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3462
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3468
msgid "QIF category name"
msgstr "QIF-kategorinavn"
#. Set up the QIF payee/memo to GnuCash account matcher.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3468
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3474
msgid "QIF payee/memo"
msgstr "QIF-betalingsmodtager/note"
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3543
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3549
msgid "Match?"
msgstr "Match?"
@@ -15928,7 +15916,7 @@ msgstr ""
#: ../src/import-export/qif-imp/assistant-qif-import.glade.h:20
msgid "Click \"Back\" to cancel the loading of this file and choose another."
-msgstr "Tryk »Tilbage« for at afbryde indlæsningen af denne fil og vælge en anden."
+msgstr "Tryk »Tilbage« for at annullere indlæsningen af denne fil og vælge en anden."
#: ../src/import-export/qif-imp/assistant-qif-import.glade.h:21
msgid "Set a date format for this QIF file"
@@ -16431,42 +16419,42 @@ msgstr ""
msgid "%B %e, %Y"
msgstr ""
-#: ../src/plugins/bi_import/dialog-bi-import.c:285
+#: ../src/plugins/bi_import/dialog-bi-import.c:287
#, c-format
msgid "ROW %d DELETED, PRICE_NOT_SET: id=%s\n"
msgstr ""
-#: ../src/plugins/bi_import/dialog-bi-import.c:295
+#: ../src/plugins/bi_import/dialog-bi-import.c:297
#, c-format
msgid "ROW %d DELETED, QTY_NOT_SET: id=%s\n"
msgstr ""
-#: ../src/plugins/bi_import/dialog-bi-import.c:309
+#: ../src/plugins/bi_import/dialog-bi-import.c:311
#, c-format
msgid "ROW %d DELETED, ID_NOT_SET\n"
msgstr ""
-#: ../src/plugins/bi_import/dialog-bi-import.c:410
+#: ../src/plugins/bi_import/dialog-bi-import.c:412
#, c-format
msgid "ROW %d DELETED, OWNER_NOT_SET: id=%s\n"
msgstr ""
-#: ../src/plugins/bi_import/dialog-bi-import.c:435
+#: ../src/plugins/bi_import/dialog-bi-import.c:437
#, c-format
msgid "ROW %d DELETED, VENDOR_DOES_NOT_EXIST: id=%s\n"
msgstr ""
-#: ../src/plugins/bi_import/dialog-bi-import.c:449
+#: ../src/plugins/bi_import/dialog-bi-import.c:451
#, c-format
msgid "ROW %d DELETED, CUSTOMER_DOES_NOT_EXIST: id=%s\n"
msgstr ""
-#: ../src/plugins/bi_import/dialog-bi-import.c:493
+#: ../src/plugins/bi_import/dialog-bi-import.c:495
#, fuzzy
msgid "These rows were deleted:"
msgstr "Denne rapport kræver valg af konti."
-#: ../src/plugins/bi_import/dialog-bi-import.c:661
+#: ../src/plugins/bi_import/dialog-bi-import.c:665
#, fuzzy
msgid "Are you sure you have bills/invoices to update?"
msgstr "Er du sikker på at du ønsker at slette kontoen %s?"
@@ -16676,7 +16664,7 @@ msgstr "Gem transaktion før kopiering?"
#: ../src/register/ledger-core/split-register.c:454
msgid "The current transaction has been changed. Would you like to record the changes before duplicating the transaction, or cancel the duplication?"
-msgstr "Den aktuelle transaktion er blevet ændret. Vil du gemme ændringerne før kopiering af transaktionen, eller afbryde kopieringen?"
+msgstr "Den aktuelle transaktion er blevet ændret. Vil du gemme ændringerne før kopiering af transaktionen, eller annullere kopieringen?"
#: ../src/register/ledger-core/split-register.c:913
msgid "You are about to overwrite an existing split. Are you sure you want to do that?"
@@ -16689,11 +16677,11 @@ msgstr ""
"Du er ved at overskrive en eksisterende transaktion.\n"
"Er du sikker på at du vil gøre dette?"
-#: ../src/register/ledger-core/split-register-control.c:1359
+#: ../src/register/ledger-core/split-register-control.c:1363
msgid "You need to select a split in order to modify its exchange rate."
msgstr ""
-#: ../src/register/ledger-core/split-register-control.c:1386
+#: ../src/register/ledger-core/split-register-control.c:1390
#, fuzzy
msgid "The entered account could not be found."
msgstr ""
@@ -16701,11 +16689,11 @@ msgstr ""
" %s\n"
" kunne ikke findes."
-#: ../src/register/ledger-core/split-register-control.c:1485
+#: ../src/register/ledger-core/split-register-control.c:1489
msgid "The split's amount is zero, so no exchange rate is needed."
msgstr ""
-#: ../src/register/ledger-core/split-register-control.c:1536
+#: ../src/register/ledger-core/split-register-control.c:1540
#, fuzzy
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?"
msgstr "Den aktuelle transaktion er blevet ændret. Vil du gemme ændringerne før kopiering af transaktionen, eller afbryde kopieringen?"
@@ -16715,50 +16703,57 @@ msgstr "Den aktuelle transaktion er blevet ændret. Vil du gemme ændringerne f
#. used to estimate widths. Please only
#. translate the portion after the ':' and
#. leave the rest ("sample:") as is.
-#: ../src/register/ledger-core/split-register-layout.c:639
-#: ../src/register/ledger-core/split-register-layout.c:647
+#: ../src/register/ledger-core/split-register-layout.c:658
+#: ../src/register/ledger-core/split-register-layout.c:666
msgid "sample:99999"
msgstr "prøve:99999"
-#: ../src/register/ledger-core/split-register-layout.c:655
+#: ../src/register/ledger-core/split-register-layout.c:674
msgid "sample:Description of a transaction"
msgstr "prøve:Beskrivelse af transaktionen"
-#: ../src/register/ledger-core/split-register-layout.c:679
-#: ../src/register/ledger-core/split-register-layout.c:719
-#: ../src/register/ledger-core/split-register-layout.c:727
-#: ../src/register/ledger-core/split-register-layout.c:735
-#: ../src/register/ledger-core/split-register-layout.c:745
-#: ../src/register/ledger-core/split-register-layout.c:753
-#: ../src/register/ledger-core/split-register-layout.c:761
-#: ../src/register/ledger-core/split-register-layout.c:769
-#: ../src/register/ledger-core/split-register-layout.c:777
-#: ../src/register/ledger-core/split-register-layout.c:825
+#: ../src/register/ledger-core/split-register-layout.c:698
+#: ../src/register/ledger-core/split-register-model.c:325
+#, fuzzy
+#| msgid "Associate File"
+msgid "Associate:A"
+msgstr "Forbind fil"
+
+#: ../src/register/ledger-core/split-register-layout.c:706
+#: ../src/register/ledger-core/split-register-layout.c:746
+#: ../src/register/ledger-core/split-register-layout.c:754
+#: ../src/register/ledger-core/split-register-layout.c:762
+#: ../src/register/ledger-core/split-register-layout.c:772
+#: ../src/register/ledger-core/split-register-layout.c:780
+#: ../src/register/ledger-core/split-register-layout.c:788
+#: ../src/register/ledger-core/split-register-layout.c:796
+#: ../src/register/ledger-core/split-register-layout.c:804
+#: ../src/register/ledger-core/split-register-layout.c:852
msgid "sample:999,999.000"
msgstr "Prøve:999.999,000"
-#: ../src/register/ledger-core/split-register-layout.c:711
+#: ../src/register/ledger-core/split-register-layout.c:738
msgid "sample:Memo field sample text string"
msgstr "prøve:Notefelt tekstprøve"
-#: ../src/register/ledger-core/split-register-layout.c:785
+#: ../src/register/ledger-core/split-register-layout.c:812
msgid "Type:T"
msgstr "Type:T"
-#: ../src/register/ledger-core/split-register-layout.c:793
+#: ../src/register/ledger-core/split-register-layout.c:820
msgid "sample:Notes field sample text string"
msgstr "prøve:Bemærkningsfelt tekstprøve"
-#: ../src/register/ledger-core/split-register-layout.c:801
+#: ../src/register/ledger-core/split-register-layout.c:828
msgid "sample:No Particular Reason"
msgstr "prøve:Ingen bestemt årsag"
-#: ../src/register/ledger-core/split-register-layout.c:809
-#: ../src/register/ledger-core/split-register-layout.c:817
+#: ../src/register/ledger-core/split-register-layout.c:836
+#: ../src/register/ledger-core/split-register-layout.c:844
msgid "sample:(x + 0.33 * y + (x+y) )"
msgstr "prøve:(x + 0.33 * y + (x+y) )"
-#: ../src/register/ledger-core/split-register-load.c:259
+#: ../src/register/ledger-core/split-register-load.c:277
msgid "Could not determine the account currency. Using the default currency provided by your system."
msgstr ""
@@ -16775,87 +16770,87 @@ msgstr ""
msgid "T-Num"
msgstr ""
-#: ../src/register/ledger-core/split-register-model.c:381
+#: ../src/register/ledger-core/split-register-model.c:388
msgid "Exch. Rate"
msgstr "Vekselkurs"
-#: ../src/register/ledger-core/split-register-model.c:398
+#: ../src/register/ledger-core/split-register-model.c:405
msgid "Oth. Curr."
msgstr "And. valu."
-#: ../src/register/ledger-core/split-register-model.c:415
-#: ../src/register/ledger-core/split-register-model.c:439
+#: ../src/register/ledger-core/split-register-model.c:422
+#: ../src/register/ledger-core/split-register-model.c:446
#, c-format
msgid "Tot %s"
msgstr "Tot %s"
-#: ../src/register/ledger-core/split-register-model.c:421
+#: ../src/register/ledger-core/split-register-model.c:428
msgid "Tot Credit"
msgstr "Tot kredit"
-#: ../src/register/ledger-core/split-register-model.c:445
+#: ../src/register/ledger-core/split-register-model.c:452
msgid "Tot Debit"
msgstr "Tot debet"
-#: ../src/register/ledger-core/split-register-model.c:454
+#: ../src/register/ledger-core/split-register-model.c:461
msgid "Tot Shares"
msgstr "Tot aktier"
#. This seems to be the one that initially gets used, the InactiveDateCell
#. is set to, and subsequently displayed.
-#: ../src/register/ledger-core/split-register-model.c:902
+#: ../src/register/ledger-core/split-register-model.c:958
msgid "Scheduled"
msgstr "Planlagt"
-#: ../src/register/ledger-core/split-register-model.c:951
+#: ../src/register/ledger-core/split-register-model.c:1007
#, fuzzy
msgid "Enter a reference, such as an invoice or check number, common to all entry lines (splits)"
msgstr "Indtast transaktionsnummeret (f.eks. checknummeret)"
-#: ../src/register/ledger-core/split-register-model.c:953
+#: ../src/register/ledger-core/split-register-model.c:1009
#, fuzzy
msgid "Enter a reference, such as an invoice or check number, unique to each entry line (split)"
msgstr "Indtast transaktionsnummeret (f.eks. checknummeret)"
-#: ../src/register/ledger-core/split-register-model.c:958
+#: ../src/register/ledger-core/split-register-model.c:1014
#, fuzzy
msgid "Enter a reference, such as a check number, common to all entry lines (splits)"
msgstr "Indtast transaktionsnummeret (f.eks. checknummeret)"
-#: ../src/register/ledger-core/split-register-model.c:960
+#: ../src/register/ledger-core/split-register-model.c:1016
#, fuzzy
msgid "Enter a reference, such as a check number, unique to each entry line (split)"
msgstr "Indtast transaktionsnummeret (f.eks. checknummeret)"
-#: ../src/register/ledger-core/split-register-model.c:981
+#: ../src/register/ledger-core/split-register-model.c:1037
#, fuzzy
msgid "Enter a transaction reference, such as an invoice or check number, common to all entry lines (splits)"
msgstr "Indtast transaktionsnummeret (f.eks. checknummeret)"
-#: ../src/register/ledger-core/split-register-model.c:985
+#: ../src/register/ledger-core/split-register-model.c:1041
#, fuzzy
msgid "Enter a transaction reference that will be common to all entry lines (splits)"
msgstr "Indtast transaktionsnummeret (f.eks. checknummeret)"
-#: ../src/register/ledger-core/split-register-model.c:1188
+#: ../src/register/ledger-core/split-register-model.c:1244
#, fuzzy
msgid "Enter an action type, or choose one from the list"
msgstr "Indtast transaktionens type, eller vælg en fra listen"
-#: ../src/register/ledger-core/split-register-model.c:1189
+#: ../src/register/ledger-core/split-register-model.c:1245
#, fuzzy
msgid "Enter a reference number, such as the next check number, or choose an action type from the list"
msgstr "Angiv indtægts-/udgiftskonton for posten, eller vælg en fra listen"
-#: ../src/register/ledger-core/split-register-model.c:1452
+#: ../src/register/ledger-core/split-register-model.c:1508
msgid "This transaction has multiple splits; press the Split button to see them all"
msgstr "Denne transaktion har flere opdelinger. Tryk på opdelingsknappen for at se dem alle"
-#: ../src/register/ledger-core/split-register-model.c:1455
+#: ../src/register/ledger-core/split-register-model.c:1511
msgid "This transaction is a stock split; press the Split button to see details"
msgstr "Denne transaktion er en aktieopsplitning. Tryk \"Opsplitning\"-knappen for detaljer"
-#: ../src/register/ledger-core/split-register-model.c:1942
+#: ../src/register/ledger-core/split-register-model.c:1998
#, c-format
msgid ""
"Cannot modify or delete this transaction. This transaction is marked read-only because:\n"
@@ -16953,111 +16948,198 @@ msgstr "Vis den totale saldo i beskrivelser?"
msgid "Due or Post Date"
msgstr "Sortér efter dato"
-#: ../src/report/business-reports/aging.scm:214
+#. Display tab options
+#: ../src/report/business-reports/aging.scm:49
+#: ../src/report/business-reports/receivables.scm:40
+#, fuzzy
+msgid "Address Source"
+msgstr "Adresse: "
+
+#: ../src/report/business-reports/aging.scm:55
+#, fuzzy
+msgid "Address Phone"
+msgstr "Adresse: "
+
+#: ../src/report/business-reports/aging.scm:56
+#, fuzzy
+msgid "Address Fax"
+msgstr "Adresse: "
+
+#: ../src/report/business-reports/aging.scm:57
+#, fuzzy
+msgid "Address Email"
+msgstr "Adresse: "
+
+#: ../src/report/business-reports/aging.scm:226
msgid "Transactions relating to '%s' contain more than one currency. This report is not designed to cope with this possibility."
msgstr ""
-#: ../src/report/business-reports/aging.scm:350
+#: ../src/report/business-reports/aging.scm:363
#, fuzzy
msgid "Sort companies by."
msgstr "Sorter firmaer via"
-#: ../src/report/business-reports/aging.scm:353
+#: ../src/report/business-reports/aging.scm:366
msgid "Name of the company."
msgstr "Navn på firmaet."
-#: ../src/report/business-reports/aging.scm:354
+#: ../src/report/business-reports/aging.scm:367
msgid "Total Owed"
msgstr "Samlet gæld"
-#: ../src/report/business-reports/aging.scm:354
+#: ../src/report/business-reports/aging.scm:367
msgid "Total amount owed to/from Company."
msgstr "Samlet gæld til/fra firma."
-#: ../src/report/business-reports/aging.scm:355
+#: ../src/report/business-reports/aging.scm:368
msgid "Bracket Total Owed"
msgstr ""
-#: ../src/report/business-reports/aging.scm:355
+#: ../src/report/business-reports/aging.scm:368
msgid "Amount owed in oldest bracket - if same go to next oldest."
msgstr ""
-#: ../src/report/business-reports/aging.scm:362
+#: ../src/report/business-reports/aging.scm:375
msgid "Sort order."
msgstr "Sorteringsorden."
-#: ../src/report/business-reports/aging.scm:365
+#: ../src/report/business-reports/aging.scm:378
msgid "Increasing"
msgstr "Forøger"
-#: ../src/report/business-reports/aging.scm:365
+#: ../src/report/business-reports/aging.scm:378
msgid "0 -> $999,999.99, A->Z."
msgstr ""
-#: ../src/report/business-reports/aging.scm:366
+#: ../src/report/business-reports/aging.scm:379
msgid "Decreasing"
msgstr "Sænker"
-#: ../src/report/business-reports/aging.scm:366
+#: ../src/report/business-reports/aging.scm:379
msgid "$999,999.99 -> $0, Z->A."
msgstr ""
-#: ../src/report/business-reports/aging.scm:373
+#: ../src/report/business-reports/aging.scm:386
#, fuzzy
msgid "Show multi-currency totals. If not selected, convert all totals to report currency."
msgstr "Vis en hovedtotal for alle konti konverteret til standardrapportens valuta."
-#: ../src/report/business-reports/aging.scm:382
+#: ../src/report/business-reports/aging.scm:395
msgid "Show all vendors/customers even if they have a zero balance."
msgstr "Vis alle leverandører/kunder også selv om de har nulbalance."
-#: ../src/report/business-reports/aging.scm:390
-#: ../src/report/business-reports/owner-report.scm:567
+#: ../src/report/business-reports/aging.scm:403
+#: ../src/report/business-reports/owner-report.scm:566
#, fuzzy
msgid "Leading date."
msgstr "Indlæser data..."
-#: ../src/report/business-reports/aging.scm:393
-#: ../src/report/business-reports/owner-report.scm:570
+#: ../src/report/business-reports/aging.scm:406
+#: ../src/report/business-reports/owner-report.scm:569
msgid "Due date is leading."
msgstr ""
-#: ../src/report/business-reports/aging.scm:394
-#: ../src/report/business-reports/owner-report.scm:571
+#: ../src/report/business-reports/aging.scm:407
+#: ../src/report/business-reports/owner-report.scm:570
msgid "Post date is leading."
msgstr ""
-#: ../src/report/business-reports/aging.scm:465
-#: ../src/report/business-reports/owner-report.scm:254
+#: ../src/report/business-reports/aging.scm:419
+msgid "Display Address Name. This, and other fields, may be useful if copying this report to a spreadsheet for use in a mail merge."
+msgstr ""
+
+#: ../src/report/business-reports/aging.scm:428
+#, fuzzy
+#| msgid "Display the address?"
+msgid "Display Address 1."
+msgstr "Vis adressen?"
+
+#: ../src/report/business-reports/aging.scm:436
+#, fuzzy
+#| msgid "Display the address?"
+msgid "Display Address 2."
+msgstr "Vis adressen?"
+
+#: ../src/report/business-reports/aging.scm:444
+#, fuzzy
+#| msgid "Display the address?"
+msgid "Display Address 3."
+msgstr "Vis adressen?"
+
+#: ../src/report/business-reports/aging.scm:452
+#, fuzzy
+#| msgid "Display the address?"
+msgid "Display Address 4."
+msgstr "Vis adressen?"
+
+#: ../src/report/business-reports/aging.scm:460
+#, fuzzy
+msgid "Display Phone."
+msgstr "Vis"
+
+#: ../src/report/business-reports/aging.scm:468
+#, fuzzy
+#| msgid "Display"
+msgid "Display Fax."
+msgstr "Vis"
+
+#: ../src/report/business-reports/aging.scm:476
+#, fuzzy
+msgid "Display Email."
+msgstr "Vis totalerne?"
+
+#: ../src/report/business-reports/aging.scm:484
+#, fuzzy
+#| msgid "Display the totals?"
+msgid "Display Active status."
+msgstr "Vis totalerne?"
+
+#: ../src/report/business-reports/aging.scm:557
+#: ../src/report/business-reports/owner-report.scm:253
#, fuzzy
msgid "Current"
msgstr "Valuta"
-#: ../src/report/business-reports/aging.scm:466
+#: ../src/report/business-reports/aging.scm:558
#: ../src/report/business-reports/job-report.scm:173
-#: ../src/report/business-reports/owner-report.scm:255
+#: ../src/report/business-reports/owner-report.scm:254
msgid "0-30 days"
msgstr "0-30 dage"
-#: ../src/report/business-reports/aging.scm:467
+#: ../src/report/business-reports/aging.scm:559
#: ../src/report/business-reports/job-report.scm:174
-#: ../src/report/business-reports/owner-report.scm:256
+#: ../src/report/business-reports/owner-report.scm:255
msgid "31-60 days"
msgstr "31-60 dage"
-#: ../src/report/business-reports/aging.scm:468
+#: ../src/report/business-reports/aging.scm:560
#: ../src/report/business-reports/job-report.scm:175
-#: ../src/report/business-reports/owner-report.scm:257
+#: ../src/report/business-reports/owner-report.scm:256
msgid "61-90 days"
msgstr "61-90 dage"
-#: ../src/report/business-reports/aging.scm:469
+#: ../src/report/business-reports/aging.scm:561
#: ../src/report/business-reports/job-report.scm:176
-#: ../src/report/business-reports/owner-report.scm:258
+#: ../src/report/business-reports/owner-report.scm:257
msgid "91+ days"
msgstr "+91 dage"
-#: ../src/report/business-reports/aging.scm:676
+#: ../src/report/business-reports/aging.scm:711
+#: ../src/report/business-reports/taxinvoice.eguile.scm:197
+msgid "Email"
+msgstr "E-post"
+
+#: ../src/report/business-reports/aging.scm:789
+msgid "Y"
+msgstr ""
+
+#: ../src/report/business-reports/aging.scm:789
+#, fuzzy
+#| msgid "No"
+msgid "N"
+msgstr "Nej"
+
+#: ../src/report/business-reports/aging.scm:856
#: ../src/report/business-reports/job-report.scm:616
msgid "No valid account selected. Click on the Options button and select the account to use."
msgstr "Ingen gyldig konto valgt. Klik på opsætningsknappen og vælg den ønskede konto."
@@ -17447,14 +17529,14 @@ msgstr "Vis dit eget firmas adresse og datoen for udskrivning."
#: ../src/report/business-reports/job-report.scm:398
#: ../src/report/business-reports/job-report.scm:403
#: ../src/report/business-reports/job-report.scm:408
-#: ../src/report/business-reports/owner-report.scm:518
-#: ../src/report/business-reports/owner-report.scm:523
-#: ../src/report/business-reports/owner-report.scm:528
-#: ../src/report/business-reports/owner-report.scm:533
-#: ../src/report/business-reports/owner-report.scm:538
-#: ../src/report/business-reports/owner-report.scm:543
-#: ../src/report/business-reports/owner-report.scm:548
-#: ../src/report/business-reports/owner-report.scm:553
+#: ../src/report/business-reports/owner-report.scm:517
+#: ../src/report/business-reports/owner-report.scm:522
+#: ../src/report/business-reports/owner-report.scm:527
+#: ../src/report/business-reports/owner-report.scm:532
+#: ../src/report/business-reports/owner-report.scm:537
+#: ../src/report/business-reports/owner-report.scm:542
+#: ../src/report/business-reports/owner-report.scm:547
+#: ../src/report/business-reports/owner-report.scm:552
msgid "Display Columns"
msgstr "Vis kolonner"
@@ -17558,7 +17640,7 @@ msgid "Expense Report"
msgstr "Udgiftsrapport"
#: ../src/report/business-reports/customer-summary.scm:735
-#: ../src/report/business-reports/owner-report.scm:719
+#: ../src/report/business-reports/owner-report.scm:718
#: ../src/report/report-gnome/dialog-report-column-view.c:351
#: ../src/report/report-gnome/report-gnome.scm:80
msgid "Report"
@@ -17893,15 +17975,15 @@ msgstr ""
#: ../src/report/business-reports/invoice.scm:336
#: ../src/report/business-reports/job-report.scm:413
#: ../src/report/business-reports/job-report.scm:620
-#: ../src/report/business-reports/owner-report.scm:558
-#: ../src/report/business-reports/owner-report.scm:760
+#: ../src/report/business-reports/owner-report.scm:557
+#: ../src/report/business-reports/owner-report.scm:759
msgid "Today Date Format"
msgstr "I dag-datoformat"
#: ../src/report/business-reports/easy-invoice.scm:362
#: ../src/report/business-reports/invoice.scm:337
#: ../src/report/business-reports/job-report.scm:414
-#: ../src/report/business-reports/owner-report.scm:559
+#: ../src/report/business-reports/owner-report.scm:558
msgid "The format for the date->string conversion for today's date."
msgstr ""
@@ -18072,12 +18154,12 @@ msgid "Job name"
msgstr "Jobnavn"
#: ../src/report/business-reports/job-report.scm:332
-#: ../src/report/business-reports/owner-report.scm:466
+#: ../src/report/business-reports/owner-report.scm:465
msgid "Total Credit"
msgstr "Samlet kredit"
#: ../src/report/business-reports/job-report.scm:333
-#: ../src/report/business-reports/owner-report.scm:467
+#: ../src/report/business-reports/owner-report.scm:466
#, fuzzy
msgid "Total Due"
msgstr "Total"
@@ -18088,35 +18170,35 @@ msgid "The job for this report."
msgstr "Jobbet til denne rapport"
#: ../src/report/business-reports/job-report.scm:374
-#: ../src/report/business-reports/owner-report.scm:504
+#: ../src/report/business-reports/owner-report.scm:503
#, fuzzy
msgid "The account to search for transactions."
msgstr "Kontoen hvor der skal søges efter transaktioner"
#: ../src/report/business-reports/job-report.scm:384
#: ../src/report/business-reports/job-report.scm:389
-#: ../src/report/business-reports/owner-report.scm:519
-#: ../src/report/business-reports/owner-report.scm:524
+#: ../src/report/business-reports/owner-report.scm:518
+#: ../src/report/business-reports/owner-report.scm:523
msgid "Display the transaction date?"
msgstr "Vis transaktionsdatoen?"
#: ../src/report/business-reports/job-report.scm:394
-#: ../src/report/business-reports/owner-report.scm:529
+#: ../src/report/business-reports/owner-report.scm:528
msgid "Display the transaction reference?"
msgstr "Vis transaktionsreferencen?"
#: ../src/report/business-reports/job-report.scm:399
-#: ../src/report/business-reports/owner-report.scm:534
+#: ../src/report/business-reports/owner-report.scm:533
msgid "Display the transaction type?"
msgstr "Vis transaktionstypen?"
#: ../src/report/business-reports/job-report.scm:404
-#: ../src/report/business-reports/owner-report.scm:539
+#: ../src/report/business-reports/owner-report.scm:538
msgid "Display the transaction description?"
msgstr "Vis transaktionsbeskrivelsen?"
#: ../src/report/business-reports/job-report.scm:409
-#: ../src/report/business-reports/owner-report.scm:554
+#: ../src/report/business-reports/owner-report.scm:553
#, fuzzy
msgid "Display the transaction amount?"
msgstr "Vis transaktionsdatoen?"
@@ -18163,25 +18245,25 @@ msgstr "Ingen gyldig konto valgt"
msgid "This report requires a valid account to be selected."
msgstr "Denne rapport kræver at en gyldig konto vælges."
-#: ../src/report/business-reports/owner-report.scm:432
+#: ../src/report/business-reports/owner-report.scm:431
msgid "Period Totals"
msgstr "Periodetotaler"
-#: ../src/report/business-reports/owner-report.scm:496
+#: ../src/report/business-reports/owner-report.scm:495
msgid "The company for this report."
msgstr "Firmaet for denne rapport."
-#: ../src/report/business-reports/owner-report.scm:544
+#: ../src/report/business-reports/owner-report.scm:543
#, fuzzy
msgid "Display the period credits column?"
msgstr "Vis postens rabat"
-#: ../src/report/business-reports/owner-report.scm:549
+#: ../src/report/business-reports/owner-report.scm:548
#, fuzzy
msgid "Display a period debits column?"
msgstr "Vis postens rabat"
-#: ../src/report/business-reports/owner-report.scm:745
+#: ../src/report/business-reports/owner-report.scm:744
msgid "Report:"
msgstr "Rapport:"
@@ -18194,7 +18276,7 @@ msgstr "Betalingskonto"
msgid "The payable account you wish to examine."
msgstr "Betalingskontoen du ønsker at undersøge"
-#: ../src/report/business-reports/payables.scm:69
+#: ../src/report/business-reports/payables.scm:78
msgid "Payable Aging"
msgstr ""
@@ -18203,20 +18285,37 @@ msgstr ""
msgid "Receivables Account"
msgstr "Vælg konto"
-#: ../src/report/business-reports/receivables.scm:50
+#: ../src/report/business-reports/receivables.scm:51
#, fuzzy
msgid "The receivables account you wish to examine."
msgstr "Der er allerede en konto med det navn."
-#: ../src/report/business-reports/receivables.scm:70
+#: ../src/report/business-reports/receivables.scm:68
+#, fuzzy
+msgid "Address source."
+msgstr "Adresse: "
+
+#: ../src/report/business-reports/receivables.scm:71
+#, fuzzy
+#| msgid "You must enter a billing address."
+msgid "Address fields from billing address."
+msgstr "Du skal angive en faktureringsadresse."
+
+#: ../src/report/business-reports/receivables.scm:72
+#, fuzzy
+#| msgid "Shipping Contact"
+msgid "Shipping"
+msgstr "Forsendelsesoplysninger"
+
+#: ../src/report/business-reports/receivables.scm:72
+msgid "Address fields from shipping address."
+msgstr ""
+
+#: ../src/report/business-reports/receivables.scm:91
#, fuzzy
msgid "Receivable Aging"
msgstr "Modtag"
-#: ../src/report/business-reports/taxinvoice.eguile.scm:197
-msgid "Email"
-msgstr "E-post"
-
#: ../src/report/business-reports/taxinvoice.eguile.scm:203
msgid "Website"
msgstr "Hjemmeside"
@@ -18805,6 +18904,13 @@ msgstr "Denne rapport viser transaktionsdetaljer for de konti som indgår i din
msgid "This page shows transaction detail for relevant Income Tax accounts."
msgstr "Denne rapport viser transaktionsdetaljer for relevante konti i din indkomstskat."
+#. we must confirm the user wants to delete their precious custom report!
+#: ../src/report/report-gnome/dialog-custom-report.c:315
+#, fuzzy, c-format
+#| msgid "Are you sure you want to delete \"%s\"?"
+msgid "Are you sure you want to delete %s?"
+msgstr "Er du sikker på, at du ønsker at slette »%s«?"
+
# måske vises -> køres
#: ../src/report/report-gnome/dialog-custom-report.c:421
#, fuzzy
@@ -18969,122 +19075,122 @@ msgstr "Du skal angive et navn til denne skattetabel."
msgid "Style Sheet Name"
msgstr "Navn på stilark"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:294
#: ../src/report/report-gnome/gnc-plugin-page-report.c:295
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:296
msgid "The numeric ID of the report."
msgstr "Den numeriske id på rapporten."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1008
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1009
msgid "_Print Report..."
msgstr "_Udskriv rapport..."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1009
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1010
msgid "Print the current report"
msgstr "Udskriv den aktuelle rapport"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1013
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1014
#, fuzzy
msgid "Export as P_DF..."
msgstr "Indlæs _QIF..."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1014
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1015
#, fuzzy
msgid "Export the current report as a PDF document"
msgstr "Udskriv den aktuelle rapport"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1038
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1039
#, fuzzy
msgid "Save _Report Configuration"
msgstr "Enkelt rapport"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1039
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1040
msgid "Update the current report's saved configuration. The report will be saved in the file ~/.gnucash/saved-reports-2.4. "
msgstr ""
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1044
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1045
#, fuzzy
msgid "Save Report Configuration As..."
msgstr "Gem som ..."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1045
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1046
#, fuzzy
msgid "Add the current report's configuration to the `Saved Report Configurations' menu. The report will be saved in the file ~/.gnucash/saved-reports-2.4. "
msgstr "Tilføj den aktuelle rapport til den »tilpassede« menu til senere brug. Rapporten bliver gemt i filen ~/.gnucash/saved-reports-2.0. Den vil være tilgængelig som menupunkt i rapportmenuen ved næste opstart af GnuCash."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1050
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1051
msgid "Export _Report"
msgstr "Eksporter _rapport"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1051
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1052
msgid "Export HTML-formatted report to file"
msgstr "Eksportér HTML-formateret rapport til fil"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1055
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1056
msgid "_Report Options"
msgstr "_Rapportindstillinger"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1056
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1057
#: ../src/report/report-system/html-utilities.scm:813
msgid "Edit report options"
msgstr "Redigér rapportvalg"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1061
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1062
msgid "Back"
msgstr "Tilbage"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1062
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1063
msgid "Move back one step in the history"
msgstr "GÃ¥ et trin tilbage i historikken"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1066
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1067
msgid "Forward"
msgstr "Send videre"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1067
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1068
msgid "Move forward one step in the history"
msgstr "GÃ¥ et trin frem i historikken"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1071
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1072
msgid "Reload"
msgstr "Genindlæs"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1072
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1073
msgid "Reload the current page"
msgstr "Genindlæs den aktuelle side"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1076
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1077
msgid "Stop"
msgstr "Stop"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1077
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1078
msgid "Cancel outstanding HTML requests"
-msgstr "Annullér udestående HTML-forespørgsler"
+msgstr "Annuller udestående HTML-forespørgsler"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1086
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1087
msgid "Print"
msgstr "Udskriv"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1367
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1400
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1368
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1401
msgid "HTML"
msgstr "HTML"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1370
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1371
msgid "Choose export format"
msgstr "Vælg eksportformat"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1371
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1372
msgid "Choose the export format for this report:"
msgstr "Vælg eksportformat for denne rapport:"
#. %s is the type of what is about to be saved, e.g. "HTML".
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1411
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1412
#, c-format
msgid "Save %s To File"
msgstr "Gem %s til fil"
#. %s is the strerror(3) string of the error that occurred.
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1437
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1438
#, c-format
msgid ""
"You cannot save to that filename.\n"
@@ -19095,20 +19201,20 @@ msgstr ""
"\n"
"%s"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1447
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1448
msgid "You cannot save to that file."
msgstr "Du kan ikke gemme i den fil."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1576
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1577
#, c-format
msgid "Could not open the file %s. The error is: %s"
msgstr "Kunne ikke åbne filen %s. Fejlen er: %s"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1608
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1609
msgid "There are no options for this report."
msgstr "Der er ingen indstillinger for denne rapport."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1633
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1634
#, fuzzy
msgid "GnuCash-Report"
msgstr "Fjerde option"
@@ -20192,9 +20298,8 @@ msgstr "Avanceret portefølje"
#: ../src/report/standard-reports/advanced-portfolio.scm:42
#: ../src/report/standard-reports/portfolio.scm:38
-#, fuzzy
msgid "Share decimal places"
-msgstr "Aktiebalance"
+msgstr "Del antal decimaler"
#: ../src/report/standard-reports/advanced-portfolio.scm:43
#: ../src/report/standard-reports/portfolio.scm:39
@@ -20202,9 +20307,8 @@ msgid "Include accounts with no shares"
msgstr "Inkluder konti uden aktier"
#: ../src/report/standard-reports/advanced-portfolio.scm:44
-#, fuzzy
msgid "Show ticker symbols"
-msgstr "Vis kun tekst"
+msgstr "Vis tickersymboler"
#: ../src/report/standard-reports/advanced-portfolio.scm:45
#, fuzzy
@@ -20290,9 +20394,8 @@ msgid "Include brokerage fees in the gain and loss but not in the basis."
msgstr ""
#: ../src/report/standard-reports/advanced-portfolio.scm:117
-#, fuzzy
msgid "Ignore"
-msgstr "Ignoreret"
+msgstr "Ignorer"
#: ../src/report/standard-reports/advanced-portfolio.scm:118
#, fuzzy
@@ -20300,9 +20403,8 @@ msgid "Ignore brokerage fees entirely."
msgstr "Ignorer handelsomkostninger når gevinst beregnes"
#: ../src/report/standard-reports/advanced-portfolio.scm:125
-#, fuzzy
msgid "Display the ticker symbols."
-msgstr "Vis totalerne?"
+msgstr "Vis tickersymbolerne."
#: ../src/report/standard-reports/advanced-portfolio.scm:132
#, fuzzy
@@ -20317,12 +20419,11 @@ msgstr "Vis antal aktier"
#: ../src/report/standard-reports/advanced-portfolio.scm:145
#: ../src/report/standard-reports/portfolio.scm:65
msgid "The number of decimal places to use for share numbers."
-msgstr ""
+msgstr "Antallet af decimaler at anvende for aktietal."
#: ../src/report/standard-reports/advanced-portfolio.scm:152
-#, fuzzy
msgid "Display share prices."
-msgstr "Vis aktiernes pris?"
+msgstr "Vis aktiepriser."
#: ../src/report/standard-reports/advanced-portfolio.scm:160
#: ../src/report/standard-reports/portfolio.scm:73
@@ -21366,9 +21467,8 @@ msgstr "Anden kontos nummer"
#: ../src/report/standard-reports/general-ledger.scm:114
#: ../src/report/standard-reports/transaction.scm:993
#: ../src/report/standard-reports/transaction.scm:1064
-#, fuzzy
msgid "Sign Reverses"
-msgstr "Fortegnsskift?"
+msgstr "Skift fortegn"
#: ../src/report/standard-reports/general-ledger.scm:121
#: ../src/report/standard-reports/transaction.scm:617
@@ -21621,10 +21721,6 @@ msgstr "Virkelige transaktioner"
msgid "The instantaneous price of actual currency transactions in the past."
msgstr "Prisen på de aktuelle valutatransaktioner på overførselstidspunktet"
-#: ../src/report/standard-reports/price-scatter.scm:96
-msgid "Price Database"
-msgstr "Prisdatabase"
-
#: ../src/report/standard-reports/price-scatter.scm:97
msgid "The recorded prices."
msgstr "De registrerede pristilbud."
@@ -23238,58 +23334,62 @@ msgid "Create new accounts by clicking the New button in the main window tool ba
msgstr "Opret nye konti ved at trykke på knappen Ny i hovedvinduets værktøjslinje. Dette vil frembringe en dialogboks, hvor du kan angive kontodetaljer. For yderligere information om valg af kontotype eller opsætning af en kontoplan så se GnuCashs manual på nettet."
#: ../doc/tip_of_the_day.list.in:20
-msgid "Click the right mouse button in the main window to bring up the account menu options. Within each register, clicking the right mouse button brings up the transaction menu options."
+#, fuzzy
+#| msgid "Click the right mouse button in the main window to bring up the account menu options. Within each register, clicking the right mouse button brings up the transaction menu options."
+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."
msgstr "Brug den højre museknap i hovedvinduet til at vise kontoens menuvalg. I hver kassekladde vil højre museknap frembringe transaktionens menuvalg."
-#: ../doc/tip_of_the_day.list.in:24
+#: ../doc/tip_of_the_day.list.in:25
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."
msgstr "For at indtaste transaktioner med flere dele, såsom en betaling med flere afdrag, kan du bruge knappen Opdel i værktøjslinjen. Alternativt, i visningsmenuen, kan du vælge kassekladdestilen Autoopdel hovedbog eller Transaktionsrapport."
-#: ../doc/tip_of_the_day.list.in:29
+#: ../doc/tip_of_the_day.list.in:30
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."
msgstr "Når du indtaster beløb i kassekladden, kan du bruge GnuCashs lommeregner til at addere, subtrahere, gange og dividere. Indtast ganske enkelt den første værdi, derefter »+«, »-«, »*« eller »/«. Indtast den anden værdi og tryk Retur for at udregne beløbet."
-#: ../doc/tip_of_the_day.list.in:34
+#: ../doc/tip_of_the_day.list.in:35
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."
msgstr "Hurtig-udfyldning gør det let at indtaste almindelige transaktioner. Når du indtaster de første bogstaver i en almindelig transaktionsbeskrivelse, så tryk på Tab-tasten og GnuCash vil automatisk udfylde resten af transaktionen, som den sidst blev indtastet."
-#: ../doc/tip_of_the_day.list.in:39
+#: ../doc/tip_of_the_day.list.in:40
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.)"
msgstr "Indtast første bogstav(er) i et eksisterende kontonavn i overførselsregistersøjlen. Så vil GnuCash færdiggøre navnet ud fra din kontoliste. For underkonti kan du skrive første bogstav(er) i samlekontoen, efterfulgt af et ':' og første bogstav(er) i underkontoen. (f.eks. A:K for Aktiver:Kontant.)"
-#: ../doc/tip_of_the_day.list.in:45
-msgid "Want to see all your subaccount transactions in one register? From the main menu, highlight the parent account and select Accounts -> Open Subaccounts from the menu."
+#: ../doc/tip_of_the_day.list.in:46
+#, fuzzy
+#| msgid "Want to see all your subaccount transactions in one register? From the main menu, highlight the parent account and select Accounts -> Open Subaccounts from the menu."
+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 View -> Open Subaccounts from the menu."
msgstr "Vil du se transaktioner for alle dine underkonti i en kassekladde? Marker samlekontoen i hovedmenuen og vælg Konti -> Åbn underkonti i menuen."
-#: ../doc/tip_of_the_day.list.in:49
+#: ../doc/tip_of_the_day.list.in:50
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."
msgstr "Når du indtaster datoer, så kan du taste »+« eller »-« for at øge eller sænke den valgte dato. Du kan også bruge »+« og »-« til at øge og sænke checknumre."
-#: ../doc/tip_of_the_day.list.in:53
+#: ../doc/tip_of_the_day.list.in:54
msgid "To switch between multiple tabs in the main window, press Control+Page Up/Down."
msgstr "For at skifte mellem flere faneblade i hovedvinduet trykkes på Control+Side op/ned."
-#: ../doc/tip_of_the_day.list.in:56
+#: ../doc/tip_of_the_day.list.in:57
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."
msgstr "Du kan trykke mellemrum i afstemningsvinduet for at markere transaktioner som afstemte. Du kan også trykke Tab og Skift-tab for at bevæge dig mellem ind- og udbetalinger."
-#: ../doc/tip_of_the_day.list.in:60
+#: ../doc/tip_of_the_day.list.in:61
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."
msgstr "For at overføre beløb mellem konti med forskellige valutaer klikkes på knappen Overfør i kassekladdens værktøjslinje, der vælges konti og indstillingerne for valutaoverførsel til at indtaste kursen ellers vil den anden valutas værdi ikke være tilgængelig."
-#: ../doc/tip_of_the_day.list.in:65
+#: ../doc/tip_of_the_day.list.in:66
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."
msgstr "Du kan samle flere rapporter i et enkelt vindue, så du kan se alle de økonomiske oplysninger, du ønsker med et enkelt øjekast. Brug Prøv & tilpas-rapporten »Tilpasset rapport med flere kolonner« for at opnå dette."
-#: ../doc/tip_of_the_day.list.in:70
+#: ../doc/tip_of_the_day.list.in:71
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."
msgstr "Stilark påvirker den måde, rapporter fremstår. Vælg et stilark for din rapport som et rapportvalg og brug menuen Rediger -> Stilark for at ændre i stilarkene."
-#: ../doc/tip_of_the_day.list.in:74
+#: ../doc/tip_of_the_day.list.in:75
msgid "To raise the accounts menu in the transfer field of a register page, press the Menu key or the Ctrl-Down key combination."
msgstr ""
-#: ../doc/tip_of_the_day.list.in:77
+#: ../doc/tip_of_the_day.list.in:78
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"
"\n"
@@ -23298,15 +23398,17 @@ msgid ""
"To schedule a transaction every year you can choose the monthly basic frequency and then set 'Every 12 months'."
msgstr ""
-#: ../doc/tip_of_the_day.list.in:86
-msgid "If you work overnight, you should close and reopen your working register after midnight, to get the new date as default for new transactions. It is not necessary to restart GnuCash therefore."
+#: ../doc/tip_of_the_day.list.in:87
+#, fuzzy
+#| msgid "If you work overnight, you should close and reopen your working register after midnight, to get the new date as default for new transactions. It is not necessary to restart GnuCash therefore."
+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."
msgstr "Hvis du arbejder over natten, så bør du lukke og genåbne din arbejdsklasse efter midnat, så du får den nye dato som standard for nye transaktioner. Det er ikke nødvendigt at genstarte GnuCash for at opnå dette."
-#: ../doc/tip_of_the_day.list.in:90
+#: ../doc/tip_of_the_day.list.in:91
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"
msgstr "GnuCash udviklerne er nemme at komme i kontakt med. Udover flere postlister kan du sludre med dem direkte på IRC! Du finder dem på #gnucash på irc.gnome.org."
-#: ../doc/tip_of_the_day.list.in:94
+#: ../doc/tip_of_the_day.list.in:95
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 another theory that this has already happened.\n"
@@ -23318,6 +23420,33 @@ msgstr ""
"\n"
"Douglas Adams, »The Restaurant at the End of the Universe«"
-#: ../doc/tip_of_the_day.list.in:101
+#: ../doc/tip_of_the_day.list.in:102
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."
msgstr "For at søge igennem alle dine transaktioner, start en søgning (Rediger -> Søg ...) fra hovedkontoens hierarkiside. For at begrænse din søgning til en enkel konto, start søgningen fra den kontos kasseklade."
+
+#: ../doc/tip_of_the_day.list.in:106
+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."
+msgstr ""
+
+#~ msgid "Dummy message"
+#~ msgstr "Tom besked"
+
+#~ msgid "duedate"
+#~ msgstr "forfaldsdato"
+
+#~ msgid "question"
+#~ msgstr "spørgsmål"
+
+#~ msgid "(USD)"
+#~ msgstr "(USD)"
+
+#~ msgid "set true"
+#~ msgstr "sæt sand (true)"
+
+#, fuzzy
+#~ msgid "Owner Name"
+#~ msgstr "Ejernavn "
+
+#, fuzzy
+#~ msgid "Owner ID"
+#~ msgstr "Ordre-id"
diff --git a/po/sr.po b/po/sr.po
index a075111..7b8e0b1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -4,18 +4,18 @@
# МироÑлав Ðиколић <miroslavnikolic at rocketmail.com>, 2015—2016.
msgid ""
msgstr ""
-"Project-Id-Version: gnucash-2.6.13\n"
+"Project-Id-Version: gnucash-2.6.14\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-27 21:50-0700\n"
-"PO-Revision-Date: 2016-08-07 19:55+0200\n"
+"POT-Creation-Date: 2016-09-16 11:33-0700\n"
+"PO-Revision-Date: 2016-12-04 14:10+0200\n"
"Last-Translator: МироÑлав Ðиколић <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
"Language: sr\n"
-"X-Bugs: Report translation errors to the Language-Team address.\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<10 || n%100>=20) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
#. Business options
#: ../src/app-utils/app-utils.scm:303
@@ -683,7 +683,7 @@ msgstr "Отварам Ñалда"
msgid "Retained Earnings"
msgstr "Задржане зараде"
-#: ../src/app-utils/gnc-ui-util.c:743 ../src/engine/Account.c:3951
+#: ../src/app-utils/gnc-ui-util.c:743 ../src/engine/Account.c:3990
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2959
#: ../src/import-export/qif-imp/qif-dialog-utils.scm:71
#: ../src/import-export/qif-imp/qif-dialog-utils.scm:75
@@ -702,7 +702,7 @@ msgstr "Почетно Ñтање"
#: ../src/app-utils/guile-util.c:906
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:8
#: ../src/gnome/gnc-plugin-page-register2.c:2466
-#: ../src/gnome/gnc-plugin-page-register.c:2631
+#: ../src/gnome/gnc-plugin-page-register.c:2674
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3199
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3204
#: ../src/register/ledger-core/split-register.c:2367
@@ -716,7 +716,7 @@ msgstr "Дуг"
#: ../src/app-utils/guile-util.c:937
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:9
#: ../src/gnome/gnc-plugin-page-register2.c:2463
-#: ../src/gnome/gnc-plugin-page-register.c:2627
+#: ../src/gnome/gnc-plugin-page-register.c:2670
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2898
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2917
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2935
@@ -854,7 +854,7 @@ msgstr "Куповина"
msgid "Charge"
msgstr "Ðапуњено"
-#: ../src/app-utils/prefs.scm:73 ../src/engine/Account.c:3950
+#: ../src/app-utils/prefs.scm:73 ../src/engine/Account.c:3989
#: ../src/engine/gncInvoice.c:973
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3161
#: ../src/report/business-reports/customer-summary.scm:462
@@ -869,7 +869,7 @@ msgstr "РаÑход"
#. page / name / orderkey / tooltip / default
#: ../src/app-utils/prefs.scm:75
#: ../src/business/business-gnome/business-gnome-utils.c:225
-#: ../src/business/business-gnome/dialog-invoice.c:3240
+#: ../src/business/business-gnome/dialog-invoice.c:3245
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:383
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:1
#: ../src/engine/gncInvoice.c:969 ../src/gnome-search/dialog-search.c:1069
@@ -930,7 +930,7 @@ msgstr "Трошак"
msgid "Sell"
msgstr "Продаја"
-#: ../src/app-utils/prefs.scm:89 ../src/engine/Account.c:3949
+#: ../src/app-utils/prefs.scm:89 ../src/engine/Account.c:3988
#: ../src/engine/Scrub.c:393 ../src/gnome/gnc-budget-view.c:388
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2975
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3076
@@ -962,7 +962,7 @@ msgstr "Рабат"
#: ../src/business/business-gnome/dialog-invoice.c:2371
#: ../src/business/business-gnome/dialog-invoice.c:2546
#: ../src/business/business-gnome/dialog-invoice.c:2547
-#: ../src/business/business-gnome/dialog-invoice.c:3228
+#: ../src/business/business-gnome/dialog-invoice.c:3233
#: ../src/engine/gncInvoice.c:971 ../src/gnome-search/dialog-search.c:1053
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3098
#: ../src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade.h:3
@@ -1321,10 +1321,10 @@ msgstr "Фактуре потрошача"
#: ../src/business/business-gnome/dialog-customer.c:907
#: ../src/business/business-gnome/dialog-employee.c:712
-#: ../src/business/business-gnome/dialog-invoice.c:2994
-#: ../src/business/business-gnome/dialog-invoice.c:3003
-#: ../src/business/business-gnome/dialog-invoice.c:3014
-#: ../src/business/business-gnome/dialog-invoice.c:3267
+#: ../src/business/business-gnome/dialog-invoice.c:2999
+#: ../src/business/business-gnome/dialog-invoice.c:3008
+#: ../src/business/business-gnome/dialog-invoice.c:3019
+#: ../src/business/business-gnome/dialog-invoice.c:3272
#: ../src/business/business-gnome/dialog-job.c:549
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:1
msgid "Process Payment"
@@ -1350,8 +1350,8 @@ msgstr "Контакт"
#. FALL THROUGH
#: ../src/business/business-gnome/dialog-customer.c:932
-#: ../src/business/business-gnome/dialog-invoice.c:3139
-#: ../src/business/business-gnome/dialog-invoice.c:3280
+#: ../src/business/business-gnome/dialog-invoice.c:3144
+#: ../src/business/business-gnome/dialog-invoice.c:3285
#: ../src/business/business-gnome/dialog-job.c:575
#: ../src/business/business-gnome/dialog-order.c:885
#: ../src/business/business-gnome/dialog-vendor.c:735
@@ -1419,7 +1419,7 @@ msgid "Employee Username"
msgstr "КориÑничко име Ñлужбеника"
#: ../src/business/business-gnome/dialog-employee.c:725
-#: ../src/business/business-gnome/dialog-invoice.c:3119
+#: ../src/business/business-gnome/dialog-invoice.c:3124
#: ../src/gnome-utils/gnc-tree-view-owner.c:392
msgid "Employee Name"
msgstr "Име Ñлужбеника"
@@ -1430,7 +1430,7 @@ msgid "Username"
msgstr "КориÑник"
#: ../src/business/business-gnome/dialog-employee.c:736
-#: ../src/gnome/dialog-sx-editor2.c:1757 ../src/gnome/dialog-sx-editor.c:1792
+#: ../src/gnome/dialog-sx-editor2.c:1762 ../src/gnome/dialog-sx-editor.c:1798
#: ../src/gnome/dialog-tax-info.c:1153 ../src/gnome-utils/gnc-dense-cal.c:337
#: ../src/gnome-utils/gnc-tree-model-budget.c:96
#: ../src/gnome-utils/gnc-tree-view-commodity.c:396
@@ -1464,9 +1464,9 @@ msgid "This entry is attached to an order and will be deleted from that as well!
msgstr "Овај ÑƒÐ½Ð¾Ñ Ñ˜Ðµ приложен уз наруџбину и биће такође обриÑан из ње!"
#: ../src/business/business-gnome/dialog-invoice.c:692
-#: ../src/business/business-gnome/dialog-invoice.c:3048
-#: ../src/business/business-gnome/dialog-invoice.c:3082
-#: ../src/business/business-gnome/dialog-invoice.c:3116
+#: ../src/business/business-gnome/dialog-invoice.c:3053
+#: ../src/business/business-gnome/dialog-invoice.c:3087
+#: ../src/business/business-gnome/dialog-invoice.c:3121
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2836
#: ../src/register/ledger-core/split-register-model.c:231
#: ../src/report/business-reports/aging.scm:406
@@ -1617,7 +1617,7 @@ msgstr "Подаци рачуна"
#: ../src/business/business-gnome/dialog-invoice.c:2372
#: ../src/business/business-gnome/dialog-invoice.c:2548
-#: ../src/business/business-gnome/dialog-invoice.c:3089
+#: ../src/business/business-gnome/dialog-invoice.c:3094
msgid "Bill ID"
msgstr "ИБ рачуна"
@@ -1628,78 +1628,78 @@ msgstr "Подаци о ваучеру"
#: ../src/business/business-gnome/dialog-invoice.c:2377
#: ../src/business/business-gnome/dialog-invoice.c:2555
-#: ../src/business/business-gnome/dialog-invoice.c:3123
+#: ../src/business/business-gnome/dialog-invoice.c:3128
msgid "Voucher ID"
msgstr "ИБ ваучера"
-#: ../src/business/business-gnome/dialog-invoice.c:2868
+#: ../src/business/business-gnome/dialog-invoice.c:2873
msgid "Date of duplicated entries"
msgstr "Датум удвоÑтручених уноÑа"
-#: ../src/business/business-gnome/dialog-invoice.c:2923
+#: ../src/business/business-gnome/dialog-invoice.c:2928
msgid ""
"One or more selected invoices have already been posted.\n"
-"Re-check you selection."
+"Re-check your selection."
msgstr ""
"Једна или неколико изабраних фактура је већ објављено.\n"
"Проверите ваш избор."
-#: ../src/business/business-gnome/dialog-invoice.c:2927
+#: ../src/business/business-gnome/dialog-invoice.c:2932
msgid "Do you really want to post these invoices?"
msgstr "Да ли Ñтварно желите да објавите ове фактуре?"
-#: ../src/business/business-gnome/dialog-invoice.c:2993
+#: ../src/business/business-gnome/dialog-invoice.c:2998
msgid "View/Edit Invoice"
msgstr "Прегледај/уреди фактуру"
-#: ../src/business/business-gnome/dialog-invoice.c:2995
-#: ../src/business/business-gnome/dialog-invoice.c:3004
-#: ../src/business/business-gnome/dialog-invoice.c:3015
+#: ../src/business/business-gnome/dialog-invoice.c:3000
+#: ../src/business/business-gnome/dialog-invoice.c:3009
+#: ../src/business/business-gnome/dialog-invoice.c:3020
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:261
#: ../src/gnome/gnc-plugin-page-register2.c:480
-#: ../src/gnome/gnc-plugin-page-register.c:483
+#: ../src/gnome/gnc-plugin-page-register.c:485
msgid "Duplicate"
msgstr "УдвоÑтручи"
-#: ../src/business/business-gnome/dialog-invoice.c:2996
-#: ../src/business/business-gnome/dialog-invoice.c:3005
-#: ../src/business/business-gnome/dialog-invoice.c:3016
+#: ../src/business/business-gnome/dialog-invoice.c:3001
+#: ../src/business/business-gnome/dialog-invoice.c:3010
+#: ../src/business/business-gnome/dialog-invoice.c:3021
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:265
msgid "Post"
msgstr "Објави"
-#: ../src/business/business-gnome/dialog-invoice.c:2997
-#: ../src/business/business-gnome/dialog-invoice.c:3006
-#: ../src/business/business-gnome/dialog-invoice.c:3017
+#: ../src/business/business-gnome/dialog-invoice.c:3002
+#: ../src/business/business-gnome/dialog-invoice.c:3011
+#: ../src/business/business-gnome/dialog-invoice.c:3022
msgid "Printable Report"
msgstr "Извештај за штампање"
-#: ../src/business/business-gnome/dialog-invoice.c:3002
-#: ../src/business/business-gnome/dialog-invoice.c:3266
+#: ../src/business/business-gnome/dialog-invoice.c:3007
+#: ../src/business/business-gnome/dialog-invoice.c:3271
msgid "View/Edit Bill"
msgstr "Прегледај/уреди рачун"
#. Translators: The terms 'Voucher' and 'Expense Voucher' are used
#. interchangeably in gnucash and mean the same thing.
-#: ../src/business/business-gnome/dialog-invoice.c:3013
+#: ../src/business/business-gnome/dialog-invoice.c:3018
msgid "View/Edit Voucher"
msgstr "Прегледај/уреди ваучер"
-#: ../src/business/business-gnome/dialog-invoice.c:3027
+#: ../src/business/business-gnome/dialog-invoice.c:3032
msgid "Invoice Owner"
msgstr "ВлаÑник фактуре"
-#: ../src/business/business-gnome/dialog-invoice.c:3030
+#: ../src/business/business-gnome/dialog-invoice.c:3035
#: ../src/report/business-reports/easy-invoice.scm:339
#: ../src/report/business-reports/fancy-invoice.scm:329
#: ../src/report/business-reports/invoice.scm:314
msgid "Invoice Notes"
msgstr "Белешке фактуре"
-#: ../src/business/business-gnome/dialog-invoice.c:3033
-#: ../src/business/business-gnome/dialog-invoice.c:3067
-#: ../src/business/business-gnome/dialog-invoice.c:3101
-#: ../src/business/business-gnome/dialog-invoice.c:3130
+#: ../src/business/business-gnome/dialog-invoice.c:3038
+#: ../src/business/business-gnome/dialog-invoice.c:3072
+#: ../src/business/business-gnome/dialog-invoice.c:3106
+#: ../src/business/business-gnome/dialog-invoice.c:3135
#: ../src/business/business-gnome/dialog-job.c:562
#: ../src/business/business-gnome/dialog-job.c:573
#: ../src/business/business-gnome/dialog-order.c:883
@@ -1712,15 +1712,15 @@ msgstr "Белешке фактуре"
msgid "Billing ID"
msgstr "ИБ обрачуна"
-#: ../src/business/business-gnome/dialog-invoice.c:3036
-#: ../src/business/business-gnome/dialog-invoice.c:3070
-#: ../src/business/business-gnome/dialog-invoice.c:3104
+#: ../src/business/business-gnome/dialog-invoice.c:3041
+#: ../src/business/business-gnome/dialog-invoice.c:3075
+#: ../src/business/business-gnome/dialog-invoice.c:3109
msgid "Is Paid?"
msgstr "Да ли је плаћен?"
-#: ../src/business/business-gnome/dialog-invoice.c:3039
-#: ../src/business/business-gnome/dialog-invoice.c:3073
-#: ../src/business/business-gnome/dialog-invoice.c:3107
+#: ../src/business/business-gnome/dialog-invoice.c:3044
+#: ../src/business/business-gnome/dialog-invoice.c:3078
+#: ../src/business/business-gnome/dialog-invoice.c:3112
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:5
#: ../src/gnome/dialog-find-transactions2.c:125
#: ../src/gnome/dialog-find-transactions.c:124
@@ -1728,48 +1728,48 @@ msgstr "Да ли је плаћен?"
msgid "Date Posted"
msgstr "Датум објаве"
-#: ../src/business/business-gnome/dialog-invoice.c:3042
-#: ../src/business/business-gnome/dialog-invoice.c:3076
-#: ../src/business/business-gnome/dialog-invoice.c:3110
+#: ../src/business/business-gnome/dialog-invoice.c:3047
+#: ../src/business/business-gnome/dialog-invoice.c:3081
+#: ../src/business/business-gnome/dialog-invoice.c:3115
msgid "Is Posted?"
msgstr "Да ли је објављен?"
-#: ../src/business/business-gnome/dialog-invoice.c:3045
-#: ../src/business/business-gnome/dialog-invoice.c:3079
-#: ../src/business/business-gnome/dialog-invoice.c:3113
+#: ../src/business/business-gnome/dialog-invoice.c:3050
+#: ../src/business/business-gnome/dialog-invoice.c:3084
+#: ../src/business/business-gnome/dialog-invoice.c:3118
#: ../src/business/business-gnome/dialog-order.c:872
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:4
#: ../src/business/business-gnome/gtkbuilder/dialog-order.glade.h:3
msgid "Date Opened"
msgstr "Датум отварања"
-#: ../src/business/business-gnome/dialog-invoice.c:3051
-#: ../src/business/business-gnome/dialog-invoice.c:3085
+#: ../src/business/business-gnome/dialog-invoice.c:3056
+#: ../src/business/business-gnome/dialog-invoice.c:3090
msgid "Company Name "
msgstr "Ðазив предузећа "
-#: ../src/business/business-gnome/dialog-invoice.c:3055
+#: ../src/business/business-gnome/dialog-invoice.c:3060
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:3
msgid "Invoice ID"
msgstr "ИБ фактуре"
-#: ../src/business/business-gnome/dialog-invoice.c:3061
+#: ../src/business/business-gnome/dialog-invoice.c:3066
msgid "Bill Owner"
msgstr "ВлаÑник рачуна"
-#: ../src/business/business-gnome/dialog-invoice.c:3064
+#: ../src/business/business-gnome/dialog-invoice.c:3069
msgid "Bill Notes"
msgstr "Белешке рачуна"
-#: ../src/business/business-gnome/dialog-invoice.c:3095
+#: ../src/business/business-gnome/dialog-invoice.c:3100
msgid "Voucher Owner"
msgstr "ВлаÑник ваучера"
-#: ../src/business/business-gnome/dialog-invoice.c:3098
+#: ../src/business/business-gnome/dialog-invoice.c:3103
msgid "Voucher Notes"
msgstr "Белешке ваучера"
-#: ../src/business/business-gnome/dialog-invoice.c:3132
+#: ../src/business/business-gnome/dialog-invoice.c:3137
#: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:2
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:7
#: ../src/gnome/dialog-lot-viewer.c:831 ../src/gnome/dialog-tax-info.c:1192
@@ -1778,7 +1778,7 @@ msgstr "Белешке ваучера"
#: ../src/gnome-utils/gnc-tree-view-price.c:448
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2972
#: ../src/import-export/csv-exp/csv-transactions-export.c:421
-#: ../src/register/ledger-core/split-register-model.c:346
+#: ../src/register/ledger-core/split-register-model.c:353
#: ../src/report/business-reports/customer-summary.scm:69
#: ../src/report/business-reports/job-report.scm:46
#: ../src/report/business-reports/owner-report.scm:53
@@ -1787,28 +1787,28 @@ msgstr "Белешке ваучера"
msgid "Type"
msgstr "Ð’Ñ€Ñта"
-#: ../src/business/business-gnome/dialog-invoice.c:3134
+#: ../src/business/business-gnome/dialog-invoice.c:3139
#: ../src/register/ledger-core/split-register-model.c:300
msgid "Paid"
msgstr "Плаћен"
-#: ../src/business/business-gnome/dialog-invoice.c:3137
+#: ../src/business/business-gnome/dialog-invoice.c:3142
msgid "Posted"
msgstr "Објављен"
-#: ../src/business/business-gnome/dialog-invoice.c:3142
-#: ../src/business/business-gnome/dialog-invoice.c:3282
+#: ../src/business/business-gnome/dialog-invoice.c:3147
+#: ../src/business/business-gnome/dialog-invoice.c:3287
#: ../src/report/business-reports/easy-invoice.scm:805
msgid "Due"
msgstr "ИÑтиче"
-#: ../src/business/business-gnome/dialog-invoice.c:3144
+#: ../src/business/business-gnome/dialog-invoice.c:3149
#: ../src/business/business-gnome/dialog-order.c:890
#: ../src/gnome/dialog-lot-viewer.c:837
msgid "Opened"
msgstr "Отворен"
-#: ../src/business/business-gnome/dialog-invoice.c:3146
+#: ../src/business/business-gnome/dialog-invoice.c:3151
#: ../src/business/business-gnome/dialog-order.c:892
#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:19
#: ../src/gnome/dialog-lot-viewer.c:914 ../src/gnome/reconcile-view.c:381
@@ -1827,15 +1827,15 @@ msgstr "Отворен"
msgid "Num"
msgstr "Број"
-#: ../src/business/business-gnome/dialog-invoice.c:3227
+#: ../src/business/business-gnome/dialog-invoice.c:3232
msgid "Find Bill"
msgstr "Ðађите рачуна"
-#: ../src/business/business-gnome/dialog-invoice.c:3233
+#: ../src/business/business-gnome/dialog-invoice.c:3238
msgid "Find Expense Voucher"
msgstr "Ðађите ваучер раÑхода"
-#: ../src/business/business-gnome/dialog-invoice.c:3234
+#: ../src/business/business-gnome/dialog-invoice.c:3239
#: ../src/gnome-search/dialog-search.c:1065
#: ../src/report/business-reports/easy-invoice.scm:712
#: ../src/report/business-reports/fancy-invoice.scm:811
@@ -1843,18 +1843,18 @@ msgstr "Ðађите ваучер раÑхода"
msgid "Expense Voucher"
msgstr "Ваучер раÑхода"
-#: ../src/business/business-gnome/dialog-invoice.c:3239
+#: ../src/business/business-gnome/dialog-invoice.c:3244
msgid "Find Invoice"
msgstr "Ðађите фактуру"
#. Translators: This abbreviation is the column heading for
#. the condition "Is this invoice a Credit Note?"
-#: ../src/business/business-gnome/dialog-invoice.c:3276
+#: ../src/business/business-gnome/dialog-invoice.c:3281
msgid "CN?"
msgstr "БК?"
#. note the "Amount" multichoice option here
-#: ../src/business/business-gnome/dialog-invoice.c:3278
+#: ../src/business/business-gnome/dialog-invoice.c:3283
#: ../src/gnome/dialog-lot-viewer.c:926 ../src/gnome/reconcile-view.c:373
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2992
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3004
@@ -1883,7 +1883,7 @@ msgstr "ИзноÑ"
#. Translators: %d is the number of bills due. This is a
#. ngettext(3) message.
-#: ../src/business/business-gnome/dialog-invoice.c:3332
+#: ../src/business/business-gnome/dialog-invoice.c:3337
#, c-format
msgid "The following bill is due:"
msgid_plural "The following %d bills are due:"
@@ -1891,7 +1891,7 @@ msgstr[0] "ДоÑпео је Ñледећи %d рачун:"
msgstr[1] "ДоÑпела Ñу Ñледећа %d рачуна:"
msgstr[2] "ДоÑпело је Ñледећих %d рачуна:"
-#: ../src/business/business-gnome/dialog-invoice.c:3337
+#: ../src/business/business-gnome/dialog-invoice.c:3342
msgid "Due Bills Reminder"
msgstr "ПодÑетник доÑпећа рачуна"
@@ -2334,7 +2334,7 @@ msgstr "Умножи"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:124
#: ../src/gnome/gnc-plugin-page-register2.c:236
-#: ../src/gnome/gnc-plugin-page-register.c:241
+#: ../src/gnome/gnc-plugin-page-register.c:243
#: ../src/gnome-utils/gnc-main-window.c:315
#: ../src/report/report-gnome/gnc-plugin-page-report.c:1029
msgid "_Paste"
@@ -2514,13 +2514,13 @@ msgstr "Поређајте према опиÑу"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:258
#: ../src/gnome/gnc-plugin-page-register2.c:477
-#: ../src/gnome/gnc-plugin-page-register.c:480
+#: ../src/gnome/gnc-plugin-page-register.c:482
msgid "Enter"
msgstr "УнеÑи"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:259
#: ../src/gnome/gnc-plugin-page-register2.c:478
-#: ../src/gnome/gnc-plugin-page-register.c:481
+#: ../src/gnome/gnc-plugin-page-register.c:483
#: ../src/gnome-utils/gnc-cell-renderer-date.c:158
msgid "Cancel"
msgstr "Откажи"
@@ -2529,7 +2529,7 @@ msgstr "Откажи"
#: ../src/gnome/gnc-plugin-page-account-tree.c:345
#: ../src/gnome/gnc-plugin-page-budget.c:177
#: ../src/gnome/gnc-plugin-page-register2.c:479
-#: ../src/gnome/gnc-plugin-page-register.c:482
+#: ../src/gnome/gnc-plugin-page-register.c:484
msgid "Delete"
msgstr "Обриши"
@@ -2545,7 +2545,7 @@ msgstr "Доле"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:264
#: ../src/gnome/gnc-plugin-page-register2.c:483
-#: ../src/gnome/gnc-plugin-page-register.c:486
+#: ../src/gnome/gnc-plugin-page-register.c:488
msgid "Blank"
msgstr "Обриши"
@@ -2601,7 +2601,7 @@ msgstr "Обришите изабраног влаÑника"
#: ../src/gnome/gnc-plugin-page-account-tree.c:231
#: ../src/gnome/gnc-plugin-page-budget.c:157
#: ../src/gnome/gnc-plugin-page-register2.c:319
-#: ../src/gnome/gnc-plugin-page-register.c:333
+#: ../src/gnome/gnc-plugin-page-register.c:335
#: ../src/gnome-utils/gnc-main-window.c:332
msgid "_Filter By..."
msgstr "_Издвој према..."
@@ -3197,7 +3197,7 @@ msgstr "ÐдреÑа обрачуна"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2914
#: ../src/import-export/csv-exp/csv-transactions-export.c:419
#: ../src/import-export/csv-imp/gnc-csv-model.c:74
-#: ../src/register/ledger-core/split-register-model.c:468
+#: ../src/register/ledger-core/split-register-model.c:475
#: ../src/report/business-reports/balsheet-eg.scm:301
#: ../src/report/business-reports/taxinvoice.scm:91
#: ../src/report/standard-reports/account-summary.scm:483
@@ -3529,7 +3529,7 @@ msgstr "Датум"
#: ../src/gnome/dialog-find-transactions.c:133
#: ../src/gnome/dialog-find-transactions.c:168
#: ../src/gnome/dialog-find-transactions.c:176
-#: ../src/gnome/gnc-plugin-page-register.c:1838
+#: ../src/gnome/gnc-plugin-page-register.c:1886
#: ../src/gnome-search/dialog-search.c:894
#: ../src/gnome-search/dialog-search.c:902
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2865
@@ -3577,7 +3577,7 @@ msgstr "Повраћај"
#: ../src/import-export/import-main-matcher.c:466
#: ../src/import-export/import-match-picker.c:347
#: ../src/import-export/import-match-picker.c:387
-#: ../src/register/ledger-core/split-register-model.c:339
+#: ../src/register/ledger-core/split-register-model.c:346
#: ../src/report/standard-reports/general-ledger.scm:81
#: ../src/report/standard-reports/general-ledger.scm:101
#: ../src/report/standard-reports/register.scm:150
@@ -3643,13 +3643,11 @@ msgid "You have not selected an owner"
msgstr "ÐиÑте изабрали влаÑника"
#: ../src/business/business-gnome/search-owner.c:258
-#: ../src/gnome-search/search-boolean.c:181
#: ../src/gnome-search/search-reconciled.c:189
msgid "is"
msgstr "је"
#: ../src/business/business-gnome/search-owner.c:259
-#: ../src/gnome-search/search-boolean.c:182
#: ../src/gnome-search/search-reconciled.c:190
msgid "is not"
msgstr "није"
@@ -3732,8 +3730,8 @@ msgid "sample:X"
msgstr "узорак:Х"
#: ../src/business/business-ledger/gncEntryLedgerLayout.c:80
-#: ../src/register/ledger-core/split-register-layout.c:618
-#: ../src/register/ledger-core/split-register-layout.c:626
+#: ../src/register/ledger-core/split-register-layout.c:637
+#: ../src/register/ledger-core/split-register-layout.c:645
msgid "sample:12/12/2000"
msgstr "пример:12.12.2000."
@@ -3765,8 +3763,8 @@ msgstr "sample(DH):+%"
#: ../src/business/business-ledger/gncEntryLedgerLayout.c:116
#: ../src/business/business-ledger/gncEntryLedgerLayout.c:121
-#: ../src/register/ledger-core/split-register-layout.c:695
-#: ../src/register/ledger-core/split-register-layout.c:703
+#: ../src/register/ledger-core/split-register-layout.c:722
+#: ../src/register/ledger-core/split-register-layout.c:730
msgid "sample:Expenses:Automobile:Gasoline"
msgstr "РаÑходи:Ðутомобил:Бензин"
@@ -3800,7 +3798,7 @@ msgstr "$"
#. oli-custom - make a string instead of a table
#: ../src/business/business-ledger/gncEntryLedgerLoad.c:57
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:14
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:15
#: ../src/report/business-reports/easy-invoice.scm:151
#: ../src/report/business-reports/fancy-invoice.scm:163
#: ../src/report/business-reports/invoice.scm:146
@@ -3823,7 +3821,7 @@ msgstr ">"
#: ../src/business/business-ledger/gncEntryLedgerLoad.c:132
#: ../src/business/business-ledger/gncEntryLedgerModel.c:530
#: ../src/business/business-ledger/gncEntryLedgerModel.c:1128
-#: ../src/engine/Account.c:3942
+#: ../src/engine/Account.c:3981
#: ../src/report/report-system/report-utilities.scm:110
msgid "Cash"
msgstr "Готовина"
@@ -3843,7 +3841,7 @@ msgstr "Ðалог раÑхода"
#: ../src/gnome/dialog-find-transactions.c:129
#: ../src/gnome/dialog-find-transactions.c:166
#: ../src/gnome/dialog-find-transactions.c:174
-#: ../src/gnome/gnc-plugin-page-register.c:1839
+#: ../src/gnome/gnc-plugin-page-register.c:1887
#: ../src/gnome-search/dialog-search.c:892
#: ../src/gnome-search/dialog-search.c:900
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2849
@@ -3937,7 +3935,7 @@ msgstr "УнеÑите врÑту уноÑа"
#: ../src/business/business-ledger/gncEntryLedgerModel.c:585
#: ../src/gnome-utils/gnc-tree-util-split-reg.c:460
-#: ../src/register/ledger-core/split-register-model.c:889
+#: ../src/register/ledger-core/split-register-model.c:945
msgid "%A %d %B %Y"
msgstr "%A, %d. %B %Y."
@@ -4124,7 +4122,7 @@ msgstr ""
" %s\n"
"За кориÑника морају бити барем „rwx“.\n"
-#: ../src/engine/Account.c:168
+#: ../src/engine/Account.c:169
#, c-format
msgid ""
"The separator character \"%s\" is used in one or more account names.\n"
@@ -4141,50 +4139,50 @@ msgstr ""
"ИÑпод ћете наћи ÑпиÑак неиÑправних назива налога:\n"
"%s"
-#: ../src/engine/Account.c:3941 ../src/import-export/aqb/gnc-ab-utils.c:460
+#: ../src/engine/Account.c:3980 ../src/import-export/aqb/gnc-ab-utils.c:460
#: ../src/report/report-system/report-utilities.scm:109
msgid "Bank"
msgstr "Банка"
-#: ../src/engine/Account.c:3943
+#: ../src/engine/Account.c:3982
msgid "Asset"
msgstr "Добро"
-#: ../src/engine/Account.c:3944
+#: ../src/engine/Account.c:3983
msgid "Credit Card"
msgstr "Кредитна картица"
-#: ../src/engine/Account.c:3945
+#: ../src/engine/Account.c:3984
msgid "Liability"
msgstr "ОдговорноÑÑ‚"
-#: ../src/engine/Account.c:3946
+#: ../src/engine/Account.c:3985
msgid "Stock"
msgstr "Деоница"
-#: ../src/engine/Account.c:3947
+#: ../src/engine/Account.c:3986
msgid "Mutual Fund"
msgstr "Узајамни фонд"
-#: ../src/engine/Account.c:3948 ../src/gnome-utils/dialog-commodity.c:817
+#: ../src/engine/Account.c:3987 ../src/gnome-utils/dialog-commodity.c:817
#: ../src/gnome-utils/gnc-tree-view-owner.c:440
#: ../src/gnome-utils/gnc-tree-view-price.c:430
msgid "Currency"
msgstr "Валута"
-#: ../src/engine/Account.c:3952
+#: ../src/engine/Account.c:3991
msgid "A/Receivable"
msgstr "За пријем"
-#: ../src/engine/Account.c:3953
+#: ../src/engine/Account.c:3992
msgid "A/Payable"
msgstr "За иÑплату"
-#: ../src/engine/Account.c:3954
+#: ../src/engine/Account.c:3993
msgid "Root"
msgstr "Корен"
-#: ../src/engine/Account.c:3955 ../src/engine/Scrub.c:401
+#: ../src/engine/Account.c:3994 ../src/engine/Scrub.c:401
#: ../src/engine/Scrub.c:466
#: ../src/report/standard-reports/income-statement.scm:621
msgid "Trading"
@@ -4363,12 +4361,12 @@ msgstr "-- Подели транÑакцију --"
msgid "Displayed account code of the other account in a multi-split transaction|Split"
msgstr "Приказана шифра налога другог налога у вишеподелној транÑакцији|Подели"
-#: ../src/engine/Transaction.c:2506
+#: ../src/engine/Transaction.c:2503
msgid "Voided transaction"
msgstr "Поништена транÑакција"
#. Dirtying taken care of by SetReadOnly
-#: ../src/engine/Transaction.c:2517
+#: ../src/engine/Transaction.c:2514
msgid "Transaction Voided"
msgstr "ТранÑакција је поништена"
@@ -4587,7 +4585,7 @@ msgstr "Грешка додавања цене."
#: ../src/import-export/import-main-matcher.c:462
#: ../src/import-export/import-match-picker.c:343
#: ../src/import-export/qif-imp/dialog-account-picker.c:369
-#: ../src/register/ledger-core/split-register-model.c:325
+#: ../src/register/ledger-core/split-register-model.c:332
#: ../src/report/business-reports/job-report.scm:39
#: ../src/report/business-reports/owner-report.scm:48
#: ../src/report/standard-reports/advanced-portfolio.scm:1042
@@ -4612,7 +4610,7 @@ msgstr "Симбол"
#: ../src/gnome/assistant-stock-split.c:582
#: ../src/gnome/dialog-find-transactions2.c:121
#: ../src/gnome/dialog-find-transactions.c:120
-#: ../src/register/ledger-core/split-register-model.c:396
+#: ../src/register/ledger-core/split-register-model.c:403
#: ../src/report/standard-reports/advanced-portfolio.scm:1062
#: ../src/report/standard-reports/general-journal.scm:113
#: ../src/report/standard-reports/general-ledger.scm:88
@@ -4688,7 +4686,7 @@ msgstr "Завршни уноÑи"
#: ../src/gnome/dialog-find-transactions2.c:117
#: ../src/gnome/dialog-find-transactions.c:116
#: ../src/gnome/gnc-plugin-page-register2.c:484
-#: ../src/gnome/gnc-plugin-page-register.c:487
+#: ../src/gnome/gnc-plugin-page-register.c:489
#: ../src/gnome/window-reconcile2.c:1315 ../src/gnome/window-reconcile.c:1352
#: ../src/import-export/csv-exp/csv-transactions-export.c:423
msgid "Reconcile"
@@ -4718,8 +4716,8 @@ msgstr "ВредноÑÑ‚"
#: ../src/gnome/dialog-find-transactions.c:128
#: ../src/gnome/dialog-find-transactions.c:167
#: ../src/gnome/dialog-find-transactions.c:173
-#: ../src/gnome/gnc-plugin-page-register.c:1834
-#: ../src/gnome/gnc-plugin-page-register.c:3112
+#: ../src/gnome/gnc-plugin-page-register.c:1882
+#: ../src/gnome/gnc-plugin-page-register.c:3156
#: ../src/gnome-search/dialog-search.c:893
#: ../src/gnome-search/dialog-search.c:899
#: ../src/import-export/csv-exp/csv-transactions-export.c:422
@@ -4733,8 +4731,8 @@ msgstr "Број/радња"
#: ../src/gnome/dialog-find-transactions.c:132
#: ../src/gnome/dialog-find-transactions.c:169
#: ../src/gnome/dialog-find-transactions.c:175
-#: ../src/gnome/gnc-plugin-page-register.c:1833
-#: ../src/gnome/gnc-plugin-page-register.c:3111
+#: ../src/gnome/gnc-plugin-page-register.c:1881
+#: ../src/gnome/gnc-plugin-page-register.c:3155
#: ../src/gnome-search/dialog-search.c:895
#: ../src/gnome-search/dialog-search.c:901
#: ../src/import-export/csv-exp/csv-transactions-export.c:418
@@ -4776,7 +4774,7 @@ msgstr "ÐаÑлов"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3212
#: ../src/import-export/csv-imp/gnc-csv-model.c:78
#: ../src/register/ledger-core/split-register-model.c:311
-#: ../src/register/ledger-core/split-register-model.c:461
+#: ../src/register/ledger-core/split-register-model.c:468
#: ../src/report/business-reports/customer-summary.scm:184
#: ../src/report/business-reports/job-report.scm:221
#: ../src/report/business-reports/owner-report.scm:308
@@ -4863,7 +4861,7 @@ msgstr "кориÑник"
#: ../src/gnome/dialog-print-check.c:1589
#: ../src/gnome/dialog-print-check.c:2595
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:60
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:61
#: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:40
#: ../src/gnome-utils/gtkbuilder/gnc-date-format.glade.h:20
#: ../src/import-export/csv-exp/assistant-csv-export.glade.h:10
@@ -4974,7 +4972,7 @@ msgstr "(никад)"
msgid "The current template transaction has been changed. Would you like to record the changes?"
msgstr "Текући шаблон транÑакције је измењен. Да ли желите да Ñнимите измене?"
-#: ../src/gnome/dialog-sx-editor2.c:1784 ../src/gnome/dialog-sx-editor.c:1819
+#: ../src/gnome/dialog-sx-editor2.c:1789 ../src/gnome/dialog-sx-editor.c:1825
#: ../src/gnome/gnc-plugin-page-sx-list.c:243
#: ../src/gnome/gnc-plugin-page-sx-list.c:249
msgid "Scheduled Transactions"
@@ -5016,7 +5014,7 @@ msgstr "Подела Ñа белешком „%s“ има необрадиву
msgid "The Scheduled Transaction is unbalanced. You are strongly encouraged to correct this situation."
msgstr "Заказана транÑакција није Ñалдирана. Строго вам Ñе Ñаветује да поправите то Ñтање."
-#: ../src/gnome/dialog-sx-from-trans.c:781
+#: ../src/gnome/dialog-sx-from-trans.c:782
msgid "Cannot create a Scheduled Transaction from a Transaction currently being edited. Please Enter the Transaction before Scheduling."
msgstr "Ðе могу да направим заказану транÑакцију из транÑакције која Ñе управо уређује. УнеÑите транÑакцију пре заказивања."
@@ -5204,13 +5202,13 @@ msgstr "Извезите хијерархију налога у нову дат
#: ../src/gnome/gnc-plugin-basic-commands.c:141
#: ../src/gnome/gnc-plugin-page-register2.c:246
-#: ../src/gnome/gnc-plugin-page-register.c:251
+#: ../src/gnome/gnc-plugin-page-register.c:253
msgid "_Find..."
msgstr "_Ðађи..."
#: ../src/gnome/gnc-plugin-basic-commands.c:142
#: ../src/gnome/gnc-plugin-page-register2.c:247
-#: ../src/gnome/gnc-plugin-page-register.c:252
+#: ../src/gnome/gnc-plugin-page-register.c:254
msgid "Find transactions with a search"
msgstr "Пронађите транÑакције Ñа претрагом"
@@ -5415,13 +5413,13 @@ msgstr "Отворите изабрани налог региÑтра Ñтаро
#: ../src/gnome/gnc-plugin-page-account-tree.c:214
#: ../src/gnome/gnc-plugin-page-register2.c:241
-#: ../src/gnome/gnc-plugin-page-register.c:246
+#: ../src/gnome/gnc-plugin-page-register.c:248
msgid "Edit _Account"
msgstr "Уреди _налог"
#: ../src/gnome/gnc-plugin-page-account-tree.c:215
#: ../src/gnome/gnc-plugin-page-register2.c:242
-#: ../src/gnome/gnc-plugin-page-register.c:247
+#: ../src/gnome/gnc-plugin-page-register.c:249
msgid "Edit the selected account"
msgstr "Уредите изабрани налог"
@@ -5443,19 +5441,19 @@ msgstr "Измените бројеве Ñадржаних налога у ов
#: ../src/gnome/gnc-plugin-page-account-tree.c:237
#: ../src/gnome/gnc-plugin-page-register2.c:336
-#: ../src/gnome/gnc-plugin-page-register.c:345
+#: ../src/gnome/gnc-plugin-page-register.c:347
msgid "_Reconcile..."
msgstr "_Измири..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:238
#: ../src/gnome/gnc-plugin-page-register2.c:337
-#: ../src/gnome/gnc-plugin-page-register.c:346
+#: ../src/gnome/gnc-plugin-page-register.c:348
msgid "Reconcile the selected account"
msgstr "Измирите изабрани налог"
#: ../src/gnome/gnc-plugin-page-account-tree.c:242
#: ../src/gnome/gnc-plugin-page-register2.c:341
-#: ../src/gnome/gnc-plugin-page-register.c:350
+#: ../src/gnome/gnc-plugin-page-register.c:352
msgid "_Auto-clear..."
msgstr "_Сам очиÑти..."
@@ -5465,7 +5463,7 @@ msgstr "СамоÑтално очиÑтите појединачне транÑ
#: ../src/gnome/gnc-plugin-page-account-tree.c:247
#: ../src/gnome/gnc-plugin-page-register2.c:331
-#: ../src/gnome/gnc-plugin-page-register.c:340
+#: ../src/gnome/gnc-plugin-page-register.c:342
#: ../src/gnome-utils/gnc-icons.c:43 ../src/gnome/window-reconcile2.c:2184
#: ../src/gnome/window-reconcile.c:2224
msgid "_Transfer..."
@@ -5473,32 +5471,32 @@ msgstr "_ПренеÑи..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:248
#: ../src/gnome/gnc-plugin-page-register2.c:332
-#: ../src/gnome/gnc-plugin-page-register.c:341
+#: ../src/gnome/gnc-plugin-page-register.c:343
#: ../src/gnome/window-reconcile2.c:2185 ../src/gnome/window-reconcile.c:2225
msgid "Transfer funds from one account to another"
msgstr "ПренеÑите фондове из једног налога у други"
#: ../src/gnome/gnc-plugin-page-account-tree.c:252
#: ../src/gnome/gnc-plugin-page-register2.c:346
-#: ../src/gnome/gnc-plugin-page-register.c:355
+#: ../src/gnome/gnc-plugin-page-register.c:357
msgid "Stoc_k Split..."
msgstr "Подели _деоницу..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:253
#: ../src/gnome/gnc-plugin-page-register2.c:347
-#: ../src/gnome/gnc-plugin-page-register.c:356
+#: ../src/gnome/gnc-plugin-page-register.c:358
msgid "Record a stock split or a stock merger"
msgstr "Забележите поделу деонице или здруживање деонице"
#: ../src/gnome/gnc-plugin-page-account-tree.c:257
#: ../src/gnome/gnc-plugin-page-register2.c:351
-#: ../src/gnome/gnc-plugin-page-register.c:360
+#: ../src/gnome/gnc-plugin-page-register.c:362
msgid "View _Lots..."
msgstr "Прегледај _артикле..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:258
#: ../src/gnome/gnc-plugin-page-register2.c:352
-#: ../src/gnome/gnc-plugin-page-register.c:361
+#: ../src/gnome/gnc-plugin-page-register.c:363
msgid "Bring up the lot viewer/editor window"
msgstr "Прикажите прозор прегледача/уређивача артикала"
@@ -5684,144 +5682,144 @@ msgstr "Морате изабрати барем један налог за пр
#. Actions
#. **********************************************************
#: ../src/gnome/gnc-plugin-page-register2.c:190
-#: ../src/gnome/gnc-plugin-page-register.c:192
+#: ../src/gnome/gnc-plugin-page-register.c:194
msgid "Cu_t Transaction"
msgstr "_ИÑеци транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:191
-#: ../src/gnome/gnc-plugin-page-register.c:193
+#: ../src/gnome/gnc-plugin-page-register.c:195
msgid "_Copy Transaction"
msgstr "У_множи транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:192
-#: ../src/gnome/gnc-plugin-page-register.c:194
+#: ../src/gnome/gnc-plugin-page-register.c:196
msgid "_Paste Transaction"
msgstr "У_баци транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:193
-#: ../src/gnome/gnc-plugin-page-register.c:195
+#: ../src/gnome/gnc-plugin-page-register.c:197
msgid "Dup_licate Transaction"
msgstr "У_двоÑтручи транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:194
-#: ../src/gnome/gnc-plugin-page-register.c:196
+#: ../src/gnome/gnc-plugin-page-register.c:198
#: ../src/gnome/gnc-split-reg.c:1335
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1065
msgid "_Delete Transaction"
msgstr "_Обриши транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:195
-#: ../src/gnome/gnc-plugin-page-register.c:200
+#: ../src/gnome/gnc-plugin-page-register.c:202
msgid "Cu_t Split"
msgstr "_ИÑеци поделу"
#: ../src/gnome/gnc-plugin-page-register2.c:196
-#: ../src/gnome/gnc-plugin-page-register.c:201
+#: ../src/gnome/gnc-plugin-page-register.c:203
msgid "_Copy Split"
msgstr "У_множи поделу"
#: ../src/gnome/gnc-plugin-page-register2.c:197
-#: ../src/gnome/gnc-plugin-page-register.c:202
+#: ../src/gnome/gnc-plugin-page-register.c:204
msgid "_Paste Split"
msgstr "У_баци поделу"
#: ../src/gnome/gnc-plugin-page-register2.c:198
-#: ../src/gnome/gnc-plugin-page-register.c:203
+#: ../src/gnome/gnc-plugin-page-register.c:205
msgid "Dup_licate Split"
msgstr "_УдвоÑтручи поделу"
#: ../src/gnome/gnc-plugin-page-register2.c:199
-#: ../src/gnome/gnc-plugin-page-register.c:204
+#: ../src/gnome/gnc-plugin-page-register.c:206
#: ../src/gnome/gnc-split-reg.c:1295
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1025
msgid "_Delete Split"
msgstr "_Обриши поделу"
#: ../src/gnome/gnc-plugin-page-register2.c:200
-#: ../src/gnome/gnc-plugin-page-register.c:205
+#: ../src/gnome/gnc-plugin-page-register.c:207
msgid "Cut the selected transaction into clipboard"
msgstr "ИÑеците изабрану транÑакцију у оÑтаву"
#: ../src/gnome/gnc-plugin-page-register2.c:201
-#: ../src/gnome/gnc-plugin-page-register.c:206
+#: ../src/gnome/gnc-plugin-page-register.c:208
msgid "Copy the selected transaction into clipboard"
msgstr "Умножите изабрану транÑакцију у оÑтаву"
#: ../src/gnome/gnc-plugin-page-register2.c:202
-#: ../src/gnome/gnc-plugin-page-register.c:207
+#: ../src/gnome/gnc-plugin-page-register.c:209
msgid "Paste the transaction from the clipboard"
msgstr "Убаците транÑакцију из оÑтаве"
#: ../src/gnome/gnc-plugin-page-register2.c:203
-#: ../src/gnome/gnc-plugin-page-register.c:208
+#: ../src/gnome/gnc-plugin-page-register.c:210
msgid "Make a copy of the current transaction"
msgstr "Ðаправите умножак текуће транÑакције"
#: ../src/gnome/gnc-plugin-page-register2.c:204
-#: ../src/gnome/gnc-plugin-page-register.c:209
+#: ../src/gnome/gnc-plugin-page-register.c:211
msgid "Delete the current transaction"
msgstr "Обришите текућу транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:205
-#: ../src/gnome/gnc-plugin-page-register.c:213
+#: ../src/gnome/gnc-plugin-page-register.c:215
msgid "Cut the selected split into clipboard"
msgstr "ИÑеците изабрану поделу у оÑтаву"
#: ../src/gnome/gnc-plugin-page-register2.c:206
-#: ../src/gnome/gnc-plugin-page-register.c:214
+#: ../src/gnome/gnc-plugin-page-register.c:216
msgid "Copy the selected split into clipboard"
msgstr "Умножите изабрану поделу у оÑтаву"
#: ../src/gnome/gnc-plugin-page-register2.c:207
-#: ../src/gnome/gnc-plugin-page-register.c:215
+#: ../src/gnome/gnc-plugin-page-register.c:217
msgid "Paste the split from the clipboard"
msgstr "Убаците поделу из оÑтаве"
#: ../src/gnome/gnc-plugin-page-register2.c:208
-#: ../src/gnome/gnc-plugin-page-register.c:216
+#: ../src/gnome/gnc-plugin-page-register.c:218
msgid "Make a copy of the current split"
msgstr "Ðаправите умножак текуће поделе"
#: ../src/gnome/gnc-plugin-page-register2.c:209
-#: ../src/gnome/gnc-plugin-page-register.c:217
+#: ../src/gnome/gnc-plugin-page-register.c:219
msgid "Delete the current split"
msgstr "Обришите текућу поделу"
#: ../src/gnome/gnc-plugin-page-register2.c:219
-#: ../src/gnome/gnc-plugin-page-register.c:224
+#: ../src/gnome/gnc-plugin-page-register.c:226
msgid "_Print Checks..."
msgstr "_Штампај чекове..."
#: ../src/gnome/gnc-plugin-page-register2.c:226
-#: ../src/gnome/gnc-plugin-page-register.c:231
+#: ../src/gnome/gnc-plugin-page-register.c:233
#: ../src/gnome-utils/gnc-main-window.c:305
#: ../src/report/report-gnome/gnc-plugin-page-report.c:1019
msgid "Cu_t"
msgstr "_ИÑеци"
#: ../src/gnome/gnc-plugin-page-register2.c:227
-#: ../src/gnome/gnc-plugin-page-register.c:232
+#: ../src/gnome/gnc-plugin-page-register.c:234
#: ../src/gnome-utils/gnc-main-window.c:306
#: ../src/report/report-gnome/gnc-plugin-page-report.c:1020
msgid "Cut the current selection and copy it to clipboard"
msgstr "ИÑеците текући избор и умножите га у оÑтаву"
#: ../src/gnome/gnc-plugin-page-register2.c:231
-#: ../src/gnome/gnc-plugin-page-register.c:236
+#: ../src/gnome/gnc-plugin-page-register.c:238
#: ../src/gnome-utils/gnc-main-window.c:310
#: ../src/report/report-gnome/gnc-plugin-page-report.c:1024
msgid "_Copy"
msgstr "_Умножи"
#: ../src/gnome/gnc-plugin-page-register2.c:232
-#: ../src/gnome/gnc-plugin-page-register.c:237
+#: ../src/gnome/gnc-plugin-page-register.c:239
#: ../src/gnome-utils/gnc-main-window.c:311
#: ../src/report/report-gnome/gnc-plugin-page-report.c:1025
msgid "Copy the current selection to clipboard"
msgstr "Умножите текући избор у оÑтаву"
#: ../src/gnome/gnc-plugin-page-register2.c:237
-#: ../src/gnome/gnc-plugin-page-register.c:242
+#: ../src/gnome/gnc-plugin-page-register.c:244
#: ../src/gnome-utils/gnc-main-window.c:316
#: ../src/report/report-gnome/gnc-plugin-page-report.c:1030
msgid "Paste the clipboard content at the cursor position"
@@ -5832,42 +5830,42 @@ msgid "Remo_ve All Splits"
msgstr "Уклони _Ñве поделе"
#: ../src/gnome/gnc-plugin-page-register2.c:280
-#: ../src/gnome/gnc-plugin-page-register.c:285
+#: ../src/gnome/gnc-plugin-page-register.c:287
msgid "Remove all splits in the current transaction"
msgstr "Уклоните Ñве поделе у текућој транÑакцији"
#: ../src/gnome/gnc-plugin-page-register2.c:284
-#: ../src/gnome/gnc-plugin-page-register.c:289
+#: ../src/gnome/gnc-plugin-page-register.c:291
msgid "_Enter Transaction"
msgstr "_УнеÑи транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:285
-#: ../src/gnome/gnc-plugin-page-register.c:290
+#: ../src/gnome/gnc-plugin-page-register.c:292
msgid "Record the current transaction"
msgstr "Забележите текућу транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:289
-#: ../src/gnome/gnc-plugin-page-register.c:294
+#: ../src/gnome/gnc-plugin-page-register.c:296
msgid "Ca_ncel Transaction"
msgstr "_Откажи транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:290
-#: ../src/gnome/gnc-plugin-page-register.c:295
+#: ../src/gnome/gnc-plugin-page-register.c:297
msgid "Cancel the current transaction"
msgstr "Откажите текућу транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:294
-#: ../src/gnome/gnc-plugin-page-register.c:299
+#: ../src/gnome/gnc-plugin-page-register.c:301
msgid "_Void Transaction"
msgstr "_Поништи транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:298
-#: ../src/gnome/gnc-plugin-page-register.c:303
+#: ../src/gnome/gnc-plugin-page-register.c:305
msgid "_Unvoid Transaction"
msgstr "_Отпоништи транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:302
-#: ../src/gnome/gnc-plugin-page-register.c:307
+#: ../src/gnome/gnc-plugin-page-register.c:309
msgid "Add _Reversing Transaction"
msgstr "Додај _обратну транÑакцију"
@@ -5900,88 +5898,88 @@ msgid "Refresh this window"
msgstr "ОÑвежите овај прозор"
#: ../src/gnome/gnc-plugin-page-register2.c:342
-#: ../src/gnome/gnc-plugin-page-register.c:351
+#: ../src/gnome/gnc-plugin-page-register.c:353
msgid "Automatically clear individual transactions, so as to reach a certain cleared amount"
msgstr "СамоÑтално очиÑтите појединачне транÑакције, тако да доÑтигну одређени Ð¸Ð·Ð½Ð¾Ñ Ñ‡Ð¸ÑˆÑ›ÐµÑšÐ°"
#: ../src/gnome/gnc-plugin-page-register2.c:356
-#: ../src/gnome/gnc-plugin-page-register.c:365
+#: ../src/gnome/gnc-plugin-page-register.c:367
msgid "_Blank Transaction"
msgstr "_ИÑпразни транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:357
-#: ../src/gnome/gnc-plugin-page-register.c:366
+#: ../src/gnome/gnc-plugin-page-register.c:368
msgid "Move to the blank transaction at the bottom of the register"
msgstr "ПремеÑтите празну транÑакцију на дно региÑтра"
#: ../src/gnome/gnc-plugin-page-register2.c:361
-#: ../src/gnome/gnc-plugin-page-register.c:370
+#: ../src/gnome/gnc-plugin-page-register.c:372
msgid "Edit E_xchange Rate"
msgstr "Уреди Ð¾Ð´Ð½Ð¾Ñ _размене"
#: ../src/gnome/gnc-plugin-page-register2.c:362
-#: ../src/gnome/gnc-plugin-page-register.c:371
+#: ../src/gnome/gnc-plugin-page-register.c:373
msgid "Edit the exchange rate for the current transaction"
msgstr "Уредите Ð¾Ð´Ð½Ð¾Ñ Ñ€Ð°Ð·Ð¼ÐµÐ½Ðµ за текућу транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:366
-#: ../src/gnome/gnc-plugin-page-register.c:375
+#: ../src/gnome/gnc-plugin-page-register.c:377
#: ../src/gnome-utils/gnc-icons.c:45
msgid "_Jump"
msgstr "_Скочи"
#: ../src/gnome/gnc-plugin-page-register2.c:367
-#: ../src/gnome/gnc-plugin-page-register.c:376
+#: ../src/gnome/gnc-plugin-page-register.c:378
msgid "Jump to the corresponding transaction in the other account"
msgstr "Идите на одговарајућу транÑакцију у другом налогу"
#: ../src/gnome/gnc-plugin-page-register2.c:371
-#: ../src/gnome/gnc-plugin-page-register.c:380
+#: ../src/gnome/gnc-plugin-page-register.c:382
msgid "Sche_dule..."
msgstr "_Закажи..."
#: ../src/gnome/gnc-plugin-page-register2.c:372
-#: ../src/gnome/gnc-plugin-page-register.c:381
+#: ../src/gnome/gnc-plugin-page-register.c:383
msgid "Create a Scheduled Transaction with the current transaction as a template"
msgstr "Ðаправите заказану транÑакцију Ñа текућом транÑакцијом као шаблоном"
#: ../src/gnome/gnc-plugin-page-register2.c:376
-#: ../src/gnome/gnc-plugin-page-register.c:385
+#: ../src/gnome/gnc-plugin-page-register.c:387
msgid "_All transactions"
msgstr "_Све транÑакције"
#: ../src/gnome/gnc-plugin-page-register2.c:380
-#: ../src/gnome/gnc-plugin-page-register.c:389
+#: ../src/gnome/gnc-plugin-page-register.c:391
msgid "_This transaction"
msgstr "_Ову транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:387
-#: ../src/gnome/gnc-plugin-page-register.c:396
+#: ../src/gnome/gnc-plugin-page-register.c:398
msgid "Account Report"
msgstr "Извештај налога"
#: ../src/gnome/gnc-plugin-page-register2.c:388
-#: ../src/gnome/gnc-plugin-page-register.c:397
+#: ../src/gnome/gnc-plugin-page-register.c:399
msgid "Open a register report for this Account"
msgstr "Отворите извештај региÑтра за овај налог"
#: ../src/gnome/gnc-plugin-page-register2.c:392
-#: ../src/gnome/gnc-plugin-page-register.c:401
+#: ../src/gnome/gnc-plugin-page-register.c:403
msgid "Account Report - Single Transaction"
msgstr "Извештај налога — једна транÑакција"
#: ../src/gnome/gnc-plugin-page-register2.c:393
-#: ../src/gnome/gnc-plugin-page-register.c:402
+#: ../src/gnome/gnc-plugin-page-register.c:404
msgid "Open a register report for the selected Transaction"
msgstr "Отворите извештај региÑтра за изабрану транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:403
-#: ../src/gnome/gnc-plugin-page-register.c:412
+#: ../src/gnome/gnc-plugin-page-register.c:414
msgid "_Double Line"
msgstr "_Два реда"
#: ../src/gnome/gnc-plugin-page-register2.c:404
-#: ../src/gnome/gnc-plugin-page-register.c:413
+#: ../src/gnome/gnc-plugin-page-register.c:415
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:89
msgid "Show two lines of information for each transaction"
msgstr "Прикажите два реда података за Ñваку транÑакцију"
@@ -5995,71 +5993,71 @@ msgid "Show entered and reconciled dates"
msgstr "Прикажите унеÑене и измирене датуме"
#: ../src/gnome/gnc-plugin-page-register2.c:415
-#: ../src/gnome/gnc-plugin-page-register.c:418
+#: ../src/gnome/gnc-plugin-page-register.c:420
#: ../src/gnome-utils/gnc-icons.c:44
msgid "S_plit Transaction"
msgstr "_Подели транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:416
-#: ../src/gnome/gnc-plugin-page-register.c:419
+#: ../src/gnome/gnc-plugin-page-register.c:421
msgid "Show all splits in the current transaction"
msgstr "Прикажите Ñве поделе у текућој транÑакцији"
#: ../src/gnome/gnc-plugin-page-register2.c:427
-#: ../src/gnome/gnc-plugin-page-register.c:430
+#: ../src/gnome/gnc-plugin-page-register.c:432
msgid "_Basic Ledger"
msgstr "_ОÑновна књига"
#: ../src/gnome/gnc-plugin-page-register2.c:428
-#: ../src/gnome/gnc-plugin-page-register.c:431
+#: ../src/gnome/gnc-plugin-page-register.c:433
msgid "Show transactions on one or two lines"
msgstr "Прикажите транÑакције у једном или два реда"
#: ../src/gnome/gnc-plugin-page-register2.c:432
-#: ../src/gnome/gnc-plugin-page-register.c:435
+#: ../src/gnome/gnc-plugin-page-register.c:437
msgid "_Auto-Split Ledger"
msgstr "_Сам подели књигу"
#: ../src/gnome/gnc-plugin-page-register2.c:433
-#: ../src/gnome/gnc-plugin-page-register.c:436
+#: ../src/gnome/gnc-plugin-page-register.c:438
msgid "Show transactions on one or two lines and expand the current transaction"
msgstr "Прикажите транÑакције у једном или два реда и раширите текућу транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:437
-#: ../src/gnome/gnc-plugin-page-register.c:440
+#: ../src/gnome/gnc-plugin-page-register.c:442
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:141
msgid "Transaction _Journal"
msgstr "_Дневник транÑакције"
#: ../src/gnome/gnc-plugin-page-register2.c:438
-#: ../src/gnome/gnc-plugin-page-register.c:441
+#: ../src/gnome/gnc-plugin-page-register.c:443
msgid "Show expanded transactions with all splits"
msgstr "Прикажите раширене транÑакције Ñа Ñвим поделама"
#: ../src/gnome/gnc-plugin-page-register2.c:476
-#: ../src/gnome/gnc-plugin-page-register.c:479
+#: ../src/gnome/gnc-plugin-page-register.c:481
#: ../src/gnome-utils/gnc-tree-model-split-reg.c:2900
#: ../src/register/ledger-core/split-register.c:2489
-#: ../src/register/ledger-core/split-register-layout.c:687
-#: ../src/register/ledger-core/split-register-model.c:332
+#: ../src/register/ledger-core/split-register-layout.c:714
+#: ../src/register/ledger-core/split-register-model.c:339
#: ../src/report/standard-reports/register.scm:154
msgid "Transfer"
msgstr "ПреноÑ"
#: ../src/gnome/gnc-plugin-page-register2.c:481
-#: ../src/gnome/gnc-plugin-page-register.c:484
+#: ../src/gnome/gnc-plugin-page-register.c:486
#: ../src/gnome-search/dialog-search.c:1085
msgid "Split"
msgstr "Подели"
#: ../src/gnome/gnc-plugin-page-register2.c:482
-#: ../src/gnome/gnc-plugin-page-register.c:485
+#: ../src/gnome/gnc-plugin-page-register.c:487
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:24
msgid "Schedule"
msgstr "Планирање"
#: ../src/gnome/gnc-plugin-page-register2.c:485
-#: ../src/gnome/gnc-plugin-page-register.c:488
+#: ../src/gnome/gnc-plugin-page-register.c:490
#: ../src/gnome/window-autoclear.c:92
msgid "Auto-clear"
msgstr "Самочишћење"
@@ -6075,23 +6073,23 @@ msgstr "Општа књига2"
#. Translators: %s is the name
#. of the tab page
#: ../src/gnome/gnc-plugin-page-register2.c:1613
-#: ../src/gnome/gnc-plugin-page-register.c:1544
+#: ../src/gnome/gnc-plugin-page-register.c:1553
#, c-format
msgid "Save changes to %s?"
msgstr "Да Ñачувам измене у „%s“?"
#: ../src/gnome/gnc-plugin-page-register2.c:1617
-#: ../src/gnome/gnc-plugin-page-register.c:1548
+#: ../src/gnome/gnc-plugin-page-register.c:1557
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?"
msgstr "Овај региÑтар има измене на чекању за транÑакцију. Да ли желите да Ñачувајте измене у овој транÑакцији, да откажете транÑакцију, или да откажете радњу?"
#: ../src/gnome/gnc-plugin-page-register2.c:1620
-#: ../src/gnome/gnc-plugin-page-register.c:1551
+#: ../src/gnome/gnc-plugin-page-register.c:1560
msgid "_Discard Transaction"
msgstr "_Одбаци транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:1624
-#: ../src/gnome/gnc-plugin-page-register.c:1555
+#: ../src/gnome/gnc-plugin-page-register.c:1564
msgid "_Save Transaction"
msgstr "_Сачувај транÑакцију"
@@ -6100,35 +6098,35 @@ msgstr "_Сачувај транÑакцију"
#: ../src/gnome/gnc-plugin-page-register2.c:1700
#: ../src/gnome/gnc-plugin-page-register2.c:1723
#: ../src/gnome/gnc-plugin-page-register2.c:1773
-#: ../src/gnome/gnc-plugin-page-register.c:1587
-#: ../src/gnome/gnc-plugin-page-register.c:1622
-#: ../src/gnome/gnc-plugin-page-register.c:1634
-#: ../src/gnome/gnc-plugin-page-register.c:1657
-#: ../src/gnome/gnc-plugin-page-register.c:1707
-#: ../src/gnome/gnc-plugin-page-register.c:1751
+#: ../src/gnome/gnc-plugin-page-register.c:1596
+#: ../src/gnome/gnc-plugin-page-register.c:1631
+#: ../src/gnome/gnc-plugin-page-register.c:1643
+#: ../src/gnome/gnc-plugin-page-register.c:1666
+#: ../src/gnome/gnc-plugin-page-register.c:1716
+#: ../src/gnome/gnc-plugin-page-register.c:1799
msgid "unknown"
msgstr "непознато"
#: ../src/gnome/gnc-plugin-page-register2.c:1674
#: ../src/gnome/gnc-plugin-page-register2.c:2395
-#: ../src/gnome/gnc-plugin-page-register.c:758
-#: ../src/gnome/gnc-plugin-page-register.c:1608
-#: ../src/gnome/gnc-plugin-page-register.c:2563
+#: ../src/gnome/gnc-plugin-page-register.c:761
+#: ../src/gnome/gnc-plugin-page-register.c:1617
+#: ../src/gnome/gnc-plugin-page-register.c:2606
#: ../src/report/standard-reports/general-ledger.scm:40
msgid "General Ledger"
msgstr "Општа књига"
#: ../src/gnome/gnc-plugin-page-register2.c:1676
#: ../src/gnome/gnc-plugin-page-register2.c:2401
-#: ../src/gnome/gnc-plugin-page-register.c:1610
-#: ../src/gnome/gnc-plugin-page-register.c:2569
+#: ../src/gnome/gnc-plugin-page-register.c:1619
+#: ../src/gnome/gnc-plugin-page-register.c:2612
msgid "Portfolio"
msgstr "Портфељ"
#: ../src/gnome/gnc-plugin-page-register2.c:1678
#: ../src/gnome/gnc-plugin-page-register2.c:2407
-#: ../src/gnome/gnc-plugin-page-register.c:1612
-#: ../src/gnome/gnc-plugin-page-register.c:2575
+#: ../src/gnome/gnc-plugin-page-register.c:1621
+#: ../src/gnome/gnc-plugin-page-register.c:2618
msgid "Search Results"
msgstr "Резултати претраге"
@@ -6137,17 +6135,17 @@ msgid "General Ledger Report"
msgstr "Извештај опште књиге"
#: ../src/gnome/gnc-plugin-page-register2.c:2403
-#: ../src/gnome/gnc-plugin-page-register.c:2571
+#: ../src/gnome/gnc-plugin-page-register.c:2614
msgid "Portfolio Report"
msgstr "Извештај портфеља"
#: ../src/gnome/gnc-plugin-page-register2.c:2409
-#: ../src/gnome/gnc-plugin-page-register.c:2577
+#: ../src/gnome/gnc-plugin-page-register.c:2620
msgid "Search Results Report"
msgstr "Извештај резултата претраге"
#: ../src/gnome/gnc-plugin-page-register2.c:2413
-#: ../src/gnome/gnc-plugin-page-register.c:2581
+#: ../src/gnome/gnc-plugin-page-register.c:2624
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:134
#: ../src/report/standard-reports/general-journal.scm:38
#: ../src/report/standard-reports/register.scm:894
@@ -6160,115 +6158,115 @@ msgid "Register Report"
msgstr "Извештај региÑтра"
#: ../src/gnome/gnc-plugin-page-register2.c:2431
-#: ../src/gnome/gnc-plugin-page-register.c:2599
+#: ../src/gnome/gnc-plugin-page-register.c:2642
msgid "and subaccounts"
msgstr "и подналога"
#: ../src/gnome/gnc-plugin-page-register2.c:2632
-#: ../src/gnome/gnc-plugin-page-register.c:2764
+#: ../src/gnome/gnc-plugin-page-register.c:2807
msgid "Print checks from multiple accounts?"
msgstr "Да штампам чекове из више налога?"
#: ../src/gnome/gnc-plugin-page-register2.c:2634
-#: ../src/gnome/gnc-plugin-page-register.c:2766
+#: ../src/gnome/gnc-plugin-page-register.c:2809
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?"
msgstr "Резултат ове претраге Ñдржи поделе из више од једног налога. Да ли желите да штампате чекове чак и ако ниÑу Ñви Ñа иÑтог налога?"
#: ../src/gnome/gnc-plugin-page-register2.c:2644
-#: ../src/gnome/gnc-plugin-page-register.c:2776
+#: ../src/gnome/gnc-plugin-page-register.c:2819
msgid "_Print checks"
msgstr "_Штампај чекове"
#: ../src/gnome/gnc-plugin-page-register2.c:2663
-#: ../src/gnome/gnc-plugin-page-register.c:2795
+#: ../src/gnome/gnc-plugin-page-register.c:2838
msgid "You can only print checks from a bank account register or search results."
msgstr "Можете да штампате Ñамо чекове из региÑтра банковног рачуна или из резултата претраге."
#: ../src/gnome/gnc-plugin-page-register2.c:2855
-#: ../src/gnome/gnc-plugin-page-register.c:2955
+#: ../src/gnome/gnc-plugin-page-register.c:2998
msgid "You cannot void a transaction with reconciled or cleared splits."
msgstr "Ðе можете поништити транÑакцију Ñа измиреним или очишћеним поделама."
#. Translators: The %s is the name of the plugin page
#: ../src/gnome/gnc-plugin-page-register2.c:2999
-#: ../src/gnome/gnc-plugin-page-register.c:3160
+#: ../src/gnome/gnc-plugin-page-register.c:3204
#: ../src/gnome-utils/gnc-tree-view-account.c:2145
#: ../src/gnome-utils/gnc-tree-view-owner.c:1205
#, c-format
msgid "Filter %s by..."
msgstr "Издвој „%s“ према..."
-#: ../src/gnome/gnc-plugin-page-register.c:197
+#: ../src/gnome/gnc-plugin-page-register.c:199
msgid "_Associate File with Transaction"
msgstr "_Придружи датотеку транÑакцији"
-#: ../src/gnome/gnc-plugin-page-register.c:198
+#: ../src/gnome/gnc-plugin-page-register.c:200
msgid "_Associate Location with Transaction"
msgstr "_Придружи путању транÑакцији"
-#: ../src/gnome/gnc-plugin-page-register.c:199
+#: ../src/gnome/gnc-plugin-page-register.c:201
msgid "_Open Associated File/Location"
msgstr "_Отвори придружену датотеку/путању"
-#: ../src/gnome/gnc-plugin-page-register.c:210
+#: ../src/gnome/gnc-plugin-page-register.c:212
msgid "Associate a file with the current transaction"
msgstr "Придружите датотеку текућој транÑакцији"
-#: ../src/gnome/gnc-plugin-page-register.c:211
+#: ../src/gnome/gnc-plugin-page-register.c:213
msgid "Associate a location with the current transaction"
msgstr "Придружите путању текућој транÑакцији"
-#: ../src/gnome/gnc-plugin-page-register.c:212
+#: ../src/gnome/gnc-plugin-page-register.c:214
msgid "Open the associated file or location with the current transaction"
msgstr "Отворите придружену датотеку или путању Ñа текућом транÑакцијом"
-#: ../src/gnome/gnc-plugin-page-register.c:284
+#: ../src/gnome/gnc-plugin-page-register.c:286
msgid "Remo_ve Other Splits"
msgstr "Уклони _оÑтале поделе"
-#: ../src/gnome/gnc-plugin-page-register.c:329
+#: ../src/gnome/gnc-plugin-page-register.c:331
#: ../src/gnome-utils/gnc-main-window.c:328
msgid "_Sort By..."
msgstr "_РазврÑтај према..."
-#: ../src/gnome/gnc-plugin-page-register.c:489
+#: ../src/gnome/gnc-plugin-page-register.c:491
msgid "Associate File"
msgstr "Придружите датотеку"
-#: ../src/gnome/gnc-plugin-page-register.c:490
+#: ../src/gnome/gnc-plugin-page-register.c:492
msgid "Associate Location"
msgstr "Придружите путању"
-#: ../src/gnome/gnc-plugin-page-register.c:491
+#: ../src/gnome/gnc-plugin-page-register.c:493
msgid "Open File/Location"
msgstr "Отворите датотеку/путању"
-#: ../src/gnome/gnc-plugin-page-register.c:685
+#: ../src/gnome/gnc-plugin-page-register.c:688
msgid "You have tried to open an account in the old register while it is open in the new register."
msgstr "Покушали Ñте да отворите налог у Ñтаром региÑтру док је он отворен у новом."
#. Define the strings here to avoid typos and make changes easier.
-#: ../src/gnome/gnc-plugin-page-register.c:2565
-#: ../src/gnome/gnc-plugin-page-register.c:2583
+#: ../src/gnome/gnc-plugin-page-register.c:2608
+#: ../src/gnome/gnc-plugin-page-register.c:2626
#: ../src/report/standard-reports/transaction.scm:48
msgid "Transaction Report"
msgstr "Извештај транÑакције"
-#: ../src/gnome/gnc-plugin-page-register.c:2961
+#: ../src/gnome/gnc-plugin-page-register.c:3004
#: ../src/gnome/gnc-split-reg.c:909
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:68
#, c-format
msgid "This transaction is marked read-only with the comment: '%s'"
msgstr "Ова транÑакција је обележена Ñамо за читање Ñа напоменом: „%s“"
-#: ../src/gnome/gnc-plugin-page-register.c:3032
+#: ../src/gnome/gnc-plugin-page-register.c:3075
#: ../src/gnome/gnc-split-reg.c:880
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1123
msgid "A reversing entry has already been created for this transaction."
msgstr "Обратни ÑƒÐ½Ð¾Ñ Ñ˜Ðµ већ направљен за ову транÑакцију."
#. Translations: The %s is the name of the plugin page
-#: ../src/gnome/gnc-plugin-page-register.c:3083
+#: ../src/gnome/gnc-plugin-page-register.c:3126
#, c-format
msgid "Sort %s by..."
msgstr "РазврÑтај „%s“ према..."
@@ -6361,31 +6359,31 @@ msgstr "<Ðема податка>"
msgid "Balancing entry from reconcilation"
msgstr "Салдирам ÑƒÐ½Ð¾Ñ Ð¸Ð· измирења"
-#: ../src/gnome/gnc-split-reg2.c:936 ../src/gnome/gnc-split-reg.c:2070
+#: ../src/gnome/gnc-split-reg2.c:936 ../src/gnome/gnc-split-reg.c:2075
msgid "Present:"
msgstr "Садшње:"
-#: ../src/gnome/gnc-split-reg2.c:937 ../src/gnome/gnc-split-reg.c:2071
+#: ../src/gnome/gnc-split-reg2.c:937 ../src/gnome/gnc-split-reg.c:2076
msgid "Future:"
msgstr "Будуће:"
-#: ../src/gnome/gnc-split-reg2.c:938 ../src/gnome/gnc-split-reg.c:2072
+#: ../src/gnome/gnc-split-reg2.c:938 ../src/gnome/gnc-split-reg.c:2077
msgid "Cleared:"
msgstr "Очишћено:"
-#: ../src/gnome/gnc-split-reg2.c:939 ../src/gnome/gnc-split-reg.c:2073
+#: ../src/gnome/gnc-split-reg2.c:939 ../src/gnome/gnc-split-reg.c:2078
msgid "Reconciled:"
msgstr "Измирено:"
-#: ../src/gnome/gnc-split-reg2.c:940 ../src/gnome/gnc-split-reg.c:2074
+#: ../src/gnome/gnc-split-reg2.c:940 ../src/gnome/gnc-split-reg.c:2079
msgid "Projected Minimum:"
msgstr "Пројектовани минимум:"
-#: ../src/gnome/gnc-split-reg2.c:944 ../src/gnome/gnc-split-reg.c:2078
+#: ../src/gnome/gnc-split-reg2.c:944 ../src/gnome/gnc-split-reg.c:2083
msgid "Shares:"
msgstr "Ðкције:"
-#: ../src/gnome/gnc-split-reg2.c:945 ../src/gnome/gnc-split-reg.c:2079
+#: ../src/gnome/gnc-split-reg2.c:945 ../src/gnome/gnc-split-reg.c:2084
msgid "Current Value:"
msgstr "Тренутна вредноÑÑ‚:"
@@ -6397,15 +6395,15 @@ msgstr "Ðалог отплаћивања / РегиÑтар потражива
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."
msgstr "Приказани региÑтар је за налог отплаћивања или налог потраживања. Промена Ñтавке може да изазове штету, кориÑтите поÑловне опције за промену Ñтавке."
-#: ../src/gnome/gnc-split-reg2.c:1069 ../src/gnome/gnc-split-reg.c:2153
+#: ../src/gnome/gnc-split-reg2.c:1069 ../src/gnome/gnc-split-reg.c:2158
msgid "This account register is read-only."
msgstr "Овај региÑтар налога је Ñамо за читање."
-#: ../src/gnome/gnc-split-reg2.c:1112 ../src/gnome/gnc-split-reg.c:2196
+#: ../src/gnome/gnc-split-reg2.c:1112 ../src/gnome/gnc-split-reg.c:2201
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."
msgstr "Овај налог Ñе не може мењати. Ðко желите да измените транÑакције у овом региÑтру, отворите опције налога и иÑкључите потврду меÑтодржача."
-#: ../src/gnome/gnc-split-reg2.c:1119 ../src/gnome/gnc-split-reg.c:2203
+#: ../src/gnome/gnc-split-reg2.c:1119 ../src/gnome/gnc-split-reg.c:2208
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."
msgstr "Један од изабраних подрачуна Ñе не може мењати. Ðко желите да уредите транÑакције у овом региÑтру, отворите опције подрачуна и иÑкључите потврду меÑтодржача. Такође можете отворити један налог умеÑто Ñкуп налога."
@@ -7561,25 +7559,29 @@ msgstr "Ðалог зајма:"
msgid "Enter the number of months still to be paid off. This determines both the remaining principle and the duration of the scheduled transaction."
msgstr "Упишите број меÑеци који још требају бити иÑплаћени. Ово одређује и преоÑталу главницу и трајање заказане транÑакције."
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:15
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:13
+msgid "Enter the annual interest rate in percent. Accepts values from 0.001 - 100. The Mortgage Assistant does not support zero-interest loans."
+msgstr "УнеÑите годишњу каматну Ñтопу у процентима. Прихвата вредноÑти од 0.001 до 100. Помоћник хипотеке не подржава зајмове Ñа нултном каматом."
+
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:16
#: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:17
#: ../src/gnome/gtkbuilder/dialog-tax-info.glade.h:4
msgid "Type:"
msgstr "Ð’Ñ€Ñта:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:16
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:17
msgid "Months Remaining:"
msgstr "ПреоÑтали меÑеци:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:17
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:18
msgid "Interest Rate Change Frequency"
msgstr "УчеÑталоÑÑ‚ промене каматне Ñтопе"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:18
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:19
msgid "Loan Details"
msgstr "ПојединоÑти о зајму"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:19
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:20
msgid ""
"\n"
"Do you utilise an escrow account, if so an account must be specified..."
@@ -7587,19 +7589,19 @@ msgstr ""
"\n"
"Да ли кориÑтите налог залога, ако је тако онда налог мора бити наведен..."
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:21
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:22
msgid "... utilize an escrow account for payments?"
msgstr "... кориÑтим налог залога за плаћања?"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:22
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:23
msgid "Escrow Account:"
msgstr "Ðалог залога:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:23
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:24
msgid "Loan Repayment Options"
msgstr "Опције отплаћивања зајма"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:24
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:25
msgid ""
"\n"
"All accounts must have valid entries to continue.\n"
@@ -7607,33 +7609,33 @@ msgstr ""
"\n"
"Да наÑтавите Ñви налози морају имати иÑправне уноÑе.\n"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:27
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:28
msgid "Payment From:"
msgstr "Ко плаћа:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:28
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:29
msgid "Principal To:"
msgstr "Главница на:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:29
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:30
#: ../src/gnome/gtkbuilder/dialog-sx.glade.h:50
#: ../src/gnome/gtkbuilder/dialog-tax-info.glade.h:3
msgid "Name:"
msgstr "Ðазив:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:30
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:31
msgid "Interest To:"
msgstr "Каматна на:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:31
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:32
msgid "Repayment Frequency"
msgstr "УчеÑталоÑÑ‚ отплаћивања"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:32
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:33
msgid "Loan Repayment"
msgstr "Отплаћивање зајма"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:33
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:34
msgid ""
"\n"
"All enabled option pages must contain valid entries to continue.\n"
@@ -7641,54 +7643,54 @@ msgstr ""
"\n"
"Да наÑтавите, Ñве укључене Ñтранице опција морају Ñадржати иÑправне уноÑе.\n"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:36
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:37
msgid "Payment To (Escrow):"
msgstr "Уплаћује у (зајам):"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:37
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:38
msgid "Payment From (Escrow):"
msgstr "ИÑплаћује из (зајам):"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:38
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:39
msgid "Payment To:"
msgstr "Коме Ñе плаћа:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:39
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:40
msgid "Specify Source Account"
msgstr "Ðаведите изворни налог"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:40
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:41
msgid "Use Escrow Account"
msgstr "КориÑтите налог залога"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:41
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:42
msgid "Part of Payment Transaction"
msgstr "Део транÑакције плаћања"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:42
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:43
#: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:58
#: ../src/report/standard-reports/account-piecharts.scm:404
#: ../src/report/standard-reports/category-barchart.scm:491
msgid "Other"
msgstr "Друго"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:43
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:44
msgid "Payment Frequency"
msgstr "УчеÑталоÑÑ‚ плаћања"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:44
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:45
msgid "Previous Option"
msgstr "Претходна опција"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:45
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:46
msgid "Next Option"
msgstr "Следећа опција"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:46
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:47
msgid "Loan Payment"
msgstr "Плаћање зајма"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:47
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:48
msgid ""
"\n"
"Review the details below and if correct press Apply to create the schedule."
@@ -7696,98 +7698,98 @@ msgstr ""
"\n"
"Прегледајте појединоÑти иÑпод и ако Ñу тачне притиÑните „Примени“ да направите заказивање."
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:49
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:50
msgid "Range: "
msgstr "ОпÑег: "
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:50
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:51
#: ../src/gnome/gtkbuilder/dialog-sx.glade.h:54
msgid "End Date:"
msgstr "Датум завршетка:"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:51
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:52
#: ../src/report/business-reports/job-report.scm:632
#: ../src/report/business-reports/owner-report.scm:771
msgid "Date Range"
msgstr "ОпÑег датума"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:52
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:53
msgid "Loan Review"
msgstr "Преглед зајма"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:53
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:54
msgid "Schedule added successfully."
msgstr "Заказивање је уÑпешно додато."
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:54
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:55
msgid "Loan Summary"
msgstr "Сажетак зајма"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:55
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:56
#: ../src/gnome-utils/gnc-date-delta.c:220
#: ../src/report/standard-reports/price-scatter.scm:231
msgid "Months"
msgstr "МеÑеци"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:56
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:57
#: ../src/gnome-utils/gnc-date-delta.c:222
#: ../src/report/standard-reports/price-scatter.scm:232
msgid "Years"
msgstr "Године"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:57
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:58
msgid "Current Year"
msgstr "Текућа година"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:58
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:59
msgid "Now + 1 Year"
msgstr "Сада + 1 година"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:59
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:60
msgid "Whole Loan"
msgstr "Читав зајам"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:61
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:62
msgid "Interest Rate"
msgstr "Каматна Ñтопа"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:62
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:63
msgid "APR (Compounded Daily)"
msgstr "ÐПР(израчуната дневно)"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:63
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:64
msgid "APR (Compounded Weekly)"
msgstr "ÐПР(израчуната недељно)"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:64
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:65
msgid "APR (Compounded Monthly)"
msgstr "ÐПР(израчуната меÑечно)"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:65
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:66
msgid "APR (Compounded Quarterly)"
msgstr "ÐПР(израчуната тромеÑечно)"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:66
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:67
msgid "APR (Compounded Annually)"
msgstr "ÐПР(израчуната годишње)"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:67
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:68
msgid "Fixed Rate"
msgstr "Стална Ñтопа"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:68
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:69
msgid "3/1 Year ARM"
msgstr "3/1 година ÐÐ Ðœ"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:69
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:70
msgid "5/1 Year ARM"
msgstr "5/1 година ÐÐ Ðœ"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:70
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:71
msgid "7/1 Year ARM"
msgstr "7/1 година ÐÐ Ðœ"
-#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:71
+#: ../src/gnome/gtkbuilder/assistant-loan.glade.h:72
msgid "10/1 Year ARM"
msgstr "10/1 година ÐÐ Ðœ"
@@ -8971,7 +8973,7 @@ msgid "Enter _Interest Payment..."
msgstr "УнеÑи плаћање _камате..."
#: ../src/gnome/reconcile-view.c:368
-#: ../src/register/ledger-core/split-register-layout.c:671
+#: ../src/register/ledger-core/split-register-layout.c:690
#: ../src/register/ledger-core/split-register-model.c:303
msgid "Reconciled:R"
msgstr "И"
@@ -9095,11 +9097,6 @@ msgstr "Изаберите налоге за поређење"
msgid "Select the Accounts to Compare"
msgstr "Изаберите налоге за упоређивање"
-#. Build and connect the toggle
-#: ../src/gnome-search/search-boolean.c:205
-msgid "set true"
-msgstr "подешено"
-
#: ../src/gnome-search/search-date.c:195
msgid "is before"
msgstr "је пре"
@@ -10250,11 +10247,11 @@ msgstr "Ðе могу да нађем датотеке документациј
msgid "GnuCash could not find the associated file."
msgstr "Ðе могу да пронађем придружену датотеку."
-#: ../src/gnome-utils/gnc-gnome-utils.c:452
+#: ../src/gnome-utils/gnc-gnome-utils.c:453
msgid "GnuCash could not find the associated file"
msgstr "Ðе могу да пронађем придружену датотеку"
-#: ../src/gnome-utils/gnc-gnome-utils.c:478
+#: ../src/gnome-utils/gnc-gnome-utils.c:480
msgid "GnuCash could not open the associated URI:"
msgstr "Ðе могу да отворим придружену путању:"
@@ -10751,27 +10748,27 @@ msgid "_Unreconcile"
msgstr "_Поништи измирење"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1912
-#: ../src/register/ledger-core/split-register-model.c:2008
+#: ../src/register/ledger-core/split-register-model.c:2064
msgid "Change reconciled split?"
msgstr "Да изменим измирену поделу?"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1914
-#: ../src/register/ledger-core/split-register-model.c:2010
+#: ../src/register/ledger-core/split-register-model.c:2066
msgid "You are about to change a reconciled split. Doing so might make future reconciliation difficult! Continue with this change?"
msgstr "Хоћете да измените измирену поделу. Ðко то урадите можете учинити тешким будућа измирења! Желите да наÑтавите Ñа овом изменом?"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1919
-#: ../src/register/ledger-core/split-register-model.c:2015
+#: ../src/register/ledger-core/split-register-model.c:2071
msgid "Change split linked to a reconciled split?"
msgstr "Да изменим поделу повезану Ñа измиреном поделом?"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1921
-#: ../src/register/ledger-core/split-register-model.c:2017
+#: ../src/register/ledger-core/split-register-model.c:2073
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?"
msgstr "Хоћете да измените поделу која је повезана Ñа измиреном поделом. Ðко то урадите можете учинити тешким будућа измирења! Желите да наÑтавите Ñа овом изменом?"
#: ../src/gnome-utils/gnc-tree-control-split-reg.c:1935
-#: ../src/register/ledger-core/split-register-model.c:2031
+#: ../src/register/ledger-core/split-register-model.c:2087
msgid "Chan_ge Split"
msgstr "_Измени поделу"
@@ -10883,7 +10880,7 @@ msgstr "ИÑплатница"
#: ../src/gnome-utils/gnc-tree-view-price.c:454
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3036
#: ../src/register/ledger-core/split-register.c:2555
-#: ../src/register/ledger-core/split-register-model.c:379
+#: ../src/register/ledger-core/split-register-model.c:386
#: ../src/report/business-reports/easy-invoice.scm:269
#: ../src/report/business-reports/fancy-invoice.scm:279
#: ../src/report/business-reports/invoice.scm:264
@@ -11304,12 +11301,12 @@ msgid "Rate"
msgstr "Стопа"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3112
-#: ../src/register/ledger-core/split-register-model.c:482
+#: ../src/register/ledger-core/split-register-model.c:489
msgid "Credit Formula"
msgstr "Формула кредита"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3193
-#: ../src/register/ledger-core/split-register-model.c:475
+#: ../src/register/ledger-core/split-register-model.c:482
msgid "Debit Formula"
msgstr "Формула дуга"
@@ -11331,43 +11328,43 @@ msgid "Enter the transaction number, such as the check number"
msgstr "УнеÑите број транÑакције, као што је број чека"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3293
-#: ../src/register/ledger-core/split-register-model.c:1021
+#: ../src/register/ledger-core/split-register-model.c:1077
msgid "Enter the name of the Customer"
msgstr "УнеÑите име потрошача"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3295
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3304
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3313
-#: ../src/register/ledger-core/split-register-model.c:1058
+#: ../src/register/ledger-core/split-register-model.c:1114
msgid "Enter notes for the transaction"
msgstr "УнеÑите напомене за транÑакцију"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3297
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3306
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3315
-#: ../src/register/ledger-core/split-register-model.c:1217
+#: ../src/register/ledger-core/split-register-model.c:1273
msgid "Enter a description of the split"
msgstr "УнеÑите Ð¾Ð¿Ð¸Ñ Ð¿Ð¾Ð´ÐµÐ»Ðµ"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3302
-#: ../src/register/ledger-core/split-register-model.c:1024
+#: ../src/register/ledger-core/split-register-model.c:1080
msgid "Enter the name of the Vendor"
msgstr "УнеÑите назив продавца"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3311
-#: ../src/register/ledger-core/split-register-model.c:1027
+#: ../src/register/ledger-core/split-register-model.c:1083
msgid "Enter a description of the transaction"
msgstr "УнеÑите Ð¾Ð¿Ð¸Ñ Ñ‚Ñ€Ð°Ð½Ñакције"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3325
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3329
-#: ../src/register/ledger-core/split-register-model.c:1376
-#: ../src/register/ledger-core/split-register-model.c:1442
+#: ../src/register/ledger-core/split-register-model.c:1432
+#: ../src/register/ledger-core/split-register-model.c:1498
msgid "Enter the account to transfer from, or choose one from the list"
msgstr "УнеÑите налог Ñа кога Ñе преноÑи, или изаберите један Ñа ÑпиÑка"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3327
-#: ../src/register/ledger-core/split-register-model.c:1091
+#: ../src/register/ledger-core/split-register-model.c:1147
msgid "Reason the transaction was voided"
msgstr "Разлог због којег је поништена транÑакција"
@@ -11386,7 +11383,7 @@ msgstr "УнеÑите вредноÑÑ‚ купљених или продатих
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3369
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3381
-#: ../src/register/ledger-core/split-register-model.c:1325
+#: ../src/register/ledger-core/split-register-model.c:1381
msgid "Enter the number of shares bought or sold"
msgstr "УнеÑите број купљених или продатих акција"
@@ -11399,17 +11396,17 @@ msgid "Enter the rate"
msgstr "УнеÑите Ñтопу"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3411
-#: ../src/register/ledger-core/split-register-model.c:1289
+#: ../src/register/ledger-core/split-register-model.c:1345
msgid "Enter the effective share price"
msgstr "УнеÑите ефективну цену акције"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3421
-#: ../src/register/ledger-core/split-register-model.c:2147
+#: ../src/register/ledger-core/split-register-model.c:2203
msgid "Enter credit formula for real transaction"
msgstr "УнеÑите формулу кредиту за Ñтварну транÑакцију"
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:3431
-#: ../src/register/ledger-core/split-register-model.c:2117
+#: ../src/register/ledger-core/split-register-model.c:2173
msgid "Enter debit formula for real transaction"
msgstr "УнеÑите формулу дуга за Ñтварну транÑакцију"
@@ -15266,7 +15263,7 @@ msgstr "Ðалог „%s“ је налог меÑтодржача и не до
msgid "(Full account ID: "
msgstr "(Потпуни ИБ налога: "
-#: ../src/import-export/import-commodity-matcher.c:115
+#: ../src/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."
msgstr "Изаберите робу за поређење Ñа Ñледећом нарочитом шифром размене. Знајте да ће шифра размене робе коју изаберете бити препиÑана."
@@ -15395,7 +15392,7 @@ msgstr "Поново покрените датотеку дневника Гну
#. name. It MUST NOT contain the
#. character ':' anywhere in it or
#. in any translations.
-#: ../src/import-export/ofx/gnc-ofx-import.c:563
+#: ../src/import-export/ofx/gnc-ofx-import.c:586
#, c-format
msgid "Stock account for security \"%s\""
msgstr "Ðалог деонице за безбедноÑÑ‚ „%s“"
@@ -15404,44 +15401,44 @@ msgstr "Ðалог деонице за безбедноÑÑ‚ „%s“"
#. name. It MUST NOT contain the
#. character ':' anywhere in it or
#. in any translations.
-#: ../src/import-export/ofx/gnc-ofx-import.c:729
+#: ../src/import-export/ofx/gnc-ofx-import.c:752
#, c-format
msgid "Income account for security \"%s\""
msgstr "Ðалог прихода за безбедноÑÑ‚ „%s“"
-#: ../src/import-export/ofx/gnc-ofx-import.c:842
+#: ../src/import-export/ofx/gnc-ofx-import.c:865
msgid "Unknown OFX account"
msgstr "Ðепознат ÐžÐ¤Ð˜ÐºÑ Ð½Ð°Ð»Ð¾Ð³"
-#: ../src/import-export/ofx/gnc-ofx-import.c:865
+#: ../src/import-export/ofx/gnc-ofx-import.c:888
msgid "Unknown OFX checking account"
msgstr "Ðепознат ÐžÐ¤Ð˜ÐºÑ Ð½Ð°Ð»Ð¾Ð³ провере"
-#: ../src/import-export/ofx/gnc-ofx-import.c:869
+#: ../src/import-export/ofx/gnc-ofx-import.c:892
msgid "Unknown OFX savings account"
msgstr "Ðепознат ÐžÐ¤Ð˜ÐºÑ Ð½Ð°Ð»Ð¾Ð³ чувања"
-#: ../src/import-export/ofx/gnc-ofx-import.c:873
+#: ../src/import-export/ofx/gnc-ofx-import.c:896
msgid "Unknown OFX money market account"
msgstr "Ðепознат ÐžÐ¤Ð˜ÐºÑ Ð½Ð°Ð»Ð¾Ð³ тржишта новца"
-#: ../src/import-export/ofx/gnc-ofx-import.c:877
+#: ../src/import-export/ofx/gnc-ofx-import.c:900
msgid "Unknown OFX credit line account"
msgstr "Ðепознат ÐžÐ¤Ð˜ÐºÑ Ð½Ð°Ð»Ð¾Ð³ кредитне линије"
-#: ../src/import-export/ofx/gnc-ofx-import.c:881
+#: ../src/import-export/ofx/gnc-ofx-import.c:904
msgid "Unknown OFX CMA account"
msgstr "Ðепознат ÐžÐ¤Ð˜ÐºÑ Ð¦ÐœÐ Ð½Ð°Ð»Ð¾Ð³"
-#: ../src/import-export/ofx/gnc-ofx-import.c:885
+#: ../src/import-export/ofx/gnc-ofx-import.c:908
msgid "Unknown OFX credit card account"
msgstr "Ðепознат ÐžÐ¤Ð˜ÐºÑ Ð½Ð°Ð»Ð¾Ð³ кредитне картице"
-#: ../src/import-export/ofx/gnc-ofx-import.c:889
+#: ../src/import-export/ofx/gnc-ofx-import.c:912
msgid "Unknown OFX investment account"
msgstr "Ðепознат ÐžÐ¤Ð˜ÐºÑ Ð½Ð°Ð»Ð¾Ð³ улагања"
-#: ../src/import-export/ofx/gnc-ofx-import.c:972
+#: ../src/import-export/ofx/gnc-ofx-import.c:995
msgid "Select an OFX/QFX file to process"
msgstr "Изаберите ОФИкÑ/ÐšÑƒÐ¤Ð˜ÐºÑ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ за обраду"
@@ -16476,50 +16473,55 @@ msgstr "Текућа транÑакција је измењена. Да ли ж
#. used to estimate widths. Please only
#. translate the portion after the ':' and
#. leave the rest ("sample:") as is.
-#: ../src/register/ledger-core/split-register-layout.c:639
-#: ../src/register/ledger-core/split-register-layout.c:647
+#: ../src/register/ledger-core/split-register-layout.c:658
+#: ../src/register/ledger-core/split-register-layout.c:666
msgid "sample:99999"
msgstr "sample:99999"
-#: ../src/register/ledger-core/split-register-layout.c:655
+#: ../src/register/ledger-core/split-register-layout.c:674
msgid "sample:Description of a transaction"
msgstr "sample:ÐžÐ¿Ð¸Ñ Ñ‚Ñ€Ð°Ð½Ñакције"
-#: ../src/register/ledger-core/split-register-layout.c:679
-#: ../src/register/ledger-core/split-register-layout.c:719
-#: ../src/register/ledger-core/split-register-layout.c:727
-#: ../src/register/ledger-core/split-register-layout.c:735
-#: ../src/register/ledger-core/split-register-layout.c:745
-#: ../src/register/ledger-core/split-register-layout.c:753
-#: ../src/register/ledger-core/split-register-layout.c:761
-#: ../src/register/ledger-core/split-register-layout.c:769
-#: ../src/register/ledger-core/split-register-layout.c:777
-#: ../src/register/ledger-core/split-register-layout.c:825
+#: ../src/register/ledger-core/split-register-layout.c:698
+#: ../src/register/ledger-core/split-register-model.c:325
+msgid "Associate:A"
+msgstr "Придружте:Ð"
+
+#: ../src/register/ledger-core/split-register-layout.c:706
+#: ../src/register/ledger-core/split-register-layout.c:746
+#: ../src/register/ledger-core/split-register-layout.c:754
+#: ../src/register/ledger-core/split-register-layout.c:762
+#: ../src/register/ledger-core/split-register-layout.c:772
+#: ../src/register/ledger-core/split-register-layout.c:780
+#: ../src/register/ledger-core/split-register-layout.c:788
+#: ../src/register/ledger-core/split-register-layout.c:796
+#: ../src/register/ledger-core/split-register-layout.c:804
+#: ../src/register/ledger-core/split-register-layout.c:852
msgid "sample:999,999.000"
msgstr "sample:999.999,000"
-#: ../src/register/ledger-core/split-register-layout.c:711
+#: ../src/register/ledger-core/split-register-layout.c:738
msgid "sample:Memo field sample text string"
msgstr "sample:ÐиÑка текÑта узорка поља белешке"
-#: ../src/register/ledger-core/split-register-layout.c:785
+#: ../src/register/ledger-core/split-register-layout.c:812
msgid "Type:T"
msgstr "Ð’Ñ€Ñта:Т"
-#: ../src/register/ledger-core/split-register-layout.c:793
+#: ../src/register/ledger-core/split-register-layout.c:820
msgid "sample:Notes field sample text string"
msgstr "sample:ÐиÑка текÑта узорка поља белешке"
-#: ../src/register/ledger-core/split-register-layout.c:801
+#: ../src/register/ledger-core/split-register-layout.c:828
msgid "sample:No Particular Reason"
msgstr "sample:Без нарочитог разлога"
-#: ../src/register/ledger-core/split-register-layout.c:809
-#: ../src/register/ledger-core/split-register-layout.c:817
+#: ../src/register/ledger-core/split-register-layout.c:836
+#: ../src/register/ledger-core/split-register-layout.c:844
msgid "sample:(x + 0.33 * y + (x+y) )"
msgstr "sample:(x + 0.33 * y + (x+y) )"
-#: ../src/register/ledger-core/split-register-load.c:259
+#: ../src/register/ledger-core/split-register-load.c:277
msgid "Could not determine the account currency. Using the default currency provided by your system."
msgstr "Ðе могу утврдити валуту налога. КориÑтим оÑновну валуту коју доÑтавља ваш ÑиÑтем."
@@ -16536,79 +16538,79 @@ msgstr "Т-упута"
msgid "T-Num"
msgstr "Т-број"
-#: ../src/register/ledger-core/split-register-model.c:381
+#: ../src/register/ledger-core/split-register-model.c:388
msgid "Exch. Rate"
msgstr "Стопа размене"
-#: ../src/register/ledger-core/split-register-model.c:398
+#: ../src/register/ledger-core/split-register-model.c:405
msgid "Oth. Curr."
msgstr "Друга валута"
-#: ../src/register/ledger-core/split-register-model.c:415
-#: ../src/register/ledger-core/split-register-model.c:439
+#: ../src/register/ledger-core/split-register-model.c:422
+#: ../src/register/ledger-core/split-register-model.c:446
#, c-format
msgid "Tot %s"
msgstr "Укупно %s"
-#: ../src/register/ledger-core/split-register-model.c:421
+#: ../src/register/ledger-core/split-register-model.c:428
msgid "Tot Credit"
msgstr "Укупни кредит"
-#: ../src/register/ledger-core/split-register-model.c:445
+#: ../src/register/ledger-core/split-register-model.c:452
msgid "Tot Debit"
msgstr "Укупни дуг"
-#: ../src/register/ledger-core/split-register-model.c:454
+#: ../src/register/ledger-core/split-register-model.c:461
msgid "Tot Shares"
msgstr "Укупно акција"
#. This seems to be the one that initially gets used, the InactiveDateCell
#. is set to, and subsequently displayed.
-#: ../src/register/ledger-core/split-register-model.c:902
+#: ../src/register/ledger-core/split-register-model.c:958
msgid "Scheduled"
msgstr "Планирано"
-#: ../src/register/ledger-core/split-register-model.c:951
+#: ../src/register/ledger-core/split-register-model.c:1007
msgid "Enter a reference, such as an invoice or check number, common to all entry lines (splits)"
msgstr "УнеÑите упуту, као што је фактура или број чека, заједничку за Ñве линије уноÑа (поделе)"
-#: ../src/register/ledger-core/split-register-model.c:953
+#: ../src/register/ledger-core/split-register-model.c:1009
msgid "Enter a reference, such as an invoice or check number, unique to each entry line (split)"
msgstr "УнеÑите упуту, као што је фактура или број чека, јединÑтвену за Ñваку линију уноÑа (поделу)"
-#: ../src/register/ledger-core/split-register-model.c:958
+#: ../src/register/ledger-core/split-register-model.c:1014
msgid "Enter a reference, such as a check number, common to all entry lines (splits)"
msgstr "УнеÑите упуту, као што је број чека, заједничку за Ñве линије уноÑа (поделе)"
-#: ../src/register/ledger-core/split-register-model.c:960
+#: ../src/register/ledger-core/split-register-model.c:1016
msgid "Enter a reference, such as a check number, unique to each entry line (split)"
msgstr "УнеÑите упуту, као што је број чека, јединÑтвену за Ñваку линију уноÑа (поделу)"
-#: ../src/register/ledger-core/split-register-model.c:981
+#: ../src/register/ledger-core/split-register-model.c:1037
msgid "Enter a transaction reference, such as an invoice or check number, common to all entry lines (splits)"
msgstr "УнеÑите упуту транÑакције, као што је фактура или број чека, заједничку за Ñве линије уноÑа (поделе)"
-#: ../src/register/ledger-core/split-register-model.c:985
+#: ../src/register/ledger-core/split-register-model.c:1041
msgid "Enter a transaction reference that will be common to all entry lines (splits)"
msgstr "УнеÑите упуту транÑакције која ће бити заједничка за Ñве линије уноÑа (поделе)"
-#: ../src/register/ledger-core/split-register-model.c:1188
+#: ../src/register/ledger-core/split-register-model.c:1244
msgid "Enter an action type, or choose one from the list"
msgstr "УнеÑите врÑту радње, или је изаберите Ñа ÑпиÑка"
-#: ../src/register/ledger-core/split-register-model.c:1189
+#: ../src/register/ledger-core/split-register-model.c:1245
msgid "Enter a reference number, such as the next check number, or choose an action type from the list"
msgstr "УнеÑите број упуте, као што је Ñледећи број чека, или изаберите врÑту радње Ñа ÑпиÑка"
-#: ../src/register/ledger-core/split-register-model.c:1452
+#: ../src/register/ledger-core/split-register-model.c:1508
msgid "This transaction has multiple splits; press the Split button to see them all"
msgstr "Ова транÑакција има више подела; притиÑните дугме поделе да их видите Ñве"
-#: ../src/register/ledger-core/split-register-model.c:1455
+#: ../src/register/ledger-core/split-register-model.c:1511
msgid "This transaction is a stock split; press the Split button to see details"
msgstr "Ова транÑакција је подела деонице; притиÑните дугме поделе да видите појединоÑти"
-#: ../src/register/ledger-core/split-register-model.c:1942
+#: ../src/register/ledger-core/split-register-model.c:1998
#, c-format
msgid ""
"Cannot modify or delete this transaction. This transaction is marked read-only because:\n"
@@ -22969,6 +22971,9 @@ msgstr "Да претражујете Ñве ваше транÑакције, з
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."
msgstr "Да на екрану упоредите Ñадржај 2 језичка, у једном језичку, изаберите „Прозор → Ðови прозор Ñа Ñтраницом“ из изборника да удвоÑтручите тај језичак у новом прозору."
+#~ msgid "set true"
+#~ msgstr "подешено"
+
#~ msgctxt "Daily"
#~ msgid "Every"
#~ msgstr "Сваког"
commit 2cecc2934d5bf6e80465fd68e191ee10e8ee4111
Author: Phil Davis <phil.davis at inf.org>
Date: Sat Dec 17 09:29:23 2016 -0800
README typo
diff --git a/README b/README
index f4e7ba2..0812598 100644
--- a/README
+++ b/README
@@ -211,7 +211,7 @@ Building & Installing
GnuCash uses GNU Automake to handle the build process, so for most of
the details, see the generic instructions in INSTALL. (If you are
-building directory from SVN, read the README.svn for more instructions.)
+building directly from SVN, read the README.svn for more instructions.)
Below we detail the GnuCash specific bits.
Prior to building GnuCash, you will have to obtain and install the
commit 38527d08f1c58afeb27ac6ab08bca4487f906ec5
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 13 11:52:40 2016 -0800
Bug 775912 - Tips of the Day shows content only once very 3 times
Remove extra line-feeds from CMake generation of tips_of_the_day.list. They're unneeded and mess up windows parsing the file.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 1c6c9c2..57f6dfe 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -44,14 +44,9 @@ EXECUTE_PROCESS(
FILE(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp TIP_OF_THE_DAY_LINES)
SET(TOTD_OUTPUT "")
-SET(FIRST_LINE TRUE)
FOREACH(line ${TIP_OF_THE_DAY_LINES})
STRING(REGEX REPLACE "^ *\"" "" line2 "${line}")
STRING(REGEX REPLACE "\" *$" "" line3 "${line2}")
- IF (NOT FIRST_LINE)
- LIST(APPEND TOTD_OUTPUT "\n\n")
- ENDIF()
- SET(FIRST_LINE FALSE)
LIST(APPEND TOTD_OUTPUT "${line3}\n")
ENDFOREACH()
commit 3ed1c7616df3b828f50165a0b68b5c16a4d17480
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 11 17:21:28 2016 -0800
Remove QIF importer error “Dates earlier than 1970 are not supportedâ€.
Because they are. The parser can’t figure out years earlier than 1930,
but that’s not really a major concern.
diff --git a/src/import-export/qif-imp/qif-to-gnc.scm b/src/import-export/qif-imp/qif-to-gnc.scm
index 48bed59..519d6e9 100644
--- a/src/import-export/qif-imp/qif-to-gnc.scm
+++ b/src/import-export/qif-imp/qif-to-gnc.scm
@@ -481,15 +481,7 @@
"Missing transaction date."
#f
#f))
- ((< (list-ref qif-date 2) 1970)
- (qif-import:log progress-dialog
- "qif-import:qif-xtn-to-gnc-xtn"
- (_ "Dates earlier than 1970 are not supported."))
- (throw 'bad-date
- "qif-import:qif-xtn-to-gnc-xtn"
- "Invalid transaction year (~A)."
- (list (list-ref qif-date 2))
- #f))
+
(else
(apply xaccTransSetDate gnc-xtn (qif-xtn:date qif-xtn))))
commit 54beffd9367221402ff09fb8493e8112fe637732
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 11 16:32:15 2016 -0800
Bug 685329 - Crashes on non-existent date
Log an error instead of crashing. The transaction will be imported with
today’s date.
diff --git a/src/engine/Transaction.c b/src/engine/Transaction.c
index 9547eb3..c43812f 100644
--- a/src/engine/Transaction.c
+++ b/src/engine/Transaction.c
@@ -1973,9 +1973,15 @@ xaccTransSetDate (Transaction *trans, int day, int mon, int year)
GDate *date;
if (!trans) return;
date = g_date_new_dmy(day, mon, year);
- g_assert(g_date_valid(date));
+ if (!g_date_valid(date))
+ {
+ PWARN("Attempted to set invalid date %d-%d-%d; set today's date instead.",
+ year, mon, day);
+ g_free(date);
+ date = gnc_g_date_new_today();
+ }
xaccTransSetDatePostedGDate(trans, *date);
- g_date_free(date);
+ g_free(date);
}
void
commit 78b41f7ac14d1a19f588e1d9ef6cb4a10bb276b7
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 11 15:23:55 2016 -0800
Bug 772369 - Replace use of guile's internal date/time functions
with our own implementation of gnc-date.
diff --git a/src/app-utils/date-utilities.scm b/src/app-utils/date-utilities.scm
index 940a651..03faa8f 100644
--- a/src/app-utils/date-utilities.scm
+++ b/src/app-utils/date-utilities.scm
@@ -35,10 +35,10 @@
(cons secs 0))
(define (gnc:timepair->date tp)
- (localtime (gnc:timepair->secs tp)))
+ (gnc-localtime (gnc:timepair->secs tp)))
(define (gnc:date->timepair date)
- (gnc:secs->timepair (car (mktime date))))
+ (gnc:secs->timepair (gnc-mktime date)))
(define (gnc:timepair? date)
(and (number? (car date))
@@ -143,15 +143,15 @@
;; convert a date in seconds since 1970 into # of years since 1970 as
;; a fraction.
(define (gnc:date-to-year-fraction caltime)
- (let ((lt (localtime caltime)))
+ (let ((lt (gnc-localtime caltime)))
(+ (- (gnc:date-get-year lt) 1970)
(/ (- (gnc:date-get-year-day lt) 1.0)
(* 1.0 (gnc:days-in-year (gnc:date-get-year lt)))))))
;; return the number of years (in floating point format) between two dates.
(define (gnc:date-year-delta caltime1 caltime2)
- (let* ((lt1 (localtime caltime1))
- (lt2 (localtime caltime2))
+ (let* ((lt1 (gnc-localtime caltime1))
+ (lt2 (gnc-localtime caltime2))
(day1 (gnc:date-get-year-day lt1))
(day2 (gnc:date-get-year-day lt2))
(year1 (gnc:date-get-year lt1))
@@ -180,7 +180,7 @@
;; convert a date in seconds since 1970 into # of months since 1970
(define (gnc:date-to-month-fraction caltime)
- (let ((lt (localtime caltime)))
+ (let ((lt (gnc-localtime caltime)))
(+ (* 12 (- (gnc:date-get-year lt) 1970.0))
(gnc:date-get-month lt) -1
(/ (- (gnc:date-get-month-day lt) 1.0) (gnc:days-in-month
@@ -315,7 +315,7 @@
; Note: use of eval is evil... by making this a generator function,
; each delta function gets its own instance of Zero Date
(define (make-zdate)
- (let ((zd (localtime 0)))
+ (let ((zd (gnc-localtime (current-time))))
(set-tm:hour zd 0)
(set-tm:min zd 0)
(set-tm:sec zd 0)
@@ -479,7 +479,7 @@
(gnc:reldate-get-desc rel-date-info)))
(define (gnc:get-start-cal-year)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 0)
(set-tm:min now 0)
(set-tm:hour now 0)
@@ -489,7 +489,7 @@
(gnc:date->timepair now)))
(define (gnc:get-end-cal-year)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 59)
(set-tm:min now 59)
(set-tm:hour now 23)
@@ -499,7 +499,7 @@
(gnc:date->timepair now)))
(define (gnc:get-start-prev-year)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 0)
(set-tm:min now 0)
(set-tm:hour now 0)
@@ -510,7 +510,7 @@
(gnc:date->timepair now)))
(define (gnc:get-end-prev-year)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 59)
(set-tm:min now 59)
(set-tm:hour now 23)
@@ -521,7 +521,7 @@
(gnc:date->timepair now)))
(define (gnc:get-start-next-year)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 0)
(set-tm:min now 0)
(set-tm:hour now 0)
@@ -532,7 +532,7 @@
(gnc:date->timepair now)))
(define (gnc:get-end-next-year)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 59)
(set-tm:min now 59)
(set-tm:hour now 23)
@@ -549,7 +549,7 @@
(gnc:secs->timepair (gnc-accounting-period-fiscal-end)))
(define (gnc:get-start-this-month)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 0)
(set-tm:min now 0)
(set-tm:hour now 0)
@@ -558,7 +558,7 @@
(gnc:date->timepair now)))
(define (gnc:get-end-this-month)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 59)
(set-tm:min now 59)
(set-tm:hour now 23)
@@ -568,7 +568,7 @@
(gnc:date->timepair now)))
(define (gnc:get-start-prev-month)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 0)
(set-tm:min now 0)
(set-tm:hour now 0)
@@ -582,7 +582,7 @@
(gnc:date->timepair now)))
(define (gnc:get-end-prev-month)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 59)
(set-tm:min now 59)
(set-tm:hour now 23)
@@ -597,7 +597,7 @@
(gnc:date->timepair now)))
(define (gnc:get-start-next-month)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 0)
(set-tm:min now 0)
(set-tm:hour now 0)
@@ -611,7 +611,7 @@
(gnc:date->timepair now)))
(define (gnc:get-end-next-month)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 59)
(set-tm:min now 59)
(set-tm:hour now 23)
@@ -626,7 +626,7 @@
(gnc:date->timepair now)))
(define (gnc:get-start-current-quarter)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 0)
(set-tm:min now 0)
(set-tm:hour now 0)
@@ -636,7 +636,7 @@
(gnc:date->timepair now)))
(define (gnc:get-end-current-quarter)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 59)
(set-tm:min now 59)
(set-tm:hour now 23)
@@ -648,7 +648,7 @@
(gnc:date->timepair now)))
(define (gnc:get-start-prev-quarter)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 0)
(set-tm:min now 0)
(set-tm:hour now 0)
@@ -663,7 +663,7 @@
(gnc:date->timepair now)))
(define (gnc:get-end-prev-quarter)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 59)
(set-tm:min now 59)
(set-tm:hour now 23)
@@ -679,7 +679,7 @@
(gnc:date->timepair now)))
(define (gnc:get-start-next-quarter)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 0)
(set-tm:min now 0)
(set-tm:hour now 0)
@@ -693,7 +693,7 @@
(gnc:date->timepair now)))
(define (gnc:get-end-next-quarter)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set-tm:sec now 59)
(set-tm:min now 59)
(set-tm:hour now 23)
@@ -712,7 +712,7 @@
(cons (current-time) 0))
(define (gnc:get-one-month-ago)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(if (= (tm:mon now) 0)
(begin
(set-tm:mon now 11)
@@ -726,7 +726,7 @@
(gnc:date->timepair now))))
(define (gnc:get-three-months-ago)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(if (< (tm:mon now) 3)
(begin
(set:tm-mon now (+ (tm:mon now) 12))
@@ -740,7 +740,7 @@
(gnc:date->timepair now))))
(define (gnc:get-six-months-ago)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(if (< (tm:mon now) 6)
(begin
(set:tm-mon now (+ (tm:mon now) 12))
@@ -754,7 +754,7 @@
(gnc:date->timepair now))))
(define (gnc:get-one-year-ago)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set:tm-year now (- (tm:year now) 1))
(let ((month-days (gnc:days-in-month (+ (tm:mon now) 1)
(+ (tm:year now) 1900))))
@@ -764,7 +764,7 @@
(gnc:date->timepair now))))
(define (gnc:get-one-month-ahead)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(if (= (tm:mon now) 11)
(begin
(set-tm:mon now 0)
@@ -778,7 +778,7 @@
(gnc:date->timepair now))))
(define (gnc:get-three-months-ahead)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(if (> (tm:mon now) 8)
(begin
(set:tm-mon now (- (tm:mon now) 9))
@@ -792,7 +792,7 @@
(gnc:date->timepair now))))
(define (gnc:get-six-months-ahead)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(if (> (tm:mon now) 5)
(begin
(set:tm-mon now (- (tm:mon now) 6))
@@ -806,7 +806,7 @@
(gnc:date->timepair now))))
(define (gnc:get-one-year-ahead)
- (let ((now (localtime (current-time))))
+ (let ((now (gnc-localtime (current-time))))
(set:tm-year now (+ (tm:year now) 1))
(let ((month-days (gnc:days-in-month (+ (tm:mon now) 1)
(+ (tm:year now) 1900))))
diff --git a/src/base-typemaps.i b/src/base-typemaps.i
index 1072fe6..727949f 100644
--- a/src/base-typemaps.i
+++ b/src/base-typemaps.i
@@ -67,6 +67,53 @@ typedef char gchar;
%typemap(in) gint64 " $1 = scm_to_int64($input); "
%typemap(out) gint64 " $result = scm_from_int64($1); "
+%typemap(in) time64 " $1 = scm_to_int64($input); "
+%typemap(out) time64 " $result = scm_from_int64($1); "
+%typemap(in) time64 * (time64 t) "t = scm_to_int64($input); $1 = &t;"
+%typemap(out) time64 * " $result = ($1) ? scm_from_int64(*($1)) : SCM_BOOL_F; "
+
+%typemap(in) struct tm * {
+ SCM tm = $input;
+ struct tm t = {
+ scm_to_int(SCM_SIMPLE_VECTOR_REF(tm, 0)),
+ scm_to_int(SCM_SIMPLE_VECTOR_REF(tm, 1)),
+ scm_to_int(SCM_SIMPLE_VECTOR_REF(tm, 2)),
+ scm_to_int(SCM_SIMPLE_VECTOR_REF(tm, 3)),
+ scm_to_int(SCM_SIMPLE_VECTOR_REF(tm, 4)),
+ scm_to_int(SCM_SIMPLE_VECTOR_REF(tm, 5)),
+ scm_to_int(SCM_SIMPLE_VECTOR_REF(tm, 6)),
+ scm_to_int(SCM_SIMPLE_VECTOR_REF(tm, 7)),
+ scm_to_int(SCM_SIMPLE_VECTOR_REF(tm, 8)),
+#ifdef HAVE_STRUCT_TM_GMTOFF
+ scm_to_int(SCM_SIMPLE_VECTOR_REF(tm, 9)),
+ scm_to_locale_string(SCM_SIMPLE_VECTOR_REF(tm, 10)),
+#endif
+ };
+ $1 = &t;
+ }
+
+%typemap(out) struct tm * {
+ SCM tm = scm_c_make_vector(11, SCM_UNDEFINED);
+ struct tm* t = $1;
+ SCM_SIMPLE_VECTOR_SET(tm, 0, scm_from_int(t->tm_sec));
+ SCM_SIMPLE_VECTOR_SET(tm, 1, scm_from_int(t->tm_min));
+ SCM_SIMPLE_VECTOR_SET(tm, 2, scm_from_int(t->tm_hour));
+ SCM_SIMPLE_VECTOR_SET(tm, 3, scm_from_int(t->tm_mday));
+ SCM_SIMPLE_VECTOR_SET(tm, 4, scm_from_int(t->tm_mon));
+ SCM_SIMPLE_VECTOR_SET(tm, 5, scm_from_int(t->tm_year));
+ SCM_SIMPLE_VECTOR_SET(tm, 6, scm_from_int(t->tm_wday));
+ SCM_SIMPLE_VECTOR_SET(tm, 7, scm_from_int(t->tm_yday));
+ SCM_SIMPLE_VECTOR_SET(tm, 8, scm_from_int(t->tm_isdst));
+#ifdef HAVE_STRUCT_TM_GMTOFF
+ SCM_SIMPLE_VECTOR_SET(tm, 9, scm_from_long(t->tm_gmtoff));
+ SCM_SIMPLE_VECTOR_SET(tm, 10, scm_from_locale_string(t->tm_zone));
+#else
+ SCM_SIMPLE_VECTOR_SET(tm, 9, scm_from_long(0));
+ SCM_SIMPLE_VECTOR_SET(tm, 10, scm_from_locale_string("GMT"));
+#endif
+ $result = tm;
+ }
+
%define GLIST_HELPER_INOUT(ListType, ElemSwigType)
%typemap(in) ListType * {
SCM list = $input;
diff --git a/src/engine/test/test-extras.scm b/src/engine/test/test-extras.scm
index 0541ce5..06e0ebd 100644
--- a/src/engine/test/test-extras.scm
+++ b/src/engine/test/test-extras.scm
@@ -138,15 +138,15 @@
(let ((txn (xaccMallocTransaction (gnc-get-current-book)))
(split-1 (xaccMallocSplit (gnc-get-current-book)))
(split-2 (xaccMallocSplit (gnc-get-current-book)))
- (localtime (gnc:timepair->date date)))
+ (gnc-localtime (gnc:timepair->date date)))
(with-transaction txn
(lambda ()
(xaccTransSetDescription txn (env-string env "ponies"))
(xaccTransSetCurrency txn (gnc-default-report-currency))
(xaccTransSetDate txn
- (gnc:date-get-month-day localtime)
- (gnc:date-get-month localtime)
- (gnc:date-get-year localtime))
+ (gnc:date-get-month-day gnc-localtime)
+ (gnc:date-get-month gnc-localtime)
+ (gnc:date-get-year gnc-localtime))
(xaccSplitSetParent split-1 txn)
(xaccSplitSetParent split-2 txn)
(xaccSplitSetAccount split-1 credit)
diff --git a/src/engine/test/test-split.scm b/src/engine/test/test-split.scm
index 96dab5e..7c14389 100644
--- a/src/engine/test/test-split.scm
+++ b/src/engine/test/test-split.scm
@@ -12,7 +12,7 @@
(define (test-split-in-list?)
(let* ((env (create-test-env))
- (today (gnc:date->timepair (localtime (current-time))))
+ (today (gnc:date->timepair (gnc-localtime (current-time))))
(account-alist (env-create-test-accounts env))
(bank-account (cdr (assoc "Bank" account-alist)))
(expense-account (cdr (assoc "Expenses" account-alist)))
diff --git a/src/import-export/qif-imp/qif-parse.scm b/src/import-export/qif-imp/qif-parse.scm
index ca6bf9f..dab31f6 100644
--- a/src/import-export/qif-imp/qif-parse.scm
+++ b/src/import-export/qif-imp/qif-parse.scm
@@ -139,11 +139,8 @@
;; 2000 => 100.) We also want to allow full year specifications,
;; (i.e. 1999, 2001, etc) and there's a point at which you can't
;; determine which is which. this should eventually be another
- ;; field in the qif-file struct but not yet. mktime in scheme
- ;; doesn't deal with dates before December 14, 1901, at least for
- ;; now, so let's give ourselves until at least 3802 before this
- ;; does the wrong thing.
- ((and (integer? post-read-value)
+ ;; field in the qif-file struct but not yet.
+ ((and (integer? post-read-value)
(< post-read-value 1902))
(set! y2k-fixed-value (+ 1900 post-read-value)))
@@ -643,7 +640,7 @@
(if all-ok parsed #f)))
(define (qif-parse:print-date date-list)
- (let ((tm (localtime (current-time))))
+ (let ((tm (gnc-localtime (current-time))))
(set-tm:mday tm (car date-list))
(set-tm:mon tm (- (cadr date-list) 1))
(set-tm:year tm (- (caddr date-list) 1900))
diff --git a/src/report/business-reports/easy-invoice.scm b/src/report/business-reports/easy-invoice.scm
index 709f863..fd07ce9 100644
--- a/src/report/business-reports/easy-invoice.scm
+++ b/src/report/business-reports/easy-invoice.scm
@@ -813,7 +813,7 @@
(_ "INVOICE NOT POSTED")
"</font>"))))
;(add-html! document (strftime (opt-val "Text" "Today Date Format")
- ; (localtime (car (gnc:get-today))))))
+ ; (gnc-localtime (car (gnc:get-today))))))
(make-break! document)
diff --git a/src/report/business-reports/fancy-invoice.scm b/src/report/business-reports/fancy-invoice.scm
index b7c1af0..0721c1d 100644
--- a/src/report/business-reports/fancy-invoice.scm
+++ b/src/report/business-reports/fancy-invoice.scm
@@ -670,7 +670,7 @@
;; for the invoice date/due date fields
;; I could have taken the format from the report options, but... ;)
(string-expand (strftime (gnc-default-strftime-date-format)
- (localtime (car date)))
+ (gnc-localtime (car date)))
#\space " ")
;;(string-expand (gnc-print-date date) #\space " ")
)))
@@ -762,7 +762,7 @@
;; (gnc:html-table-append-row! table (list
;; (strftime
;; date-format
-;; (localtime (car (gnc:get-today))))))
+;; (gnc-localtime (car (gnc:get-today))))))
table))
(define (make-break! document)
diff --git a/src/report/business-reports/invoice.scm b/src/report/business-reports/invoice.scm
index 2baf6bb..7bcbee6 100644
--- a/src/report/business-reports/invoice.scm
+++ b/src/report/business-reports/invoice.scm
@@ -629,7 +629,7 @@
(gnc:html-table-append-row! table (list
(strftime
date-format
- (localtime (car (gnc:get-today))))))
+ (gnc-localtime (car (gnc:get-today))))))
table))
(define (make-break! document)
diff --git a/src/report/business-reports/job-report.scm b/src/report/business-reports/job-report.scm
index eb5f158..1356240 100644
--- a/src/report/business-reports/job-report.scm
+++ b/src/report/business-reports/job-report.scm
@@ -537,7 +537,7 @@
(gnc:html-table-append-row! table (list
(strftime
date-format
- (localtime (car (gnc:get-today))))))
+ (gnc-localtime (car (gnc:get-today))))))
table))
(define (make-break! document)
diff --git a/src/report/business-reports/owner-report.scm b/src/report/business-reports/owner-report.scm
index 03598de..c6ee4c2 100644
--- a/src/report/business-reports/owner-report.scm
+++ b/src/report/business-reports/owner-report.scm
@@ -685,7 +685,7 @@
(gnc:html-table-append-row! table (list
(strftime
date-format
- (localtime (car (gnc:get-today))))))
+ (gnc-localtime (car (gnc:get-today))))))
table))
(define (make-break! document)
diff --git a/src/report/locale-specific/us/taxtxf-de_DE.scm b/src/report/locale-specific/us/taxtxf-de_DE.scm
index 2565cec..fafa1c3 100644
--- a/src/report/locale-specific/us/taxtxf-de_DE.scm
+++ b/src/report/locale-specific/us/taxtxf-de_DE.scm
@@ -101,7 +101,7 @@
(set-tm:isdst result -1)
result))
-(define tax-day (cons (car (mktime bdtm)) 0))
+(define tax-day (cons (gnc-mktime bdtm) 0))
(define after-tax-day (gnc:timepair-later tax-day today))
@@ -322,10 +322,10 @@
(let* ((type (xaccAccountGetType account))
(code (gnc:account-get-txf-code account))
(date-str (if date
- (strftime "%d.%m.%Y" (localtime (car date)))
+ (strftime "%d.%m.%Y" (gnc-localtime (car date)))
#f))
(x-date-str (if x-date
- (strftime "%d.%m.%Y" (localtime (car x-date)))
+ (strftime "%d.%m.%Y" (gnc-localtime (car x-date)))
#f))
;; Only formats 1,3 implemented now! Others are treated as 1.
(format (gnc:get-txf-format code (eq? type ACCT-TYPE-INCOME)))
@@ -410,7 +410,7 @@
(define (render-level-x-account table level max-level account lx-value
suppress-0 full-names txf-date)
(let* ((account-name (if txf-date ; special split
- (strftime "%d.%m.%Y" (localtime (car txf-date)))
+ (strftime "%d.%m.%Y" (gnc-localtime (car txf-date)))
(if (or full-names (equal? level 1))
(gnc-account-get-full-name account)
(xaccAccountGetName account))))
@@ -546,7 +546,7 @@
((4th-est 4th-last) ; Oct 1
(set-tm:mon bdtm 9))))
(set-tm:isdst bdtm -1)
- (cons (car (mktime bdtm)) 0))))
+ (cons (gnc-mktime bdtm) 0))))
(to-value (gnc:timepair-end-day-time
(let ((bdtm from-date))
@@ -589,7 +589,7 @@
(else
(set! bdtm (gnc:timepair->date to-value)))))
(set-tm:isdst bdtm -1)
- (cons (car (mktime bdtm)) 0))))
+ (cons (gnc-mktime bdtm) 0))))
(txf-feedback-str-lst '())
(doc (gnc:make-html-document))
@@ -602,8 +602,8 @@
(txf-special-split? (gnc:account-get-txf-code account)))
(let*
((full-year?
- (let ((bdto (localtime (car to-value)))
- (bdfrom (localtime (car from-value))))
+ (let ((bdto (gnc-localtime (car to-value)))
+ (bdfrom (gnc-localtime (car from-value))))
(and (equal? (tm:year bdto) (tm:year bdfrom))
(equal? (tm:mon bdfrom) 0)
(equal? (tm:mday bdfrom) 1)
@@ -618,7 +618,7 @@
(set-tm:mday bdtm 1) ; 01
(set-tm:mon bdtm 2) ; Mar
(set-tm:isdst bdtm -1)
- (cons (car (mktime bdtm)) 0))
+ (cons (gnc-mktime bdtm) 0))
from-value))
(to-est (if full-year?
(let* ((bdtm (gnc:timepair->date
@@ -628,7 +628,7 @@
(set-tm:mon bdtm 1) ; Feb
(set-tm:year bdtm (+ (tm:year bdtm) 1))
(set-tm:isdst bdtm -1)
- (cons (car (mktime bdtm)) 0))
+ (cons (gnc-mktime bdtm) 0))
to-value)))
(list from-est to-est full-year?))
#f))
@@ -764,11 +764,11 @@
;; Ignore
'())))
- (let ((from-date (strftime "%d.%m.%Y" (localtime (car from-value))))
- (to-date (strftime "%d.%m.%Y" (localtime (car to-value))))
- (to-year (strftime "%Y" (localtime (car to-value))))
+ (let ((from-date (strftime "%d.%m.%Y" (gnc-localtime (car from-value))))
+ (to-date (strftime "%d.%m.%Y" (gnc-localtime (car to-value))))
+ (to-year (strftime "%Y" (gnc-localtime (car to-value))))
(today-date (strftime "%d.%m.%Y"
- (localtime
+ (gnc-localtime
(car (timespecCanonicalDayTime
(cons (current-time) 0))))))
(tax-nr (or
diff --git a/src/report/locale-specific/us/taxtxf.scm b/src/report/locale-specific/us/taxtxf.scm
index 7803e54..67298ca 100644
--- a/src/report/locale-specific/us/taxtxf.scm
+++ b/src/report/locale-specific/us/taxtxf.scm
@@ -132,7 +132,7 @@
(set-tm:isdst result -1)
result))
-(define tax-day (cons (car (mktime bdtm)) 0))
+(define tax-day (cons (gnc-mktime bdtm) 0))
(define after-tax-day (gnc:timepair-later tax-day today))
@@ -552,10 +552,10 @@
(if (and txf?
(not (gnc-numeric-zero-p account-value)))
(let* ((date-str (if date
- (strftime "%m/%d/%Y" (localtime (car date)))
+ (strftime "%m/%d/%Y" (gnc-localtime (car date)))
#f))
(x-date-str (if x-date
- (strftime "%m/%d/%Y" (localtime (car x-date)))
+ (strftime "%m/%d/%Y" (gnc-localtime (car x-date)))
#f))
;; Only formats 1,3,4,6 implemented now! Others are treated as 1.
(format (get-acct-txf-info 'format type code))
@@ -822,7 +822,7 @@
(string-append
" on "
(strftime "%Y-%b-%d"
- (localtime (car pricedb-lookup-price-time)))
+ (gnc-localtime (car pricedb-lookup-price-time)))
")"
)
""))
@@ -975,7 +975,7 @@
"Not Available"))
(list (gnc:make-html-table-cell/markup
"text-cell-center"
- (strftime "%Y-%b-%d" (localtime
+ (strftime "%Y-%b-%d" (gnc-localtime
(car trans-date)))))
(list (gnc:make-html-table-cell/markup
"number-cell-bot"
@@ -1261,7 +1261,7 @@
""
(string-append "Balance on "
(strftime "%Y-%b-%d"
- (localtime (car
+ (gnc-localtime (car
(gnc:timepair-previous-day
from-value))))
(if (string=? curr-conv-note "")
@@ -1495,7 +1495,7 @@
(gnc:make-html-table-cell/markup
"date-cell"
(strftime "%Y-%b-%d"
- (localtime (car trans-date)))))
+ (gnc-localtime (car trans-date)))))
(gnc:html-table-set-style! num-table "table"
'attribute (list "border" "0")
'attribute (list "cellspacing" "0")
@@ -1686,14 +1686,14 @@
#f
(if (txf-beg-bal-only? tax-code)
(string-append "Balance on "
- (strftime "%Y-%b-%d" (localtime (car
+ (strftime "%Y-%b-%d" (gnc-localtime (car
(gnc:timepair-previous-day
from-value))))
" For "
)
(string-append "Balance on "
(strftime "%Y-%b-%d"
- (localtime (car to-value)))
+ (gnc-localtime (car to-value)))
" For "
)
)
@@ -2118,7 +2118,7 @@
((4th-est 4th-last) ; Oct 1
(set-tm:mon bdtm 9))))
(set-tm:isdst bdtm -1)
- (cons (car (mktime bdtm)) 0))))
+ (cons (gnc-mktime bdtm) 0))))
(to-value (gnc:timepair-end-day-time
(let ((bdtm from-date))
@@ -2162,7 +2162,7 @@
(else
(set! bdtm (gnc:timepair->date to-value)))))
(set-tm:isdst bdtm -1)
- (cons (car (mktime bdtm)) 0))))
+ (cons (gnc-mktime bdtm) 0))))
(form-line-acct-header-printed? #f)
(form-schedule-header-printed? #f)
@@ -2179,8 +2179,8 @@
(txf-special-date? (gnc:account-get-txf-code account)))
(let*
((full-year?
- (let ((bdto (localtime (car to-value)))
- (bdfrom (localtime (car from-value))))
+ (let ((bdto (gnc-localtime (car to-value)))
+ (bdfrom (gnc-localtime (car from-value))))
(and (equal? (tm:year bdto) (tm:year bdfrom))
(equal? (tm:mon bdfrom) 0)
(equal? (tm:mday bdfrom) 1)
@@ -2195,7 +2195,7 @@
(set-tm:mday bdtm 1) ; 01
(set-tm:mon bdtm 2) ; Mar
(set-tm:isdst bdtm -1)
- (cons (car (mktime bdtm)) 0))
+ (cons (gnc-mktime bdtm) 0))
from-value))
(to-est (if full-year?
(let* ((bdtm (gnc:timepair->date
@@ -2205,7 +2205,7 @@
(set-tm:mon bdtm 1) ; Feb
(set-tm:year bdtm (+ (tm:year bdtm) 1))
(set-tm:isdst bdtm -1)
- (cons (car (mktime bdtm)) 0))
+ (cons (gnc-mktime bdtm) 0))
to-value)))
(list from-est to-est full-year?))
#f))
@@ -2393,13 +2393,13 @@
) ;; end of let*
)
- (let ((from-date (strftime "%Y-%b-%d" (localtime (car from-value))))
- (to-date (strftime "%Y-%b-%d" (localtime (car to-value))))
+ (let ((from-date (strftime "%Y-%b-%d" (gnc-localtime (car from-value))))
+ (to-date (strftime "%Y-%b-%d" (gnc-localtime (car to-value))))
(today-date (strftime "D%m/%d/%Y"
- (localtime
+ (gnc-localtime
(car (timespecCanonicalDayTime
(cons (current-time) 0))))))
- (tax-year (strftime "%Y" (localtime (car from-value))))
+ (tax-year (strftime "%Y" (gnc-localtime (car from-value))))
(tax-entity-type (gnc-get-current-book-tax-type))
(tax-entity-type-valid? #f)
(prior-form-schedule "")
diff --git a/src/report/report-system/test/test-report-utilities.scm b/src/report/report-system/test/test-report-utilities.scm
index 174f647..d6d26ac 100644
--- a/src/report/report-system/test/test-report-utilities.scm
+++ b/src/report/report-system/test/test-report-utilities.scm
@@ -19,7 +19,7 @@
(define (test-account-get-trans-type-splits-interval)
(let* ((env (create-test-env))
- (ts-now (localtime (current-time)))
+ (ts-now (gnc-localtime (current-time)))
(test-day (tm:mday ts-now))
(test-month (+ 1 (tm:mon ts-now)))
(test-year (+ 1900 (tm:year ts-now)))
diff --git a/src/report/standard-reports/test/test-cash-flow.scm b/src/report/standard-reports/test/test-cash-flow.scm
index 0b6c5a8..47433b0 100644
--- a/src/report/standard-reports/test/test-cash-flow.scm
+++ b/src/report/standard-reports/test/test-cash-flow.scm
@@ -30,7 +30,7 @@
(bank-account (cdr (assoc "Bank" account-alist)))
(wallet-account (cdr (assoc "Wallet" account-alist)))
(expense-account (cdr (assoc "Expenses" account-alist)))
- (today (localtime (current-time)))
+ (today (gnc-localtime (current-time)))
(to-date-tp (gnc-dmy2timespec-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today))))
(from-date-tp (NDayDelta to-date-tp 1))
(exchange-fn (lambda (currency amount date) amount))
@@ -66,7 +66,7 @@
(bank-account (cdr (assoc "Bank" account-alist)))
(wallet-account (cdr (assoc "Wallet" account-alist)))
(expense-account (cdr (assoc "Expenses" account-alist)))
- (today (localtime (current-time)))
+ (today (gnc-localtime (current-time)))
(to-date-tp (gnc-dmy2timespec-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today))))
(from-date-tp (NDayDelta to-date-tp 1))
(exchange-fn (lambda (currency amount date) amount))
@@ -98,7 +98,7 @@
(bank-account (cdr (assoc "Bank" account-alist)))
(wallet-account (cdr (assoc "Wallet" account-alist)))
(expense-account (cdr (assoc "Expenses" account-alist)))
- (today (localtime (current-time)))
+ (today (gnc-localtime (current-time)))
(to-date-tp (gnc-dmy2timespec-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today))))
(from-date-tp (NDayDelta to-date-tp 1))
(exchange-fn (lambda (currency amount date) amount))
diff --git a/src/report/utility-reports/hello-world.scm b/src/report/utility-reports/hello-world.scm
index 118f82c..6cf6109 100644
--- a/src/report/utility-reports/hello-world.scm
+++ b/src/report/utility-reports/hello-world.scm
@@ -273,12 +273,12 @@ option like this.")
;; these are samples of different date options. for a simple
;; date with day, month, and year but no time you should use
;; gnc-print-date
- (let ((time-string (strftime "%X" (localtime (current-time))))
- (date-string (strftime "%x" (localtime (car date-val))))
- (date-string2 (strftime "%x %X" (localtime (car date2-val))))
- (rel-date-string (strftime "%x" (localtime (car rel-date-val))))
+ (let ((time-string (strftime "%X" (gnc-localtime (current-time))))
+ (date-string (strftime "%x" (gnc-localtime (car date-val))))
+ (date-string2 (strftime "%x %X" (gnc-localtime (car date2-val))))
+ (rel-date-string (strftime "%x" (gnc-localtime (car rel-date-val))))
(combo-date-string
- (strftime "%x" (localtime (car combo-date-val)))))
+ (strftime "%x" (gnc-localtime (car combo-date-val)))))
;; Here's where we fill the report document with content. We
;; do this by adding 'html objects' such as text, tables, and
commit ad208810f0313f111529e1605f72adf32b68b57f
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 11 09:58:54 2016 -0800
Bug 773808 - Export Report Crash
It's possible for the GtkFileChooserDialog to return a NULL filename,
so defend against that.
diff --git a/src/gnome-utils/gnc-file.c b/src/gnome-utils/gnc-file.c
index ed01fa9..2e61c9a 100644
--- a/src/gnome-utils/gnc-file.c
+++ b/src/gnome-utils/gnc-file.c
@@ -174,12 +174,15 @@ gnc_file_dialog (const char * title,
{
/* look for constructs like postgres://foo */
internal_name = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER (file_box));
- if (strstr (internal_name, "file://") == internal_name)
+ if (internal_name != NULL)
{
- /* nope, a local file name */
- internal_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (file_box));
+ if (strstr (internal_name, "file://") == internal_name)
+ {
+ /* nope, a local file name */
+ internal_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (file_box));
+ }
+ file_name = g_strdup(internal_name);
}
- file_name = g_strdup(internal_name);
}
gtk_widget_destroy(GTK_WIDGET(file_box));
LEAVE("%s", file_name ? file_name : "(null)");
commit ad1ba561053d7d73cd983184e70956c8bc2df8a0
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Dec 10 15:08:03 2016 -0800
Bug 772484 - Segfault on Transaction edit
Fix a couple of places where we can pass a NULL GDateTime* if the
database contains a bad date.
diff --git a/src/libqof/qof/gnc-date.c b/src/libqof/qof/gnc-date.c
index 27c52ff..527671d 100644
--- a/src/libqof/qof/gnc-date.c
+++ b/src/libqof/qof/gnc-date.c
@@ -431,7 +431,9 @@ gnc_g_date_time_new_from_timespec_local (Timespec ts)
{
GDateTime *gdt1 = gnc_g_date_time_new_from_unix_local (ts.tv_sec);
double nsecs = ((double)ts.tv_nsec + 0.5)/ 1000000000.0L;
- GDateTime *gdt2 = g_date_time_add_seconds (gdt1, nsecs);
+ GDateTime *gdt2 = NULL;
+ g_return_val_if_fail (gdt1 != NULL, NULL);
+ gdt2 = g_date_time_add_seconds (gdt1, nsecs);
g_date_time_unref (gdt1);
g_assert (g_date_time_to_unix (gdt2) == ts.tv_sec + (nsecs >= 1.0 ? (gint64)nsecs : 0));
return gdt2;
@@ -1486,8 +1488,11 @@ gnc_iso8601_to_timespec_gmt(const char *str)
gdt = g_date_time_new_utc (year, month, day, hour, minute, second);
}
- time.tv_sec = g_date_time_to_unix (gdt);
- time.tv_nsec = g_date_time_get_microsecond (gdt) * 1000;
+ if (gdt != NULL)
+ {
+ time.tv_sec = g_date_time_to_unix (gdt);
+ time.tv_nsec = g_date_time_get_microsecond (gdt) * 1000;
+ }
g_date_time_unref (gdt);
return time;
}
commit fcd817a6bf44298173a0053e63bf8397c0381a21
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Dec 10 14:26:16 2016 -0800
Bug 774237 - FTBFS under some timezones (eg. GMT-14)
Fix the neutral offset calculations so that the fixed UTC time doesn't
change the date in the timezones near the international date line. Divide
offset by 60 instead of 3600 so that the Chatham Islands (GMT-12:45 with DST)
use 9:59 instead of 10:59 like the rest of NZ (GMT-12).
diff --git a/src/libqof/qof/gnc-date-p.h b/src/libqof/qof/gnc-date-p.h
index 80e064f..161f0ef 100644
--- a/src/libqof/qof/gnc-date-p.h
+++ b/src/libqof/qof/gnc-date-p.h
@@ -70,6 +70,7 @@ const char *qof_win32_get_time_format(QofWin32Picture picture);
typedef struct
{
void (*timespec_normalize) (Timespec *t);
+ GTimeZone* (*timezone_new_local) (void);
} Testfuncs;
Testfuncs *gnc_date_load_funcs (void);
diff --git a/src/libqof/qof/gnc-date.c b/src/libqof/qof/gnc-date.c
index d23d197..27c52ff 100644
--- a/src/libqof/qof/gnc-date.c
+++ b/src/libqof/qof/gnc-date.c
@@ -1581,16 +1581,17 @@ gnc_dmy2timespec_neutral (int day, int month, int year)
struct tm date;
Timespec ts = {0, 0};
GTimeZone *zone = gnc_g_time_zone_new_local();
- GDateTime *gdt = gnc_g_date_time_new_local (year, month, day, 12, 0, 0.0);
+ GDateTime *gdt = gnc_g_date_time_new_local (year, month, day, 10, 59, 0.0);
int interval = g_time_zone_find_interval (zone, G_TIME_TYPE_STANDARD,
g_date_time_to_unix(gdt));
- int offset = g_time_zone_get_offset(zone, interval) / 3600;
+ int offset = g_time_zone_get_offset(zone, interval) / 60;
+ int off_hr = (offset / 60) + (offset % 60 ? (offset < 0 ? -1 : 1) : 0);
g_date_time_unref (gdt);
memset (&date, 0, sizeof(struct tm));
date.tm_year = year - 1900;
date.tm_mon = month - 1;
date.tm_mday = day;
- date.tm_hour = offset < -11 ? -offset : offset > 13 ? 23 - offset : 10;
+ date.tm_hour = off_hr < -10 ? -off_hr : off_hr > 13 ? 23 - off_hr : 10;
date.tm_min = 59;
date.tm_sec = 0;
@@ -1813,5 +1814,6 @@ gnc_date_load_funcs (void)
{
Testfuncs *tf = g_slice_new (Testfuncs);
tf->timespec_normalize = timespec_normalize;
+ tf->timezone_new_local = gnc_g_time_zone_new_local;
return tf;
}
diff --git a/src/libqof/qof/test/test-gnc-date.c b/src/libqof/qof/test/test-gnc-date.c
index 6aefd3f..acd48f9 100644
--- a/src/libqof/qof/test/test-gnc-date.c
+++ b/src/libqof/qof/test/test-gnc-date.c
@@ -1972,14 +1972,30 @@ test_gnc_dmy2timespec_end (void)
g_date_time_unref (gdt4);
}
+static GDateTime*
+offset_adjust(GDateTime *gdt)
+{
+ Testfuncs *tf = gnc_date_load_funcs();
+ GTimeZone *zone = tf->timezone_new_local();
+ int interval = g_time_zone_find_interval(zone, G_TIME_TYPE_STANDARD,
+ g_date_time_to_unix(gdt));
+ int offset = g_time_zone_get_offset(zone, interval) / 60;
+ int off_hr = (offset / 60) + (offset % 60 ? (offset < 0 ? -1 : 1) : 0);
+ int correction = off_hr < -10 ? -10 - off_hr : off_hr > 13 ? 13 - off_hr : 0;
+ GDateTime* new_gdt = g_date_time_add_hours(gdt, correction);
+ g_date_time_unref(gdt);
+ g_slice_free(Testfuncs, tf);
+ return new_gdt;
+}
+
/*gnc_dmy2timespec_neutral*/
static void
test_gnc_dmy2timespec_neutral (void)
{
- GDateTime *gdt1 = gncdt.new_utc (1999, 7, 21, 10, 59, 0);
- GDateTime *gdt2 = gncdt.new_utc (1918, 3, 31, 10, 59, 0);
- GDateTime *gdt3 = gncdt.new_utc (1918, 4, 1, 10, 59, 0);
- GDateTime *gdt4 = gncdt.new_utc (2057, 11, 20, 10, 59, 0);
+ GDateTime *gdt1 = offset_adjust(gncdt.new_utc (1999, 7, 21, 10, 59, 0));
+ GDateTime *gdt2 = offset_adjust(gncdt.new_utc (1918, 3, 31, 10, 59, 0));
+ GDateTime *gdt3 = offset_adjust(gncdt.new_utc (1918, 4, 1, 10, 59, 0));
+ GDateTime *gdt4 = offset_adjust(gncdt.new_utc (2057, 11, 20, 10, 59, 0));
gint day, mon, yr;
Timespec t, r_t;
@@ -2132,10 +2148,10 @@ Timespec gdate_to_timespec (GDate d)// C: 7 in 6 Local: 0:0:0
static void
test_gdate_to_timespec (void)
{
- GDateTime *gdt1 = gncdt.new_utc (1999, 7, 21, 10, 59, 0);
- GDateTime *gdt2 = gncdt.new_utc (1918, 3, 31, 10, 59, 0);
- GDateTime *gdt3 = gncdt.new_utc (1918, 4, 1, 10, 59, 0);
- GDateTime *gdt4 = gncdt.new_utc (2057, 11, 20, 10, 59, 0);
+ GDateTime *gdt1 = offset_adjust(gncdt.new_utc (1999, 7, 21, 10, 59, 0));
+ GDateTime *gdt2 = offset_adjust(gncdt.new_utc (1918, 3, 31, 10, 59, 0));
+ GDateTime *gdt3 = offset_adjust(gncdt.new_utc (1918, 4, 1, 10, 59, 0));
+ GDateTime *gdt4 = offset_adjust(gncdt.new_utc (2057, 11, 20, 10, 59, 0));
gint day, mon, yr;
Timespec t, r_t;
@@ -2416,7 +2432,6 @@ test_suite_gnc_date (void)
{
_gnc_date_time_init (&gncdt);
-
GNC_TEST_ADD_FUNC (suitename, "gnc localtime", test_gnc_localtime);
GNC_TEST_ADD_FUNC (suitename, "gnc gmtime", test_gnc_gmtime);
GNC_TEST_ADD_FUNC (suitename, "gnc mktime", test_gnc_mktime);
commit fc3dc3e7a84ebed127e3d074e8db36aa10603b8f
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 9 16:09:33 2016 -0800
Bug 775385 - Confusing error message which includes the text "file file"
Remove the scheme from file URIs before displaying
error messages and change the one file error message that can show up in
database dialogs to say "file/URI foo" instead of "file foo".
diff --git a/src/gnome-utils/gnc-file.c b/src/gnome-utils/gnc-file.c
index 62b253b..ed01fa9 100644
--- a/src/gnome-utils/gnc-file.c
+++ b/src/gnome-utils/gnc-file.c
@@ -206,7 +206,12 @@ show_session_error (QofBackendError io_error,
else if (! gnc_uri_is_file_uri (newfile)) /* Hide the db password in error messages */
displayname = gnc_uri_normalize_uri ( newfile, FALSE);
else
- displayname = g_strdup (newfile);
+ {
+ /* Strip the protocol from the file name. */
+ char *uri = gnc_uri_normalize_uri(newfile, FALSE);
+ displayname = gnc_uri_get_path(uri);
+ g_free(uri);
+ }
switch (io_error)
{
@@ -366,7 +371,7 @@ show_session_error (QofBackendError io_error,
}
else
{
- fmt = _("The file %s could not be found.");
+ fmt = _("The file/URI %s could not be found.");
gnc_error_dialog (parent, fmt, displayname);
}
break;
commit 7b7c780a3615e8877af4ff5a90bb5db513701ce9
Merge: 57e7ba8 332bd3b
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 9 10:34:02 2016 -0800
Bug 775368 - "Average cost" price source problem
This series of changes modifies the Average Cost report function to
finding the average amount-weighted price of all transactions recording
a "buy" of the report commodity so that the correct amount is now
reported without the need of a capital gains split--though one is still
needed to get the Trial Balance report to balance.
Since book-wide averages are not what most users expect, it also changes
the default pricing option on all reports to "Nearest in Time", which is
what most confused users have selected after asking about it in the
mailing lists. This also fixes
Bug 340991 - Default price source for reports not good.
commit 332bd3bb3efeb4c09ca686aa445df554dc656092
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 9 10:33:28 2016 -0800
Change the default price-source from Average Cost to Nearest in Time.
Average cost is a counter-intuitive calculation for most users; Nearest in
Time is generally reported to produce the results that users expect.
diff --git a/src/report/standard-reports/account-piecharts.scm b/src/report/standard-reports/account-piecharts.scm
index 74fcae5..be025ea 100644
--- a/src/report/standard-reports/account-piecharts.scm
+++ b/src/report/standard-reports/account-piecharts.scm
@@ -104,7 +104,7 @@ balance at a given time"))
(gnc:options-add-price-source!
options gnc:pagename-general
- optname-price-source "c" 'average-cost)
+ optname-price-source "c" 'pricedb-nearest)
(if do-intervals?
(add-option
diff --git a/src/report/standard-reports/account-summary.scm b/src/report/standard-reports/account-summary.scm
index 53af64a..248b228 100644
--- a/src/report/standard-reports/account-summary.scm
+++ b/src/report/standard-reports/account-summary.scm
@@ -189,7 +189,7 @@
(gnc:options-add-price-source!
options pagename-commodities
- optname-price-source "b" 'average-cost)
+ optname-price-source "b" 'pricedb-nearest)
(add-option
(gnc:make-simple-boolean-option
diff --git a/src/report/standard-reports/balance-sheet.scm b/src/report/standard-reports/balance-sheet.scm
index d40bc16..ba2f5e4 100644
--- a/src/report/standard-reports/balance-sheet.scm
+++ b/src/report/standard-reports/balance-sheet.scm
@@ -205,7 +205,7 @@
(gnc:options-add-price-source!
options pagename-commodities
- optname-price-source "b" 'average-cost)
+ optname-price-source "b" 'pricedb-nearest)
(add-option
(gnc:make-simple-boolean-option
diff --git a/src/report/standard-reports/budget-balance-sheet.scm b/src/report/standard-reports/budget-balance-sheet.scm
index 266324f..d9aa5d4 100644
--- a/src/report/standard-reports/budget-balance-sheet.scm
+++ b/src/report/standard-reports/budget-balance-sheet.scm
@@ -168,7 +168,7 @@
(gnc:options-add-price-source!
options pagename-commodities
- optname-price-source "b" 'average-cost)
+ optname-price-source "b" 'pricedb-nearest)
(add-option
(gnc:make-simple-boolean-option
diff --git a/src/report/standard-reports/budget-income-statement.scm b/src/report/standard-reports/budget-income-statement.scm
index aa5052c..2042088 100644
--- a/src/report/standard-reports/budget-income-statement.scm
+++ b/src/report/standard-reports/budget-income-statement.scm
@@ -222,7 +222,7 @@
(gnc:options-add-price-source!
options pagename-commodities
- optname-price-source "b" 'average-cost)
+ optname-price-source "b" 'pricedb-nearest)
(add-option
(gnc:make-simple-boolean-option
diff --git a/src/report/standard-reports/budget.scm b/src/report/standard-reports/budget.scm
index c12a07b..b02d9e6 100644
--- a/src/report/standard-reports/budget.scm
+++ b/src/report/standard-reports/budget.scm
@@ -90,7 +90,7 @@
;; optname-from-date optname-to-date "a")
(gnc:options-add-price-source!
- options gnc:pagename-general optname-price-source "c" 'average-cost)
+ options gnc:pagename-general optname-price-source "c" 'pricedb-nearest)
;;(gnc:register-option
;; options
diff --git a/src/report/standard-reports/equity-statement.scm b/src/report/standard-reports/equity-statement.scm
index 8c1b2b3..1aae965 100644
--- a/src/report/standard-reports/equity-statement.scm
+++ b/src/report/standard-reports/equity-statement.scm
@@ -142,7 +142,7 @@
(gnc:options-add-price-source!
options pagename-commodities
- optname-price-source "b" 'average-cost)
+ optname-price-source "b" 'pricedb-nearest)
(add-option
(gnc:make-simple-boolean-option
diff --git a/src/report/standard-reports/income-statement.scm b/src/report/standard-reports/income-statement.scm
index 7c40395..5b2c352 100644
--- a/src/report/standard-reports/income-statement.scm
+++ b/src/report/standard-reports/income-statement.scm
@@ -185,7 +185,7 @@
(gnc:options-add-price-source!
options pagename-commodities
- optname-price-source "b" 'average-cost)
+ optname-price-source "b" 'pricedb-nearest)
(add-option
(gnc:make-simple-boolean-option
diff --git a/src/report/standard-reports/sx-summary.scm b/src/report/standard-reports/sx-summary.scm
index 800c4dd..f61608b 100644
--- a/src/report/standard-reports/sx-summary.scm
+++ b/src/report/standard-reports/sx-summary.scm
@@ -171,7 +171,7 @@
(gnc:options-add-price-source!
options pagename-commodities
- optname-price-source "b" 'average-cost)
+ optname-price-source "b" 'pricedb-nearest)
(add-option
(gnc:make-simple-boolean-option
diff --git a/src/report/standard-reports/trial-balance.scm b/src/report/standard-reports/trial-balance.scm
index fd7d9ad..b3d2be9 100644
--- a/src/report/standard-reports/trial-balance.scm
+++ b/src/report/standard-reports/trial-balance.scm
@@ -221,7 +221,7 @@
(gnc:options-add-price-source!
options pagename-commodities
- optname-price-source "b" 'average-cost)
+ optname-price-source "b" 'pricedb-nearest)
(add-option
(gnc:make-simple-boolean-option
commit 98697a1e23c48737e472eba6314c3d05e6e689ee
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 9 10:22:06 2016 -0800
Calculate rates only for buy transactions in the report commodity for cost totals.
Reverse the direction of splits with negative amounts as they represent a
sale of the transaction commodity. Accumulate buys and sells of commodities
into separate comm-lists and use only the buy-side ones for the report-commodity
in the calculation.
diff --git a/src/report/report-system/commodity-utilities.scm b/src/report/report-system/commodity-utilities.scm
index ceca9c8..d14afab 100644
--- a/src/report/report-system/commodity-utilities.scm
+++ b/src/report/report-system/commodity-utilities.scm
@@ -515,17 +515,10 @@
;; report-commodity ((cdadr newrate) 'total
;; #f))))
(set! reportlist (cons newrate reportlist))))))
- ;; Huh, the report-currency showed up on the wrong side
- ;; -- we will just add it to the reportlist on the
- ;; right side.
- (let ((newrate (list (car otherlist)
- (cons (cdadr pair) (caadr pair)))))
- ;; (warn "created new rate: "
- ;; (gnc-commodity-value->string (list (car newrate)
- ;; ((caadr newrate) 'total #f))) " = "
- ;; (gnc-commodity-value->string (list
- ;; report-commodity ((cdadr newrate) 'total #f))))
- (set! reportlist (cons newrate reportlist)))))
+ ;; The report-currency showed up on the wrong side, so it was a
+ ;; "sell" for that commodity. We ignore those for cost reports
+ ;; and they're already aggregated for non-cost reports.
+ ))
(cadr otherlist))))
sumlist)
@@ -537,60 +530,70 @@
;; or more runs of gnc:resolve-unknown-comm. Maybe we could transform
;; this functions to use some kind of recursiveness.
-(define (create-commodity-list inner-comm outer-comm value-amount share-amount)
- (let ((pair (list inner-comm
+(define (create-commodity-list inner-comm outer-comm share-amount value-amount)
+ (let ((foreignlist (list inner-comm
(cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector)))))
- ((caadr pair) 'add value-amount)
- ((cdadr pair) 'add share-amount)
- (set comm-list (list outer-comm (list pair)))))
-
-(define (create-foreign-list comm-list transaction-comm account-comm
+ (gnc:make-numeric-collector))))
+ (comm-list #f))
+ ((caadr foreignlist) 'add share-amount)
+ ((cdadr foreignlist) 'add value-amount)
+ (set! comm-list (list outer-comm (list foreignlist)))
+ (gnc:debug "New Outer entry " (gnc-commodity-get-mnemonic outer-comm)
+ (gnc-commodity-get-mnemonic inner-comm) share-amount
+ value-amount)
+ comm-list))
+
+(define (create-foreign-list comm-list inner-comm outer-comm
share-amount value-amount)
(let ((foreign-list
- (if (gnc-commodity-equiv transaction-comm (car comm-list))
- (list account-comm share-amount value-amount)
- (list transaction-comm value-amount share-amount))))
- foreign-list))
-
-(define (create-foreign-cost-list comm-list transaction-comm account-comm
- share-amount value-amount)
- (let ((foreign-list
- (if (gnc-commodity-equiv transaction-comm (car comm-list))
- (list account-comm share-amount value-amount)
- (list transaction-comm (gnc-numeric-neg value-amount)
- (gnc-numeric-neg share-amount)))))
+ (if (gnc-commodity-equiv inner-comm (car comm-list))
+ (list outer-comm share-amount value-amount)
+ (list inner-comm value-amount share-amount))))
+ (gnc:debug "Add value " (gnc-commodity-get-mnemonic (car comm-list))
+ (gnc-commodity-get-mnemonic (car foreign-list))
+ (cadr foreign-list) (cddr foreign-list))
foreign-list))
(define (create-commodity-pair foreignlist comm-list sumlist)
(let ((pair (assoc (car foreignlist) (cadr comm-list))))
;; no pair already, create one
(if (not pair)
- (set! pair (list (car foreignlist)
+ (begin
+ (set! pair (list (car foreignlist)
(cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector)))))
+ (gnc:make-numeric-collector))))
+ (gnc:debug "New commodity "
+ (gnc-commodity-get-mnemonic (car foreignlist)))))
pair))
-;; sumlist: a multilevel alist. Each element has a commodity as key, and another
-;; alist as a value. The value-alist's elements consist of a commodity as a key,
-;; and a pair of two value-collectors as value, e.g. with only one (the report-)
-;; commodity DEM in the outer alist: ( {DEM ( [USD (400 . 1000)] [FRF (300
-;; . 100)] ) } ) where DEM,USD,FRF are <gnc:commodity> and the numbers are a
-;; numeric-collector which in turn store a <gnc:numeric>. In the example, USD
-;; 400 were bought for an amount of DEM 1000, FRF 300 were bought for DEM
-;; 100. The reason for the outer alist is that there might be commodity
-;; transactions which do not involve the report-commodity, but which can still
-;; be calculated after *all* transactions are processed. Calculate the weighted
-;; average exchange rate between all commodities and the
-;; 'report-commodity'. Uses all currency transactions up until the
-;; 'end-date'. Returns an alist, see sumlist.
+;; gnc:get-exchange-totals returns a sumlist, which is a multilevel alist. Each
+;; element has a commodity as key, and another alist as a value. The
+;; value-alist's elements consist of a commodity as a key, and a pair of two
+;; value-collectors as value, e.g. with only one (the report-) commodity DEM in
+;; the outer alist: ( {DEM ( [USD (400 . 1000)] [FRF (300 . 100)] ) } ) where
+;; DEM,USD,FRF are <gnc:commodity> and the numbers are a numeric-collector which
+;; in turn store a <gnc:numeric>. In the example, USD 400 were bought for an
+;; amount of DEM 1000, FRF 300 were bought for DEM 100. The reason for the outer
+;; alist is that there might be commodity transactions which do not involve the
+;; report-commodity, but which can still be calculated after *all* transactions
+;; are processed.
+;;
+
(define (gnc:get-exchange-totals report-commodity end-date cost)
+;; Finds all splits in the book whose commodity is different from the parent
+;; transaction's commodity and creates a sumlist of the amount and value for
+;; each commodity pair. If 'cost' is true then the totals represent the costs of
+;; buying one commodity with the other; if it's false then the trades in both
+;; directions are agregated. A side effect of the distinction is that changing
+;; the report currency will change the resulting exchange rate if 'cost' is true
+;; but not if it is false.
(let ((curr-accounts
;;(filter gnc:account-has-shares? ))
;; -- use all accounts, not only share accounts, since gnucash-1.7
(gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
(sumlist (list (list report-commodity '()))))
-
+ (gnc:debug "Begin Report " (gnc-commodity-get-mnemonic report-commodity)
+ " cost " cost)
(if (not (null? curr-accounts))
;; Go through all splits and add up all value-amounts
;; and share-amounts
@@ -600,33 +603,53 @@
(xaccSplitGetParent a)))
(account-comm (xaccAccountGetCommodity
(xaccSplitGetAccount a)))
- (share-amount (if cost
- (xaccSplitGetAmount a)
- (gnc-numeric-abs (xaccSplitGetAmount a))))
- (value-amount (if cost
- (xaccSplitGetValue a)
- (gnc-numeric-abs (xaccSplitGetValue a))))
- (tmp (assoc transaction-comm sumlist))
- (comm-list (if (not tmp)
- (assoc account-comm sumlist)
+ (share-amount (xaccSplitGetAmount a))
+ (value-amount (xaccSplitGetValue a))
+ ;; If the share-value is negative then the transaction
+ ;; purchased something in the transaction currency; otherwise
+ ;; the purchase is in the account currency.
+ (outer-comm (if (gnc-numeric-negative-p share-amount)
+ account-comm transaction-comm))
+ (inner-comm (if (gnc-numeric-negative-p share-amount)
+ transaction-comm account-comm))
+ (tmp (assoc outer-comm sumlist))
+ ;; If cost isn't true then we want one entry for both in
+ ;; sumlist.
+ (comm-list (if (and (not tmp) (not cost))
+ (assoc inner-comm sumlist)
tmp)))
+ ;; We need to reverse and negate the values if they were negative
+ ;; because we already reversed the commodities they applied to.
+ (gnc:debug "Transaction commodity "
+ (gnc-commodity-get-mnemonic transaction-comm)
+ " Account commodity "
+ (gnc-commodity-get-mnemonic account-comm)
+ " Outer Commodity "
+ (gnc-commodity-get-mnemonic outer-comm)
+ " Inner Commodity "
+ (gnc-commodity-get-mnemonic inner-comm)
+ " Amount " share-amount " Value " value-amount)
+ (if (gnc-numeric-negative-p share-amount)
+ ;;(if cost ;; swap as well as negate
+ ;;(let* ((tmp-amount share-amount))
+ ;;(set! share-amount (gnc-numeric-neg value-amount))
+ ;;(set! value-amount (gnc-numeric-neg tmp-amount)))
+ (begin ;; we just want to make sure they're positive
+ (set! share-amount (gnc-numeric-abs share-amount))
+ (set! value-amount (gnc-numeric-abs value-amount));;)
+ ))
;; entry exists already in comm-list?
(if (not comm-list)
;; no, create sub-alist from scratch
(begin
(set! comm-list (create-commodity-list
- account-comm transaction-comm
+ inner-comm outer-comm
share-amount value-amount))
(set! sumlist (cons comm-list sumlist)))
- ;;yes, check for second commodity
- (let* ((foreignlist (if cost
- (create-foreign-cost-list
- comm-list transaction-comm account-comm
- share-amount value-amount)
- (create-foreign-list
- comm-list transaction-comm account-comm
- share-amount value-amount)))
+ ;;yes, add the second commodity if it's not already stored
+ (let* ((foreignlist (create-foreign-list comm-list outer-comm
+ inner-comm share-amount value-amount))
(pair (create-commodity-pair foreignlist comm-list
sumlist)))
(set! comm-list (list (car comm-list)
@@ -637,7 +660,8 @@
((cdadr pair) 'add (caddr foreignlist))))))
(gnc:get-all-commodity-splits curr-accounts end-date)))
-
+ (gnc:debug "End Report\n")
+ ;; Finally resolve any indirect conversions.
(gnc:resolve-unknown-comm sumlist report-commodity)))
(define (gnc:make-exchange-alist report-commodity end-date cost)
commit d9dbc3de04eb9518a688a9846e5276c3d2a2d05c
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 4 15:00:51 2016 -0800
Single functions for gnc:make-exchange-alist and gnc:get-exchange-totals.
Extract helper functions and add a parameter, eliminating gnc:make-exchange-cost-alist
and gnc:get-exchange-cost-totals.
This makes it more clear the differences between the two algorithms and
makes it easier to correct the algorithm for the cost case.
diff --git a/src/report/report-system/commodity-utilities.scm b/src/report/report-system/commodity-utilities.scm
index 2d3f838..ceca9c8 100644
--- a/src/report/report-system/commodity-utilities.scm
+++ b/src/report/report-system/commodity-utilities.scm
@@ -537,29 +537,58 @@
;; or more runs of gnc:resolve-unknown-comm. Maybe we could transform
;; this functions to use some kind of recursiveness.
-
-;; Calculate the weighted average exchange rate between all
-;; commodities and the 'report-commodity'. Uses all currency
-;; transactions up until the 'end-date'. Returns an alist, see
-;; sumlist.
-(define (gnc:get-exchange-totals report-commodity end-date)
+(define (create-commodity-list inner-comm outer-comm value-amount share-amount)
+ (let ((pair (list inner-comm
+ (cons (gnc:make-numeric-collector)
+ (gnc:make-numeric-collector)))))
+ ((caadr pair) 'add value-amount)
+ ((cdadr pair) 'add share-amount)
+ (set comm-list (list outer-comm (list pair)))))
+
+(define (create-foreign-list comm-list transaction-comm account-comm
+ share-amount value-amount)
+ (let ((foreign-list
+ (if (gnc-commodity-equiv transaction-comm (car comm-list))
+ (list account-comm share-amount value-amount)
+ (list transaction-comm value-amount share-amount))))
+ foreign-list))
+
+(define (create-foreign-cost-list comm-list transaction-comm account-comm
+ share-amount value-amount)
+ (let ((foreign-list
+ (if (gnc-commodity-equiv transaction-comm (car comm-list))
+ (list account-comm share-amount value-amount)
+ (list transaction-comm (gnc-numeric-neg value-amount)
+ (gnc-numeric-neg share-amount)))))
+ foreign-list))
+
+(define (create-commodity-pair foreignlist comm-list sumlist)
+ (let ((pair (assoc (car foreignlist) (cadr comm-list))))
+ ;; no pair already, create one
+ (if (not pair)
+ (set! pair (list (car foreignlist)
+ (cons (gnc:make-numeric-collector)
+ (gnc:make-numeric-collector)))))
+ pair))
+
+;; sumlist: a multilevel alist. Each element has a commodity as key, and another
+;; alist as a value. The value-alist's elements consist of a commodity as a key,
+;; and a pair of two value-collectors as value, e.g. with only one (the report-)
+;; commodity DEM in the outer alist: ( {DEM ( [USD (400 . 1000)] [FRF (300
+;; . 100)] ) } ) where DEM,USD,FRF are <gnc:commodity> and the numbers are a
+;; numeric-collector which in turn store a <gnc:numeric>. In the example, USD
+;; 400 were bought for an amount of DEM 1000, FRF 300 were bought for DEM
+;; 100. The reason for the outer alist is that there might be commodity
+;; transactions which do not involve the report-commodity, but which can still
+;; be calculated after *all* transactions are processed. Calculate the weighted
+;; average exchange rate between all commodities and the
+;; 'report-commodity'. Uses all currency transactions up until the
+;; 'end-date'. Returns an alist, see sumlist.
+(define (gnc:get-exchange-totals report-commodity end-date cost)
(let ((curr-accounts
;;(filter gnc:account-has-shares? ))
;; -- use all accounts, not only share accounts, since gnucash-1.7
(gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
- ;; sumlist: a multilevel alist. Each element has a commodity
- ;; as key, and another alist as a value. The value-alist's
- ;; elements consist of a commodity as a key, and a pair of two
- ;; value-collectors as value, e.g. with only one (the report-)
- ;; commodity DEM in the outer alist: ( {DEM ( [USD (400 .
- ;; 1000)] [FRF (300 . 100)] ) } ) where DEM,USD,FRF are
- ;; <gnc:commodity> and the numbers are a numeric-collector
- ;; which in turn store a <gnc:numeric>. In the example, USD
- ;; 400 were bought for an amount of DEM 1000, FRF 300 were
- ;; bought for DEM 100. The reason for the outer alist is that
- ;; there might be commodity transactions which do not involve
- ;; the report-commodity, but which can still be calculated
- ;; after *all* transactions are processed.
(sumlist (list (list report-commodity '()))))
(if (not (null? curr-accounts))
@@ -571,159 +600,47 @@
(xaccSplitGetParent a)))
(account-comm (xaccAccountGetCommodity
(xaccSplitGetAccount a)))
- ;; Always use the absolute value here.
- (share-amount (gnc-numeric-abs
- (xaccSplitGetAmount a)))
- (value-amount (gnc-numeric-abs
- (xaccSplitGetValue a)))
+ (share-amount (if cost
+ (xaccSplitGetAmount a)
+ (gnc-numeric-abs (xaccSplitGetAmount a))))
+ (value-amount (if cost
+ (xaccSplitGetValue a)
+ (gnc-numeric-abs (xaccSplitGetValue a))))
(tmp (assoc transaction-comm sumlist))
(comm-list (if (not tmp)
(assoc account-comm sumlist)
tmp)))
-
+ ;; entry exists already in comm-list?
(if (not comm-list)
- ;; entry doesn't exist in comm-list
- ;; create sub-alist from scratch
- (let ((pair (list transaction-comm
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector)))))
- ((caadr pair) 'add value-amount)
- ((cdadr pair) 'add share-amount)
- (set! comm-list (list account-comm (list pair)))
- ;; and add the new sub-alist to sumlist.
+ ;; no, create sub-alist from scratch
+ (begin
+ (set! comm-list (create-commodity-list
+ account-comm transaction-comm
+ share-amount value-amount))
(set! sumlist (cons comm-list sumlist)))
- (let*
- ;; Put the amounts in the right place.
- ((foreignlist
- (if (gnc-commodity-equiv transaction-comm
- (car comm-list))
- (list account-comm
- share-amount value-amount)
- (list transaction-comm
- value-amount share-amount)))
- ;; second commodity already existing in comm-list?
- (pair (assoc (car foreignlist) (cadr comm-list))))
- ;; if not, create a new entry in comm-list.
- (if (not pair)
- (begin
- (set!
- pair (list (car foreignlist)
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector))))
- (set!
- comm-list (list (car comm-list)
- (cons pair (cadr comm-list))))
- (set!
- sumlist (cons comm-list
- (alist-delete
- (car comm-list) sumlist)))))
- ;; And add the balances to the comm-list entry.
- ((caadr pair) 'add (cadr foreignlist))
- ((cdadr pair) 'add (caddr foreignlist))))))
+ ;;yes, check for second commodity
+ (let* ((foreignlist (if cost
+ (create-foreign-cost-list
+ comm-list transaction-comm account-comm
+ share-amount value-amount)
+ (create-foreign-list
+ comm-list transaction-comm account-comm
+ share-amount value-amount)))
+ (pair (create-commodity-pair foreignlist comm-list
+ sumlist)))
+ (set! comm-list (list (car comm-list)
+ (cons pair (cadr comm-list))))
+ (set! sumlist (cons comm-list
+ (alist-delete (car comm-list) sumlist)))
+ ((caadr pair) 'add (cadr foreignlist))
+ ((cdadr pair) 'add (caddr foreignlist))))))
+
(gnc:get-all-commodity-splits curr-accounts end-date)))
(gnc:resolve-unknown-comm sumlist report-commodity)))
-;; Calculate the volume-weighted average cost of all commodities,
-;; priced in the 'report-commodity'. Uses all transactions up until
-;; the 'end-date'. Returns an alist, see sumlist.
-(define (gnc:get-exchange-cost-totals report-commodity end-date)
- (let ((curr-accounts
- (gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
- ;; sumlist: a multilevel alist. Each element has a commodity
- ;; as key, and another alist as a value. The value-alist's
- ;; elements consist of a commodity as a key, and a pair of two
- ;; value-collectors as value, e.g. with only one (the report-)
- ;; commodity DEM in the outer alist: ( {DEM ( [USD (400 .
- ;; 1000)] [FRF (300 . 100)] ) } ) where DEM,USD,FRF are
- ;; <gnc:commodity> and the numbers are a numeric-collector
- ;; which in turn store a <gnc:numeric>. In the example, USD
- ;; 400 were bought for an amount of DEM 1000, FRF 300 were
- ;; bought for DEM 100. The reason for the outer alist is that
- ;; there might be commodity transactions which do not involve
- ;; the report-commodity, but which can still be calculated
- ;; after *all* transactions are processed.
- (sumlist (list (list report-commodity '()))))
-
- (if (not (null? curr-accounts))
- ;; Go through all splits and add up all value-amounts
- ;; and share-amounts
- (for-each
- (lambda (a)
- (let* ((transaction-comm (xaccTransGetCurrency
- (xaccSplitGetParent a)))
- (account-comm (xaccAccountGetCommodity
- (xaccSplitGetAccount a)))
- (share-amount (xaccSplitGetAmount a))
- (value-amount (xaccSplitGetValue a))
- (tmp (assoc transaction-comm sumlist))
- (comm-list (if (not tmp)
- (assoc account-comm sumlist)
- tmp)))
- ;; entry exists already in comm-list?
- (if (not comm-list)
- ;; no, create sub-alist from scratch
- (let ((pair (list transaction-comm
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector)))))
- ((caadr pair) 'add value-amount)
- ((cdadr pair) 'add share-amount)
- (set! comm-list (list account-comm (list pair)))
- ;; and add the new sub-alist to sumlist.
- (set! sumlist (cons comm-list sumlist)))
- ;; yes, check for second commodity.
- (let*
- ;; Put the amounts in the right place.
- ((foreignlist
- (if (gnc-commodity-equiv transaction-comm
- (car comm-list))
- (list account-comm
- share-amount value-amount)
- (list transaction-comm
- (gnc-numeric-neg value-amount)
- (gnc-numeric-neg share-amount))))
- ;; second commodity already existing in comm-list?
- (pair (assoc (car foreignlist) (cadr comm-list))))
- ;; if not, create a new entry in comm-list.
- (if (not pair)
- (begin
- (set!
- pair (list (car foreignlist)
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector))))
- (set!
- comm-list (list (car comm-list)
- (cons pair (cadr comm-list))))
- (set!
- sumlist (cons comm-list
- (alist-delete
- (car comm-list) sumlist)))))
- ;; And add the balances to the comm-list entry.
- ((caadr pair) 'add (cadr foreignlist))
- ((cdadr pair) 'add (caddr foreignlist))))))
- (gnc:get-all-commodity-splits curr-accounts end-date)))
-
-(gnc:resolve-unknown-comm sumlist report-commodity)))
-
-;; Anybody feel free to reimplement any of these functions, either in
-;; scheme or in C. -- cstim
-
-(define (gnc:make-exchange-alist report-commodity end-date)
- ;; This returns the alist with the actual exchange rates, i.e. the
- ;; total balances from get-exchange-totals are divided by each
- ;; other.
- (map
- (lambda (e)
- (list (car e)
- (gnc-numeric-abs
- (gnc-numeric-div ((cdadr e) 'total #f)
- ((caadr e) 'total #f)
- GNC-DENOM-AUTO
- (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))))
- (gnc:get-exchange-totals report-commodity end-date)))
-
-(define (gnc:make-exchange-cost-alist report-commodity end-date)
+(define (gnc:make-exchange-alist report-commodity end-date cost)
;; This returns the alist with the actual exchange rates, i.e. the
;; total balances from get-exchange-totals are divided by each
;; other.
@@ -735,11 +652,7 @@
((caadr e) 'total #f)
GNC-DENOM-AUTO
(logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))))
- (gnc:get-exchange-cost-totals report-commodity end-date)))
-
-
-
-
+ (gnc:get-exchange-totals report-commodity end-date cost)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Actual functions for exchanging amounts.
@@ -934,11 +847,11 @@
source-option report-currency to-date-tp)
(case source-option
((average-cost) (gnc:make-exchange-function
- (gnc:make-exchange-cost-alist
- report-currency to-date-tp)))
+ (gnc:make-exchange-alist
+ report-currency to-date-tp #t)))
((weighted-average) (gnc:make-exchange-function
(gnc:make-exchange-alist
- report-currency to-date-tp)))
+ report-currency to-date-tp #f)))
((pricedb-latest) gnc:exchange-by-pricedb-latest)
((pricedb-nearest) (lambda (foreign domestic)
(gnc:exchange-by-pricedb-nearest
@@ -970,8 +883,8 @@
(case source-option
;; Make this the same as gnc:case-exchange-fn
((average-cost) (let* ((exchange-fn (gnc:make-exchange-function
- (gnc:make-exchange-cost-alist
- report-currency to-date-tp))))
+ (gnc:make-exchange-alist
+ report-currency to-date-tp #t))))
(lambda (foreign domestic date)
(exchange-fn foreign domestic))))
((weighted-average) (let ((pricealist
commit 0829d6dc0301a40c1c12406aee75ad89275764f3
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 1 16:32:41 2016 -0800
Move checks for no split amount and trading accounts to get-match-commodity-splits.
They apply to all price retrievals.
diff --git a/src/report/report-system/commodity-utilities.scm b/src/report/report-system/commodity-utilities.scm
index 6c204e9..2d3f838 100644
--- a/src/report/report-system/commodity-utilities.scm
+++ b/src/report/report-system/commodity-utilities.scm
@@ -62,16 +62,28 @@
(xaccSplitGetParent s)))
(acc-comm
(xaccAccountGetCommodity
- (xaccSplitGetAccount s))))
+ (xaccSplitGetAccount s)))
+ (acc-type
+ (xaccAccountGetType
+ (xaccSplitGetAccount s)))
+ (split-amt
+ (xaccSplitGetAmount s))
+ )
(and
+ ;; Same commodities, so no price:
(not (gnc-commodity-equiv
trans-comm acc-comm))
(or
+ ;; No commodity, bad split
(not commodity)
- (gnc-commodity-equiv
- commodity trans-comm)
- (gnc-commodity-equiv
- commodity acc-comm)))))
+ ;; Not a price that interests us
+ (gnc-commodity-equiv commodity trans-comm)
+ (gnc-commodity-equiv commodity acc-comm))
+ ;; No amount, so no price:
+ (not (gnc-numeric-zero-p split-amt))
+ ;; no trading accounts so we don't count twice
+ (not (eq? acc-type ACCT-TYPE-TRADING))
+ )))
(qof-query-run query)))
(qof-query-destroy query)
splits))
@@ -569,62 +581,55 @@
(assoc account-comm sumlist)
tmp)))
- (cond ((gnc-numeric-zero-p share-amount)
- ;; Without shares this is not a buy or sell; ignore it.
- #f)
-
- ((not comm-list)
- ;; entry doesn't exist in comm-list
- ;; create sub-alist from scratch
- (let ((pair (list transaction-comm
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector)))))
- ((caadr pair) 'add value-amount)
- ((cdadr pair) 'add share-amount)
- (set! comm-list (list account-comm (list pair)))
- ;; and add the new sub-alist to sumlist.
- (set! sumlist (cons comm-list sumlist))))
-
- (else
- (let*
- ;; Put the amounts in the right place.
- ((foreignlist
- (if (gnc-commodity-equiv transaction-comm
- (car comm-list))
- (list account-comm
- share-amount value-amount)
- (list transaction-comm
- value-amount share-amount)))
- ;; second commodity already existing in comm-list?
- (pair (assoc (car foreignlist) (cadr comm-list))))
- ;; if not, create a new entry in comm-list.
- (if (not pair)
- (begin
- (set!
- pair (list (car foreignlist)
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector))))
- (set!
- comm-list (list (car comm-list)
- (cons pair (cadr comm-list))))
- (set!
- sumlist (cons comm-list
- (alist-delete
- (car comm-list) sumlist)))))
- ;; And add the balances to the comm-list entry.
- ((caadr pair) 'add (cadr foreignlist))
- ((cdadr pair) 'add (caddr foreignlist)))))))
- (gnc:get-all-commodity-splits curr-accounts end-date)))
-
- (gnc:resolve-unknown-comm sumlist report-commodity)))
+ (if (not comm-list)
+ ;; entry doesn't exist in comm-list
+ ;; create sub-alist from scratch
+ (let ((pair (list transaction-comm
+ (cons (gnc:make-numeric-collector)
+ (gnc:make-numeric-collector)))))
+ ((caadr pair) 'add value-amount)
+ ((cdadr pair) 'add share-amount)
+ (set! comm-list (list account-comm (list pair)))
+ ;; and add the new sub-alist to sumlist.
+ (set! sumlist (cons comm-list sumlist)))
+
+ (let*
+ ;; Put the amounts in the right place.
+ ((foreignlist
+ (if (gnc-commodity-equiv transaction-comm
+ (car comm-list))
+ (list account-comm
+ share-amount value-amount)
+ (list transaction-comm
+ value-amount share-amount)))
+ ;; second commodity already existing in comm-list?
+ (pair (assoc (car foreignlist) (cadr comm-list))))
+ ;; if not, create a new entry in comm-list.
+ (if (not pair)
+ (begin
+ (set!
+ pair (list (car foreignlist)
+ (cons (gnc:make-numeric-collector)
+ (gnc:make-numeric-collector))))
+ (set!
+ comm-list (list (car comm-list)
+ (cons pair (cadr comm-list))))
+ (set!
+ sumlist (cons comm-list
+ (alist-delete
+ (car comm-list) sumlist)))))
+ ;; And add the balances to the comm-list entry.
+ ((caadr pair) 'add (cadr foreignlist))
+ ((cdadr pair) 'add (caddr foreignlist))))))
+ (gnc:get-all-commodity-splits curr-accounts end-date)))
+
+ (gnc:resolve-unknown-comm sumlist report-commodity)))
;; Calculate the volume-weighted average cost of all commodities,
;; priced in the 'report-commodity'. Uses all transactions up until
;; the 'end-date'. Returns an alist, see sumlist.
(define (gnc:get-exchange-cost-totals report-commodity end-date)
(let ((curr-accounts
- ;;(filter gnc:account-has-shares? ))
- ;; -- use all accounts, not only share accounts, since gnucash-1.7
(gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
;; sumlist: a multilevel alist. Each element has a commodity
;; as key, and another alist as a value. The value-alist's
@@ -644,66 +649,62 @@
(if (not (null? curr-accounts))
;; Go through all splits and add up all value-amounts
;; and share-amounts
- ;; However skip splits in trading accounts as these counterbalance
- ;; the actual value and share amounts back to zero
(for-each
(lambda (a)
- (if (not (eq? (xaccAccountGetType (xaccSplitGetAccount a)) ACCT-TYPE-TRADING))
- (let* ((transaction-comm (xaccTransGetCurrency
- (xaccSplitGetParent a)))
- (account-comm (xaccAccountGetCommodity
- (xaccSplitGetAccount a)))
- (share-amount (xaccSplitGetAmount a))
- (value-amount (xaccSplitGetValue a))
- (tmp (assoc transaction-comm sumlist))
- (comm-list (if (not tmp)
- (assoc account-comm sumlist)
- tmp)))
-
- ;; entry exists already in comm-list?
- (if (not comm-list)
- ;; no, create sub-alist from scratch
- (let ((pair (list transaction-comm
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector)))))
- ((caadr pair) 'add value-amount)
- ((cdadr pair) 'add share-amount)
- (set! comm-list (list account-comm (list pair)))
- ;; and add the new sub-alist to sumlist.
- (set! sumlist (cons comm-list sumlist)))
- ;; yes, check for second commodity.
- (let*
- ;; Put the amounts in the right place.
- ((foreignlist
- (if (gnc-commodity-equiv transaction-comm
- (car comm-list))
- (list account-comm
- share-amount value-amount)
- (list transaction-comm
- (gnc-numeric-neg value-amount)
- (gnc-numeric-neg share-amount))))
- ;; second commodity already existing in comm-list?
- (pair (assoc (car foreignlist) (cadr comm-list))))
- ;; if not, create a new entry in comm-list.
- (if (not pair)
- (begin
- (set!
- pair (list (car foreignlist)
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector))))
- (set!
- comm-list (list (car comm-list)
- (cons pair (cadr comm-list))))
- (set!
- sumlist (cons comm-list
- (alist-delete
- (car comm-list) sumlist)))))
- ;; And add the balances to the comm-list entry.
- ((caadr pair) 'add (cadr foreignlist))
- ((cdadr pair) 'add (caddr foreignlist)))))))
- (gnc:get-all-commodity-splits curr-accounts end-date)))
-
- (gnc:resolve-unknown-comm sumlist report-commodity)))
+ (let* ((transaction-comm (xaccTransGetCurrency
+ (xaccSplitGetParent a)))
+ (account-comm (xaccAccountGetCommodity
+ (xaccSplitGetAccount a)))
+ (share-amount (xaccSplitGetAmount a))
+ (value-amount (xaccSplitGetValue a))
+ (tmp (assoc transaction-comm sumlist))
+ (comm-list (if (not tmp)
+ (assoc account-comm sumlist)
+ tmp)))
+ ;; entry exists already in comm-list?
+ (if (not comm-list)
+ ;; no, create sub-alist from scratch
+ (let ((pair (list transaction-comm
+ (cons (gnc:make-numeric-collector)
+ (gnc:make-numeric-collector)))))
+ ((caadr pair) 'add value-amount)
+ ((cdadr pair) 'add share-amount)
+ (set! comm-list (list account-comm (list pair)))
+ ;; and add the new sub-alist to sumlist.
+ (set! sumlist (cons comm-list sumlist)))
+ ;; yes, check for second commodity.
+ (let*
+ ;; Put the amounts in the right place.
+ ((foreignlist
+ (if (gnc-commodity-equiv transaction-comm
+ (car comm-list))
+ (list account-comm
+ share-amount value-amount)
+ (list transaction-comm
+ (gnc-numeric-neg value-amount)
+ (gnc-numeric-neg share-amount))))
+ ;; second commodity already existing in comm-list?
+ (pair (assoc (car foreignlist) (cadr comm-list))))
+ ;; if not, create a new entry in comm-list.
+ (if (not pair)
+ (begin
+ (set!
+ pair (list (car foreignlist)
+ (cons (gnc:make-numeric-collector)
+ (gnc:make-numeric-collector))))
+ (set!
+ comm-list (list (car comm-list)
+ (cons pair (cadr comm-list))))
+ (set!
+ sumlist (cons comm-list
+ (alist-delete
+ (car comm-list) sumlist)))))
+ ;; And add the balances to the comm-list entry.
+ ((caadr pair) 'add (cadr foreignlist))
+ ((cdadr pair) 'add (caddr foreignlist))))))
+ (gnc:get-all-commodity-splits curr-accounts end-date)))
+
+(gnc:resolve-unknown-comm sumlist report-commodity)))
;; Anybody feel free to reimplement any of these functions, either in
;; scheme or in C. -- cstim
commit 5803c141c18a6ff75a7f49a9142f834a596857f5
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 1 15:42:27 2016 -0800
Clean up whitespace in commodity-utilities.scm.
diff --git a/src/report/report-system/commodity-utilities.scm b/src/report/report-system/commodity-utilities.scm
index fbbf3c2..6c204e9 100644
--- a/src/report/report-system/commodity-utilities.scm
+++ b/src/report/report-system/commodity-utilities.scm
@@ -1,17 +1,17 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; commodity-utilities.scm: Functions for handling different commodities.
-;; Copyright 2001 Christian Stimming <stimming at tu-harburg.de>
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2 of
-;; the License, or (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-;;
+;; Copyright 2001 Christian Stimming <stimming at tu-harburg.de>
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
;; You should have received a copy of the GNU General Public License
;; along with this program; if not, contact:
;;
@@ -22,12 +22,12 @@
(define (gnc-commodity-collector-contains-commodity? collector commodity)
- (let ((ret #f))
- (gnc-commodity-collector-map
- collector
- (lambda (comm amt)
- (set! ret (or ret (gnc-commodity-equiv comm commodity)))))
- ret
+ (let ((ret #f))
+ (gnc-commodity-collector-map
+ collector
+ (lambda (comm amt)
+ (set! ret (or ret (gnc-commodity-equiv comm commodity)))))
+ ret
))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -38,41 +38,41 @@
;; 'end-date-tp' which have two different commodities involved, one of
;; which is equivalent to 'commodity' (the latter constraint only if
;; 'commodity' != #f ).
-(define (gnc:get-match-commodity-splits
- currency-accounts end-date-tp commodity)
+(define (gnc:get-match-commodity-splits
+ currency-accounts end-date-tp commodity)
(let ((query (qof-query-create-for-splits))
- (splits #f))
-
+ (splits #f))
+
(qof-query-set-book query (gnc-get-current-book))
(gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
(xaccQueryAddAccountMatch query
- currency-accounts
- QOF-GUID-MATCH-ANY QOF-QUERY-AND)
+ currency-accounts
+ QOF-GUID-MATCH-ANY QOF-QUERY-AND)
(xaccQueryAddDateMatchTS
query #f end-date-tp #t end-date-tp QOF-QUERY-AND)
-
+
;; Get the query result, i.e. all splits in currency
;; accounts.
- (set! splits (filter
- ;; Filter such that we get only those splits
- ;; which have two *different* commodities
- ;; involved.
- (lambda (s) (let ((trans-comm
- (xaccTransGetCurrency
- (xaccSplitGetParent s)))
- (acc-comm
- (xaccAccountGetCommodity
- (xaccSplitGetAccount s))))
- (and
- (not (gnc-commodity-equiv
- trans-comm acc-comm))
- (or
- (not commodity)
- (gnc-commodity-equiv
- commodity trans-comm)
- (gnc-commodity-equiv
- commodity acc-comm)))))
- (qof-query-run query)))
+ (set! splits (filter
+ ;; Filter such that we get only those splits
+ ;; which have two *different* commodities
+ ;; involved.
+ (lambda (s) (let ((trans-comm
+ (xaccTransGetCurrency
+ (xaccSplitGetParent s)))
+ (acc-comm
+ (xaccAccountGetCommodity
+ (xaccSplitGetAccount s))))
+ (and
+ (not (gnc-commodity-equiv
+ trans-comm acc-comm))
+ (or
+ (not commodity)
+ (gnc-commodity-equiv
+ commodity trans-comm)
+ (gnc-commodity-equiv
+ commodity acc-comm)))))
+ (qof-query-run query)))
(qof-query-destroy query)
splits))
@@ -82,12 +82,12 @@
(define (gnc:get-match-commodity-splits-sorted currency-accounts
end-date-tp
commodity)
- (sort (gnc:get-match-commodity-splits currency-accounts
- end-date-tp commodity)
- (lambda (a b)
- (gnc:timepair-lt
- (gnc-transaction-get-date-posted (xaccSplitGetParent a))
- (gnc-transaction-get-date-posted (xaccSplitGetParent b))))))
+ (sort (gnc:get-match-commodity-splits currency-accounts
+ end-date-tp commodity)
+ (lambda (a b)
+ (gnc:timepair-lt
+ (gnc-transaction-get-date-posted (xaccSplitGetParent a))
+ (gnc-transaction-get-date-posted (xaccSplitGetParent b))))))
;; Returns a list of all splits in the currency-accounts up to
@@ -108,7 +108,7 @@
;; Helper for exchange below
(define (gnc:exchange-by-euro-numeric
- foreign-commodity foreign-numeric domestic date)
+ foreign-commodity foreign-numeric domestic date)
(gnc:exchange-by-euro
(gnc:make-gnc-monetary foreign-commodity foreign-numeric)
domestic date))
@@ -123,84 +123,84 @@
;; of lists. Each listelement looks like the list (time price), where
;; 'time' is the timepair when the <gnc:numeric*> 'price' was valid.
(define (gnc:get-commodity-totalavg-prices
- currency-accounts end-date-tp price-commodity report-currency)
+ currency-accounts end-date-tp price-commodity report-currency)
(let ((total-foreign (gnc-numeric-zero))
- (total-domestic (gnc-numeric-zero)))
- (filter
+ (total-domestic (gnc-numeric-zero)))
+ (filter
gnc:price-is-not-zero?
(map-in-order
(lambda (a)
- (let* ((transaction-comm (xaccTransGetCurrency
- (xaccSplitGetParent a)))
- (account-comm (xaccAccountGetCommodity
- (xaccSplitGetAccount a)))
- (share-amount (gnc-numeric-abs
- (xaccSplitGetAmount a)))
- (value-amount (gnc-numeric-abs
- (xaccSplitGetValue a)))
- (transaction-date (gnc-transaction-get-date-posted
- (xaccSplitGetParent a)))
- (foreignlist
- (if (gnc-commodity-equiv transaction-comm
- price-commodity)
- (list account-comm
- share-amount value-amount)
- (list transaction-comm
- value-amount share-amount))))
-
- ;;(warn "gnc:get-commodity-totalavg-prices: value "
- ;; (gnc-commodity-numeric->string
- ;;(first foreignlist) (second foreignlist))
- ;; " bought shares "
- ;; (gnc-commodity-numeric->string
- ;;price-commodity (third foreignlist)))
-
- ;; Try EURO exchange if necessary
- (if (not (gnc-commodity-equiv (first foreignlist)
- report-currency))
- (let ((exchanged (gnc:exchange-by-euro-numeric
- (first foreignlist) (second foreignlist)
- report-currency transaction-date)))
- (if exchanged
- (set! foreignlist
- (list report-currency
- (gnc:gnc-monetary-amount exchanged)
- (third foreignlist))))))
-
- (list
- transaction-date
- (if (not (gnc-commodity-equiv (first foreignlist)
- report-currency))
- (begin
- (warn "gnc:get-commodity-totalavg-prices: "
- "Sorry, currency exchange not yet implemented:"
- (gnc-commodity-numeric->string
- (first foreignlist) (second foreignlist))
- " (buying "
- (gnc-commodity-numeric->string
- price-commodity (third foreignlist))
- ") =? "
- (gnc-commodity-numeric->string
- report-currency (gnc-numeric-zero)))
- (gnc-numeric-zero))
- (begin
- (set! total-foreign (gnc-numeric-add total-foreign
+ (let* ((transaction-comm (xaccTransGetCurrency
+ (xaccSplitGetParent a)))
+ (account-comm (xaccAccountGetCommodity
+ (xaccSplitGetAccount a)))
+ (share-amount (gnc-numeric-abs
+ (xaccSplitGetAmount a)))
+ (value-amount (gnc-numeric-abs
+ (xaccSplitGetValue a)))
+ (transaction-date (gnc-transaction-get-date-posted
+ (xaccSplitGetParent a)))
+ (foreignlist
+ (if (gnc-commodity-equiv transaction-comm
+ price-commodity)
+ (list account-comm
+ share-amount value-amount)
+ (list transaction-comm
+ value-amount share-amount))))
+
+ ;;(warn "gnc:get-commodity-totalavg-prices: value "
+ ;; (gnc-commodity-numeric->string
+ ;;(first foreignlist) (second foreignlist))
+ ;; " bought shares "
+ ;; (gnc-commodity-numeric->string
+ ;;price-commodity (third foreignlist)))
+
+ ;; Try EURO exchange if necessary
+ (if (not (gnc-commodity-equiv (first foreignlist)
+ report-currency))
+ (let ((exchanged (gnc:exchange-by-euro-numeric
+ (first foreignlist) (second foreignlist)
+ report-currency transaction-date)))
+ (if exchanged
+ (set! foreignlist
+ (list report-currency
+ (gnc:gnc-monetary-amount exchanged)
+ (third foreignlist))))))
+
+ (list
+ transaction-date
+ (if (not (gnc-commodity-equiv (first foreignlist)
+ report-currency))
+ (begin
+ (warn "gnc:get-commodity-totalavg-prices: "
+ "Sorry, currency exchange not yet implemented:"
+ (gnc-commodity-numeric->string
+ (first foreignlist) (second foreignlist))
+ " (buying "
+ (gnc-commodity-numeric->string
+ price-commodity (third foreignlist))
+ ") =? "
+ (gnc-commodity-numeric->string
+ report-currency (gnc-numeric-zero)))
+ (gnc-numeric-zero))
+ (begin
+ (set! total-foreign (gnc-numeric-add total-foreign
(third foreignlist)
GNC-DENOM-AUTO
GNC-DENOM-LCD))
- (set! total-domestic (gnc-numeric-add total-domestic
+ (set! total-domestic (gnc-numeric-add total-domestic
(second foreignlist)
GNC-DENOM-AUTO
GNC-DENOM-LCD))
- (gnc-numeric-div
- total-domestic
- total-foreign
- GNC-DENOM-AUTO
- (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))))))
+ (gnc-numeric-div
+ total-domestic
+ total-foreign
+ GNC-DENOM-AUTO
+ (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))))))
;; Get all the interesting splits, and sort them according to the
;; date.
(gnc:get-match-commodity-splits-sorted
- currency-accounts
+ currency-accounts
end-date-tp price-commodity)))))
;; Create a list of prices for all commodities in 'commodity-list',
@@ -209,24 +209,24 @@
;; of the foreign-currency and the appropriate list from
;; gnc:get-commodity-totalavg-prices, see there.
(define (gnc:get-commoditylist-totalavg-prices
- commodity-list report-currency end-date-tp
- start-percent delta-percent)
- (let ((currency-accounts
- ;;(filter gnc:account-has-shares?
- ;; -- use all accounts, not only share accounts, since gnucash-1.7
- (gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
- (work-to-do (length commodity-list))
- (work-done 0))
+ commodity-list report-currency end-date-tp
+ start-percent delta-percent)
+ (let ((currency-accounts
+ ;;(filter gnc:account-has-shares?
+ ;; -- use all accounts, not only share accounts, since gnucash-1.7
+ (gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
+ (work-to-do (length commodity-list))
+ (work-done 0))
(map
(lambda (c)
(begin
- (set! work-done (+ 1 work-done))
- (if start-percent
- (gnc:report-percent-done
- (+ start-percent (* delta-percent (/ work-done work-to-do)))))
- (cons c
- (gnc:get-commodity-totalavg-prices
- currency-accounts end-date-tp c report-currency))))
+ (set! work-done (+ 1 work-done))
+ (if start-percent
+ (gnc:report-percent-done
+ (+ start-percent (* delta-percent (/ work-done work-to-do)))))
+ (cons c
+ (gnc:get-commodity-totalavg-prices
+ currency-accounts end-date-tp c report-currency))))
commodity-list)))
;; Get the instantaneous prices for the 'price-commodity', measured in
@@ -236,72 +236,72 @@
;; the list (time price), where 'time' is the timepair when the
;; <gnc:numeric*> 'price' was valid.
(define (gnc:get-commodity-inst-prices
- currency-accounts end-date-tp price-commodity report-currency)
+ currency-accounts end-date-tp price-commodity report-currency)
;; go through all splits; convert all splits into a price.
- (filter
+ (filter
gnc:price-is-not-zero?
(map-in-order
(lambda (a)
(let* ((transaction-comm (xaccTransGetCurrency
- (xaccSplitGetParent a)))
- (account-comm (xaccAccountGetCommodity
- (xaccSplitGetAccount a)))
- (share-amount (gnc-numeric-abs
- (xaccSplitGetAmount a)))
- (value-amount (gnc-numeric-abs
- (xaccSplitGetValue a)))
- (transaction-date (gnc-transaction-get-date-posted
- (xaccSplitGetParent a)))
- (foreignlist
- (if (gnc-commodity-equiv transaction-comm price-commodity)
- (list account-comm
- share-amount value-amount)
- (list transaction-comm
- value-amount share-amount))))
-
- ;;(warn "get-commodity-inst-prices: value "
- ;; (gnc-commodity-numeric->string
- ;; (first foreignlist) (second foreignlist))
- ;; " bought shares "
- ;;(gnc-commodity-numeric->string
- ;; price-commodity (third foreignlist)))
-
- ;; Try EURO exchange if necessary
- (if (not (gnc-commodity-equiv (first foreignlist)
- report-currency))
- (let ((exchanged (gnc:exchange-by-euro-numeric
- (first foreignlist) (second foreignlist)
- report-currency transaction-date)))
- (if exchanged
- (set! foreignlist
- (list report-currency
- (gnc:gnc-monetary-amount exchanged)
- (third foreignlist))))))
-
- (list
- transaction-date
- (if (not (gnc-commodity-equiv (first foreignlist)
- report-currency))
- (begin
- (warn "get-commodity-inst-prices: "
- "Sorry, currency exchange not yet implemented:"
- (gnc-commodity-numeric->string
- (first foreignlist) (second foreignlist))
- " (buying "
- (gnc-commodity-numeric->string
- price-commodity (third foreignlist))
- ") =? "
- (gnc-commodity-numeric->string
- report-currency (gnc-numeric-zero)))
- (gnc-numeric-zero))
- (gnc-numeric-div
- (second foreignlist)
- (third foreignlist)
- GNC-DENOM-AUTO
- (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND))))))
+ (xaccSplitGetParent a)))
+ (account-comm (xaccAccountGetCommodity
+ (xaccSplitGetAccount a)))
+ (share-amount (gnc-numeric-abs
+ (xaccSplitGetAmount a)))
+ (value-amount (gnc-numeric-abs
+ (xaccSplitGetValue a)))
+ (transaction-date (gnc-transaction-get-date-posted
+ (xaccSplitGetParent a)))
+ (foreignlist
+ (if (gnc-commodity-equiv transaction-comm price-commodity)
+ (list account-comm
+ share-amount value-amount)
+ (list transaction-comm
+ value-amount share-amount))))
+
+ ;;(warn "get-commodity-inst-prices: value "
+ ;; (gnc-commodity-numeric->string
+ ;; (first foreignlist) (second foreignlist))
+ ;; " bought shares "
+ ;;(gnc-commodity-numeric->string
+ ;; price-commodity (third foreignlist)))
+
+ ;; Try EURO exchange if necessary
+ (if (not (gnc-commodity-equiv (first foreignlist)
+ report-currency))
+ (let ((exchanged (gnc:exchange-by-euro-numeric
+ (first foreignlist) (second foreignlist)
+ report-currency transaction-date)))
+ (if exchanged
+ (set! foreignlist
+ (list report-currency
+ (gnc:gnc-monetary-amount exchanged)
+ (third foreignlist))))))
+
+ (list
+ transaction-date
+ (if (not (gnc-commodity-equiv (first foreignlist)
+ report-currency))
+ (begin
+ (warn "get-commodity-inst-prices: "
+ "Sorry, currency exchange not yet implemented:"
+ (gnc-commodity-numeric->string
+ (first foreignlist) (second foreignlist))
+ " (buying "
+ (gnc-commodity-numeric->string
+ price-commodity (third foreignlist))
+ ") =? "
+ (gnc-commodity-numeric->string
+ report-currency (gnc-numeric-zero)))
+ (gnc-numeric-zero))
+ (gnc-numeric-div
+ (second foreignlist)
+ (third foreignlist)
+ GNC-DENOM-AUTO
+ (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND))))))
;; Get all the interesting splits, sorted by date.
(gnc:get-match-commodity-splits-sorted
- currency-accounts
+ currency-accounts
end-date-tp price-commodity))))
;; Get the instantaneous prices for all commodities in
@@ -310,24 +310,24 @@
;; consists of the foreign-currency and the appropriate list from
;; gnc:get-commodity-inst-prices, see there.
(define (gnc:get-commoditylist-inst-prices
- commodity-list report-currency end-date-tp
- start-percent delta-percent)
- (let ((currency-accounts
- ;;(filter gnc:account-has-shares?
- ;; -- use all accounts, not only share accounts, since gnucash-1.7
- (gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
- (work-to-do (length commodity-list))
- (work-done 0))
+ commodity-list report-currency end-date-tp
+ start-percent delta-percent)
+ (let ((currency-accounts
+ ;;(filter gnc:account-has-shares?
+ ;; -- use all accounts, not only share accounts, since gnucash-1.7
+ (gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
+ (work-to-do (length commodity-list))
+ (work-done 0))
(map
(lambda (c)
(begin
- (set! work-done (+ 1 work-done))
- (if start-percent
- (gnc:report-percent-done
- (+ start-percent (* delta-percent (/ work-done work-to-do)))))
- (cons c
- (gnc:get-commodity-inst-prices
- currency-accounts end-date-tp c report-currency))))
+ (set! work-done (+ 1 work-done))
+ (if start-percent
+ (gnc:report-percent-done
+ (+ start-percent (* delta-percent (/ work-done work-to-do)))))
+ (cons c
+ (gnc:get-commodity-inst-prices
+ currency-accounts end-date-tp c report-currency))))
commodity-list)))
@@ -336,48 +336,48 @@
;; e.g. gnc:get-commodity-totalavg-prices. Returns a <gnc-numeric> or,
;; if pricelist was empty, #f.
(define (gnc:pricelist-price-find-nearest
- pricelist date)
- (let* ((later (find (lambda (p)
- (gnc:timepair-lt date (first p)))
- pricelist))
- (earlierlist (take-while
- (lambda (p)
- (gnc:timepair-ge date (first p)))
- pricelist))
- (earlier (and (not (null? earlierlist))
- (last earlierlist))))
- ;; (if earlier
- ;; (warn "earlier"
- ;; (gnc-print-date (first earlier))
- ;; (gnc-numeric-to-double (second earlier))))
- ;; (if later
- ;; (warn "later"
- ;; (gnc-print-date (first later))
- ;; (gnc-numeric-to-double (second later))))
-
+ pricelist date)
+ (let* ((later (find (lambda (p)
+ (gnc:timepair-lt date (first p)))
+ pricelist))
+ (earlierlist (take-while
+ (lambda (p)
+ (gnc:timepair-ge date (first p)))
+ pricelist))
+ (earlier (and (not (null? earlierlist))
+ (last earlierlist))))
+ ;; (if earlier
+ ;; (warn "earlier"
+ ;; (gnc-print-date (first earlier))
+ ;; (gnc-numeric-to-double (second earlier))))
+ ;; (if later
+ ;; (warn "later"
+ ;; (gnc-print-date (first later))
+ ;; (gnc-numeric-to-double (second later))))
+
(if (and earlier later)
- (if (< (abs (gnc:timepair-delta date (first earlier)))
- (abs (gnc:timepair-delta date (first later))))
- (second earlier)
- (second later))
- (or
- (and earlier (second earlier))
- (and later (second later))))))
+ (if (< (abs (gnc:timepair-delta date (first earlier)))
+ (abs (gnc:timepair-delta date (first later))))
+ (second earlier)
+ (second later))
+ (or
+ (and earlier (second earlier))
+ (and later (second later))))))
;; Find the price of the 'commodity' in the 'pricealist' that is
;; nearest to the 'date'.
(define (gnc:pricealist-lookup-nearest-in-time
- pricealist commodity date)
+ pricealist commodity date)
(let ((plist (assoc-ref pricealist commodity)))
(if (and plist (not (null? plist)))
- (let ((price
- (gnc:pricelist-price-find-nearest
- plist date)))
- (if price
- price
- (gnc-numeric-zero)))
- (gnc-numeric-zero))))
+ (let ((price
+ (gnc:pricelist-price-find-nearest
+ plist date)))
+ (if price
+ price
+ (gnc-numeric-zero)))
+ (gnc-numeric-zero))))
@@ -404,117 +404,117 @@
;; real variable names below.
(define (make-newrate unknown-coll un->known-coll known-pair)
(let ((a (gnc:make-numeric-collector))
- (b (gnc:make-numeric-collector)))
- (a 'add (unknown-coll 'total #f))
- (b 'add
- ;; round to (at least) 8 significant digits
- (gnc-numeric-div
- (gnc-numeric-mul
- (un->known-coll 'total #f)
- ((cdadr known-pair) 'total #f)
- GNC-DENOM-AUTO
- (logior (GNC-DENOM-SIGFIGS 9) GNC-RND-ROUND))
- ((caadr known-pair) 'total #f)
- GNC-DENOM-AUTO
- (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))
- ;; in other words: (/ (* (caadr un->known-coll) (cdadr
- ;; known-pair)) (caadr known-pair) ))
- (cons a b)))
+ (b (gnc:make-numeric-collector)))
+ (a 'add (unknown-coll 'total #f))
+ (b 'add
+ ;; round to (at least) 8 significant digits
+ (gnc-numeric-div
+ (gnc-numeric-mul
+ (un->known-coll 'total #f)
+ ((cdadr known-pair) 'total #f)
+ GNC-DENOM-AUTO
+ (logior (GNC-DENOM-SIGFIGS 9) GNC-RND-ROUND))
+ ((caadr known-pair) 'total #f)
+ GNC-DENOM-AUTO
+ (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))
+ ;; in other words: (/ (* (caadr un->known-coll) (cdadr
+ ;; known-pair)) (caadr known-pair) ))
+ (cons a b)))
;; Go through sumlist.
(for-each
(lambda (otherlist)
(if (not (gnc-commodity-equiv (car otherlist) report-commodity))
- (for-each
- (lambda (pair)
- ;; Check whether by any accident the report-commodity
- ;; appears here.
- (if
- (not (gnc-commodity-equiv (car pair) report-commodity))
- ;; pair-{a,b}: Try to find either the currency of
- ;; otherlist or of pair in reportlist.
- (let ((pair-a
- (or
- ;; Find the otherlist's currency in reportlist
- (assoc (car otherlist) reportlist)
- ;; Or try whether that's an Euro currency.
- (let
- ((euro-monetary
- (gnc:exchange-by-euro (gnc:make-gnc-monetary
- (car otherlist)
- ((cdadr pair) 'total #f))
- report-commodity #f)))
- ;; If this is an Euro currency, create the
- ;; pair of appropriately exchanged amounts.
- (if euro-monetary
- (let ((a (gnc:make-numeric-collector)))
- (a 'add
- (gnc:gnc-monetary-amount euro-monetary))
- (list report-commodity
- (cons (cdadr pair) a)))
- #f))))
- ;; Find the pair's currency in reportlist. FIXME:
- ;; Also try the Euro here.
- (pair-b (assoc (car pair) reportlist))
- (rate (gnc-numeric-zero)))
- (if (and (not pair-a) (not pair-b))
- ;; If neither the currency of otherlist nor of
- ;; pair was found in reportlist then we can't
- ;; resolve the exchange rate to this currency.
- (warn "gnc:resolve-unknown-comm:"
- "can't calculate rate for "
- (gnc-commodity-value->string
- (list (car pair) ((caadr pair) 'total #f)))
- " = "
- (gnc-commodity-value->string
- (list (car otherlist) ((cdadr pair) 'total #f)))
- " to "
- (gnc-commodity-value->string
- (list report-commodity (gnc-numeric-zero))))
- (if (and pair-a pair-b)
- ;; If both currencies are found then something
- ;; went wrong inside
- ;; gnc:get-exchange-totals. FIXME: Find a
- ;; better thing to do in this case.
- (warn "gnc:resolve-unknown-comm:"
- "Oops - exchange rate ambiguity error: "
- (gnc-commodity-value->string
- (list (car pair) ((caadr pair) 'total #f)))
- " = "
- (gnc-commodity-value->string
- (list (car otherlist)
- ((cdadr pair) 'total #f))))
- (let
- ;; Usual case: one of pair-{a,b} was found
- ;; in reportlist, i.e. this transaction
- ;; can be resolved to report-commodity.
- ((newrate
- (if (not pair-a)
- (list (car otherlist)
- (make-newrate (cdadr pair)
- (caadr pair) pair-b))
- (list (car pair)
- (make-newrate (caadr pair)
- (cdadr pair) pair-a)))))
- ;; (warn "created new rate: "
- ;; (gnc-commodity-value->string (list (car
- ;; newrate) ((caadr newrate) 'total #f))) "
- ;; = " (gnc-commodity-value->string (list
- ;; report-commodity ((cdadr newrate) 'total
- ;; #f))))
- (set! reportlist (cons newrate reportlist))))))
- ;; Huh, the report-currency showed up on the wrong side
- ;; -- we will just add it to the reportlist on the
- ;; right side.
- (let ((newrate (list (car otherlist)
- (cons (cdadr pair) (caadr pair)))))
- ;; (warn "created new rate: "
- ;; (gnc-commodity-value->string (list (car newrate)
- ;; ((caadr newrate) 'total #f))) " = "
- ;; (gnc-commodity-value->string (list
- ;; report-commodity ((cdadr newrate) 'total #f))))
- (set! reportlist (cons newrate reportlist)))))
- (cadr otherlist))))
+ (for-each
+ (lambda (pair)
+ ;; Check whether by any accident the report-commodity
+ ;; appears here.
+ (if
+ (not (gnc-commodity-equiv (car pair) report-commodity))
+ ;; pair-{a,b}: Try to find either the currency of
+ ;; otherlist or of pair in reportlist.
+ (let ((pair-a
+ (or
+ ;; Find the otherlist's currency in reportlist
+ (assoc (car otherlist) reportlist)
+ ;; Or try whether that's an Euro currency.
+ (let
+ ((euro-monetary
+ (gnc:exchange-by-euro (gnc:make-gnc-monetary
+ (car otherlist)
+ ((cdadr pair) 'total #f))
+ report-commodity #f)))
+ ;; If this is an Euro currency, create the
+ ;; pair of appropriately exchanged amounts.
+ (if euro-monetary
+ (let ((a (gnc:make-numeric-collector)))
+ (a 'add
+ (gnc:gnc-monetary-amount euro-monetary))
+ (list report-commodity
+ (cons (cdadr pair) a)))
+ #f))))
+ ;; Find the pair's currency in reportlist. FIXME:
+ ;; Also try the Euro here.
+ (pair-b (assoc (car pair) reportlist))
+ (rate (gnc-numeric-zero)))
+ (if (and (not pair-a) (not pair-b))
+ ;; If neither the currency of otherlist nor of
+ ;; pair was found in reportlist then we can't
+ ;; resolve the exchange rate to this currency.
+ (warn "gnc:resolve-unknown-comm:"
+ "can't calculate rate for "
+ (gnc-commodity-value->string
+ (list (car pair) ((caadr pair) 'total #f)))
+ " = "
+ (gnc-commodity-value->string
+ (list (car otherlist) ((cdadr pair) 'total #f)))
+ " to "
+ (gnc-commodity-value->string
+ (list report-commodity (gnc-numeric-zero))))
+ (if (and pair-a pair-b)
+ ;; If both currencies are found then something
+ ;; went wrong inside
+ ;; gnc:get-exchange-totals. FIXME: Find a
+ ;; better thing to do in this case.
+ (warn "gnc:resolve-unknown-comm:"
+ "Oops - exchange rate ambiguity error: "
+ (gnc-commodity-value->string
+ (list (car pair) ((caadr pair) 'total #f)))
+ " = "
+ (gnc-commodity-value->string
+ (list (car otherlist)
+ ((cdadr pair) 'total #f))))
+ (let
+ ;; Usual case: one of pair-{a,b} was found
+ ;; in reportlist, i.e. this transaction
+ ;; can be resolved to report-commodity.
+ ((newrate
+ (if (not pair-a)
+ (list (car otherlist)
+ (make-newrate (cdadr pair)
+ (caadr pair) pair-b))
+ (list (car pair)
+ (make-newrate (caadr pair)
+ (cdadr pair) pair-a)))))
+ ;; (warn "created new rate: "
+ ;; (gnc-commodity-value->string (list (car
+ ;; newrate) ((caadr newrate) 'total #f))) "
+ ;; = " (gnc-commodity-value->string (list
+ ;; report-commodity ((cdadr newrate) 'total
+ ;; #f))))
+ (set! reportlist (cons newrate reportlist))))))
+ ;; Huh, the report-currency showed up on the wrong side
+ ;; -- we will just add it to the reportlist on the
+ ;; right side.
+ (let ((newrate (list (car otherlist)
+ (cons (cdadr pair) (caadr pair)))))
+ ;; (warn "created new rate: "
+ ;; (gnc-commodity-value->string (list (car newrate)
+ ;; ((caadr newrate) 'total #f))) " = "
+ ;; (gnc-commodity-value->string (list
+ ;; report-commodity ((cdadr newrate) 'total #f))))
+ (set! reportlist (cons newrate reportlist)))))
+ (cadr otherlist))))
sumlist)
;; Return the reportlist.
@@ -531,178 +531,178 @@
;; transactions up until the 'end-date'. Returns an alist, see
;; sumlist.
(define (gnc:get-exchange-totals report-commodity end-date)
- (let ((curr-accounts
- ;;(filter gnc:account-has-shares? ))
- ;; -- use all accounts, not only share accounts, since gnucash-1.7
- (gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
- ;; sumlist: a multilevel alist. Each element has a commodity
- ;; as key, and another alist as a value. The value-alist's
- ;; elements consist of a commodity as a key, and a pair of two
- ;; value-collectors as value, e.g. with only one (the report-)
- ;; commodity DEM in the outer alist: ( {DEM ( [USD (400 .
- ;; 1000)] [FRF (300 . 100)] ) } ) where DEM,USD,FRF are
- ;; <gnc:commodity> and the numbers are a numeric-collector
- ;; which in turn store a <gnc:numeric>. In the example, USD
- ;; 400 were bought for an amount of DEM 1000, FRF 300 were
- ;; bought for DEM 100. The reason for the outer alist is that
- ;; there might be commodity transactions which do not involve
- ;; the report-commodity, but which can still be calculated
- ;; after *all* transactions are processed.
- (sumlist (list (list report-commodity '()))))
+ (let ((curr-accounts
+ ;;(filter gnc:account-has-shares? ))
+ ;; -- use all accounts, not only share accounts, since gnucash-1.7
+ (gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
+ ;; sumlist: a multilevel alist. Each element has a commodity
+ ;; as key, and another alist as a value. The value-alist's
+ ;; elements consist of a commodity as a key, and a pair of two
+ ;; value-collectors as value, e.g. with only one (the report-)
+ ;; commodity DEM in the outer alist: ( {DEM ( [USD (400 .
+ ;; 1000)] [FRF (300 . 100)] ) } ) where DEM,USD,FRF are
+ ;; <gnc:commodity> and the numbers are a numeric-collector
+ ;; which in turn store a <gnc:numeric>. In the example, USD
+ ;; 400 were bought for an amount of DEM 1000, FRF 300 were
+ ;; bought for DEM 100. The reason for the outer alist is that
+ ;; there might be commodity transactions which do not involve
+ ;; the report-commodity, but which can still be calculated
+ ;; after *all* transactions are processed.
+ (sumlist (list (list report-commodity '()))))
(if (not (null? curr-accounts))
- ;; Go through all splits and add up all value-amounts
- ;; and share-amounts
- (for-each
- (lambda (a)
- (let* ((transaction-comm (xaccTransGetCurrency
- (xaccSplitGetParent a)))
- (account-comm (xaccAccountGetCommodity
- (xaccSplitGetAccount a)))
- ;; Always use the absolute value here.
- (share-amount (gnc-numeric-abs
- (xaccSplitGetAmount a)))
- (value-amount (gnc-numeric-abs
- (xaccSplitGetValue a)))
- (tmp (assoc transaction-comm sumlist))
- (comm-list (if (not tmp)
- (assoc account-comm sumlist)
- tmp)))
-
+ ;; Go through all splits and add up all value-amounts
+ ;; and share-amounts
+ (for-each
+ (lambda (a)
+ (let* ((transaction-comm (xaccTransGetCurrency
+ (xaccSplitGetParent a)))
+ (account-comm (xaccAccountGetCommodity
+ (xaccSplitGetAccount a)))
+ ;; Always use the absolute value here.
+ (share-amount (gnc-numeric-abs
+ (xaccSplitGetAmount a)))
+ (value-amount (gnc-numeric-abs
+ (xaccSplitGetValue a)))
+ (tmp (assoc transaction-comm sumlist))
+ (comm-list (if (not tmp)
+ (assoc account-comm sumlist)
+ tmp)))
+
(cond ((gnc-numeric-zero-p share-amount)
;; Without shares this is not a buy or sell; ignore it.
#f)
((not comm-list)
- ;; entry doesn't exist in comm-list
- ;; create sub-alist from scratch
- (let ((pair (list transaction-comm
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector)))))
- ((caadr pair) 'add value-amount)
- ((cdadr pair) 'add share-amount)
- (set! comm-list (list account-comm (list pair)))
- ;; and add the new sub-alist to sumlist.
- (set! sumlist (cons comm-list sumlist))))
+ ;; entry doesn't exist in comm-list
+ ;; create sub-alist from scratch
+ (let ((pair (list transaction-comm
+ (cons (gnc:make-numeric-collector)
+ (gnc:make-numeric-collector)))))
+ ((caadr pair) 'add value-amount)
+ ((cdadr pair) 'add share-amount)
+ (set! comm-list (list account-comm (list pair)))
+ ;; and add the new sub-alist to sumlist.
+ (set! sumlist (cons comm-list sumlist))))
(else
- (let*
- ;; Put the amounts in the right place.
- ((foreignlist
- (if (gnc-commodity-equiv transaction-comm
- (car comm-list))
- (list account-comm
- share-amount value-amount)
- (list transaction-comm
- value-amount share-amount)))
- ;; second commodity already existing in comm-list?
- (pair (assoc (car foreignlist) (cadr comm-list))))
- ;; if not, create a new entry in comm-list.
- (if (not pair)
- (begin
- (set!
- pair (list (car foreignlist)
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector))))
- (set!
- comm-list (list (car comm-list)
- (cons pair (cadr comm-list))))
- (set!
- sumlist (cons comm-list
- (alist-delete
- (car comm-list) sumlist)))))
- ;; And add the balances to the comm-list entry.
- ((caadr pair) 'add (cadr foreignlist))
- ((cdadr pair) 'add (caddr foreignlist)))))))
- (gnc:get-all-commodity-splits curr-accounts end-date)))
-
+ (let*
+ ;; Put the amounts in the right place.
+ ((foreignlist
+ (if (gnc-commodity-equiv transaction-comm
+ (car comm-list))
+ (list account-comm
+ share-amount value-amount)
+ (list transaction-comm
+ value-amount share-amount)))
+ ;; second commodity already existing in comm-list?
+ (pair (assoc (car foreignlist) (cadr comm-list))))
+ ;; if not, create a new entry in comm-list.
+ (if (not pair)
+ (begin
+ (set!
+ pair (list (car foreignlist)
+ (cons (gnc:make-numeric-collector)
+ (gnc:make-numeric-collector))))
+ (set!
+ comm-list (list (car comm-list)
+ (cons pair (cadr comm-list))))
+ (set!
+ sumlist (cons comm-list
+ (alist-delete
+ (car comm-list) sumlist)))))
+ ;; And add the balances to the comm-list entry.
+ ((caadr pair) 'add (cadr foreignlist))
+ ((cdadr pair) 'add (caddr foreignlist)))))))
+ (gnc:get-all-commodity-splits curr-accounts end-date)))
+
(gnc:resolve-unknown-comm sumlist report-commodity)))
;; Calculate the volume-weighted average cost of all commodities,
;; priced in the 'report-commodity'. Uses all transactions up until
;; the 'end-date'. Returns an alist, see sumlist.
(define (gnc:get-exchange-cost-totals report-commodity end-date)
- (let ((curr-accounts
- ;;(filter gnc:account-has-shares? ))
- ;; -- use all accounts, not only share accounts, since gnucash-1.7
- (gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
- ;; sumlist: a multilevel alist. Each element has a commodity
- ;; as key, and another alist as a value. The value-alist's
- ;; elements consist of a commodity as a key, and a pair of two
- ;; value-collectors as value, e.g. with only one (the report-)
- ;; commodity DEM in the outer alist: ( {DEM ( [USD (400 .
- ;; 1000)] [FRF (300 . 100)] ) } ) where DEM,USD,FRF are
- ;; <gnc:commodity> and the numbers are a numeric-collector
- ;; which in turn store a <gnc:numeric>. In the example, USD
- ;; 400 were bought for an amount of DEM 1000, FRF 300 were
- ;; bought for DEM 100. The reason for the outer alist is that
- ;; there might be commodity transactions which do not involve
- ;; the report-commodity, but which can still be calculated
- ;; after *all* transactions are processed.
- (sumlist (list (list report-commodity '()))))
+ (let ((curr-accounts
+ ;;(filter gnc:account-has-shares? ))
+ ;; -- use all accounts, not only share accounts, since gnucash-1.7
+ (gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
+ ;; sumlist: a multilevel alist. Each element has a commodity
+ ;; as key, and another alist as a value. The value-alist's
+ ;; elements consist of a commodity as a key, and a pair of two
+ ;; value-collectors as value, e.g. with only one (the report-)
+ ;; commodity DEM in the outer alist: ( {DEM ( [USD (400 .
+ ;; 1000)] [FRF (300 . 100)] ) } ) where DEM,USD,FRF are
+ ;; <gnc:commodity> and the numbers are a numeric-collector
+ ;; which in turn store a <gnc:numeric>. In the example, USD
+ ;; 400 were bought for an amount of DEM 1000, FRF 300 were
+ ;; bought for DEM 100. The reason for the outer alist is that
+ ;; there might be commodity transactions which do not involve
+ ;; the report-commodity, but which can still be calculated
+ ;; after *all* transactions are processed.
+ (sumlist (list (list report-commodity '()))))
(if (not (null? curr-accounts))
- ;; Go through all splits and add up all value-amounts
- ;; and share-amounts
- ;; However skip splits in trading accounts as these counterbalance
- ;; the actual value and share amounts back to zero
- (for-each
- (lambda (a)
- (if (not (eq? (xaccAccountGetType (xaccSplitGetAccount a)) ACCT-TYPE-TRADING))
- (let* ((transaction-comm (xaccTransGetCurrency
- (xaccSplitGetParent a)))
- (account-comm (xaccAccountGetCommodity
- (xaccSplitGetAccount a)))
- (share-amount (xaccSplitGetAmount a))
- (value-amount (xaccSplitGetValue a))
- (tmp (assoc transaction-comm sumlist))
- (comm-list (if (not tmp)
- (assoc account-comm sumlist)
- tmp)))
-
- ;; entry exists already in comm-list?
- (if (not comm-list)
- ;; no, create sub-alist from scratch
- (let ((pair (list transaction-comm
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector)))))
- ((caadr pair) 'add value-amount)
- ((cdadr pair) 'add share-amount)
- (set! comm-list (list account-comm (list pair)))
- ;; and add the new sub-alist to sumlist.
- (set! sumlist (cons comm-list sumlist)))
- ;; yes, check for second commodity.
- (let*
- ;; Put the amounts in the right place.
- ((foreignlist
- (if (gnc-commodity-equiv transaction-comm
- (car comm-list))
- (list account-comm
- share-amount value-amount)
- (list transaction-comm
- (gnc-numeric-neg value-amount)
- (gnc-numeric-neg share-amount))))
- ;; second commodity already existing in comm-list?
- (pair (assoc (car foreignlist) (cadr comm-list))))
- ;; if not, create a new entry in comm-list.
- (if (not pair)
- (begin
- (set!
- pair (list (car foreignlist)
- (cons (gnc:make-numeric-collector)
- (gnc:make-numeric-collector))))
- (set!
- comm-list (list (car comm-list)
- (cons pair (cadr comm-list))))
- (set!
- sumlist (cons comm-list
- (alist-delete
- (car comm-list) sumlist)))))
- ;; And add the balances to the comm-list entry.
- ((caadr pair) 'add (cadr foreignlist))
- ((cdadr pair) 'add (caddr foreignlist)))))))
- (gnc:get-all-commodity-splits curr-accounts end-date)))
-
+ ;; Go through all splits and add up all value-amounts
+ ;; and share-amounts
+ ;; However skip splits in trading accounts as these counterbalance
+ ;; the actual value and share amounts back to zero
+ (for-each
+ (lambda (a)
+ (if (not (eq? (xaccAccountGetType (xaccSplitGetAccount a)) ACCT-TYPE-TRADING))
+ (let* ((transaction-comm (xaccTransGetCurrency
+ (xaccSplitGetParent a)))
+ (account-comm (xaccAccountGetCommodity
+ (xaccSplitGetAccount a)))
+ (share-amount (xaccSplitGetAmount a))
+ (value-amount (xaccSplitGetValue a))
+ (tmp (assoc transaction-comm sumlist))
+ (comm-list (if (not tmp)
+ (assoc account-comm sumlist)
+ tmp)))
+
+ ;; entry exists already in comm-list?
+ (if (not comm-list)
+ ;; no, create sub-alist from scratch
+ (let ((pair (list transaction-comm
+ (cons (gnc:make-numeric-collector)
+ (gnc:make-numeric-collector)))))
+ ((caadr pair) 'add value-amount)
+ ((cdadr pair) 'add share-amount)
+ (set! comm-list (list account-comm (list pair)))
+ ;; and add the new sub-alist to sumlist.
+ (set! sumlist (cons comm-list sumlist)))
+ ;; yes, check for second commodity.
+ (let*
+ ;; Put the amounts in the right place.
+ ((foreignlist
+ (if (gnc-commodity-equiv transaction-comm
+ (car comm-list))
+ (list account-comm
+ share-amount value-amount)
+ (list transaction-comm
+ (gnc-numeric-neg value-amount)
+ (gnc-numeric-neg share-amount))))
+ ;; second commodity already existing in comm-list?
+ (pair (assoc (car foreignlist) (cadr comm-list))))
+ ;; if not, create a new entry in comm-list.
+ (if (not pair)
+ (begin
+ (set!
+ pair (list (car foreignlist)
+ (cons (gnc:make-numeric-collector)
+ (gnc:make-numeric-collector))))
+ (set!
+ comm-list (list (car comm-list)
+ (cons pair (cadr comm-list))))
+ (set!
+ sumlist (cons comm-list
+ (alist-delete
+ (car comm-list) sumlist)))))
+ ;; And add the balances to the comm-list entry.
+ ((caadr pair) 'add (cadr foreignlist))
+ ((cdadr pair) 'add (caddr foreignlist)))))))
+ (gnc:get-all-commodity-splits curr-accounts end-date)))
+
(gnc:resolve-unknown-comm sumlist report-commodity)))
;; Anybody feel free to reimplement any of these functions, either in
@@ -712,28 +712,28 @@
;; This returns the alist with the actual exchange rates, i.e. the
;; total balances from get-exchange-totals are divided by each
;; other.
- (map
+ (map
(lambda (e)
- (list (car e)
- (gnc-numeric-abs
- (gnc-numeric-div ((cdadr e) 'total #f)
- ((caadr e) 'total #f)
- GNC-DENOM-AUTO
- (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))))
+ (list (car e)
+ (gnc-numeric-abs
+ (gnc-numeric-div ((cdadr e) 'total #f)
+ ((caadr e) 'total #f)
+ GNC-DENOM-AUTO
+ (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))))
(gnc:get-exchange-totals report-commodity end-date)))
(define (gnc:make-exchange-cost-alist report-commodity end-date)
;; This returns the alist with the actual exchange rates, i.e. the
;; total balances from get-exchange-totals are divided by each
;; other.
- (map
+ (map
(lambda (e)
- (list (car e)
- (gnc-numeric-abs
- (gnc-numeric-div ((cdadr e) 'total #f)
- ((caadr e) 'total #f)
- GNC-DENOM-AUTO
- (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))))
+ (list (car e)
+ (gnc-numeric-abs
+ (gnc-numeric-div ((cdadr e) 'total #f)
+ ((caadr e) 'total #f)
+ GNC-DENOM-AUTO
+ (logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))))
(gnc:get-exchange-cost-totals report-commodity end-date)))
@@ -756,15 +756,15 @@
(gnc-is-euro-currency (gnc:gnc-monetary-commodity foreign))
;; FIXME: implement the date check.
(gnc:make-gnc-monetary
- domestic
- (gnc-convert-from-euro
- domestic
- (gnc-convert-to-euro (gnc:gnc-monetary-commodity foreign)
- (gnc:gnc-monetary-amount foreign))))))
+ domestic
+ (gnc-convert-from-euro
+ domestic
+ (gnc-convert-to-euro (gnc:gnc-monetary-commodity foreign)
+ (gnc:gnc-monetary-amount foreign))))))
;; A trivial exchange function - if the "foreign" monetary amount
-;; and the domestic currency are the same, return the foreign
+;; and the domestic currency are the same, return the foreign
;; amount unchanged, otherwise return 0
;; WARNING: many uses of exchange functions assume that the function
@@ -806,21 +806,21 @@
;; <gnc:monetary> 'foreign' into the <gnc:commodity*> 'domestic' by
;; the <gnc:numeric> 'price-value'. Returns a <gnc:monetary>.
(define (gnc:exchange-by-pricevalue-helper
- foreign domestic price-value)
+ foreign domestic price-value)
(if (gnc:gnc-monetary? foreign)
- (gnc:make-gnc-monetary
+ (gnc:make-gnc-monetary
domestic
(if price-value
- (gnc-numeric-mul (gnc:gnc-monetary-amount foreign)
- price-value
- (gnc-commodity-get-fraction domestic)
- GNC-RND-ROUND)
- (begin
- (warn "gnc:exchange-by-pricevalue-helper: No price found for "
- (gnc:monetary->string foreign) " into "
- (gnc:monetary->string
- (gnc:make-gnc-monetary domestic (gnc-numeric-zero))))
- (gnc-numeric-zero))))
+ (gnc-numeric-mul (gnc:gnc-monetary-amount foreign)
+ price-value
+ (gnc-commodity-get-fraction domestic)
+ GNC-RND-ROUND)
+ (begin
+ (warn "gnc:exchange-by-pricevalue-helper: No price found for "
+ (gnc:monetary->string foreign) " into "
+ (gnc:monetary->string
+ (gnc:make-gnc-monetary domestic (gnc-numeric-zero))))
+ (gnc-numeric-zero))))
#f))
;; Helper for gnc:exchange-by-pricedb-* below. 'price' gets tested for
@@ -828,24 +828,24 @@
;; 'foreign' into the <gnc:commodity*> 'domestic' by the <gnc:Price>
;; 'price'. Returns a <gnc:monetary>.
(define (gnc:exchange-by-pricedb-helper
- foreign domestic price)
+ foreign domestic price)
(if (gnc:gnc-monetary? foreign)
- (gnc:make-gnc-monetary
+ (gnc:make-gnc-monetary
domestic
(if price
- (let ((result
- (gnc-numeric-mul (gnc:gnc-monetary-amount foreign)
- (gnc-price-get-value price)
- (gnc-commodity-get-fraction domestic)
- GNC-RND-ROUND)))
- (gnc-price-unref price)
- result)
- (begin
- (warn "gnc:exchange-by-pricedb-helper: No price found for "
- (gnc:monetary->string foreign) " into "
- (gnc:monetary->string
- (gnc:make-gnc-monetary domestic (gnc-numeric-zero))))
- (gnc-numeric-zero))))
+ (let ((result
+ (gnc-numeric-mul (gnc:gnc-monetary-amount foreign)
+ (gnc-price-get-value price)
+ (gnc-commodity-get-fraction domestic)
+ GNC-RND-ROUND)))
+ (gnc-price-unref price)
+ result)
+ (begin
+ (warn "gnc:exchange-by-pricedb-helper: No price found for "
+ (gnc:monetary->string foreign) " into "
+ (gnc:monetary->string
+ (gnc:make-gnc-monetary domestic (gnc-numeric-zero))))
+ (gnc-numeric-zero))))
#f))
;; This is another ready-to-use function for calculation of exchange
@@ -855,18 +855,18 @@
;; 'domestic' commodity. It exchanges the amount into the domestic
;; currency, using the latest price from the pricedb. The function
;; returns a <gnc-monetary>.
-(define (gnc:exchange-by-pricedb-latest
- foreign domestic)
+(define (gnc:exchange-by-pricedb-latest
+ foreign domestic)
(if (and (record? foreign) (gnc:gnc-monetary? foreign))
(or (gnc:exchange-by-euro foreign domestic #f)
- (gnc:exchange-if-same foreign domestic)
- (gnc:make-gnc-monetary
- domestic
- (gnc-pricedb-convert-balance-latest-price
- (gnc-pricedb-get-db (gnc-get-current-book))
- (gnc:gnc-monetary-amount foreign)
- (gnc:gnc-monetary-commodity foreign)
- domestic)))
+ (gnc:exchange-if-same foreign domestic)
+ (gnc:make-gnc-monetary
+ domestic
+ (gnc-pricedb-convert-balance-latest-price
+ (gnc-pricedb-get-db (gnc-get-current-book))
+ (gnc:gnc-monetary-amount foreign)
+ (gnc:gnc-monetary-commodity foreign)
+ domestic)))
#f))
;; Yet another ready-to-use function for calculation of exchange
@@ -878,18 +878,18 @@
;; pricedb according to the given date. The function returns a
;; <gnc-monetary>.
(define (gnc:exchange-by-pricedb-nearest
- foreign domestic date)
+ foreign domestic date)
(if (and (record? foreign) (gnc:gnc-monetary? foreign)
- date)
+ date)
(or (gnc:exchange-by-euro foreign domestic date)
- (gnc:exchange-if-same foreign domestic)
- (gnc:make-gnc-monetary
- domestic
- (gnc-pricedb-convert-balance-nearest-price
- (gnc-pricedb-get-db (gnc-get-current-book))
- (gnc:gnc-monetary-amount foreign)
- (gnc:gnc-monetary-commodity foreign)
- domestic (timespecCanonicalDayTime date))))
+ (gnc:exchange-if-same foreign domestic)
+ (gnc:make-gnc-monetary
+ domestic
+ (gnc-pricedb-convert-balance-nearest-price
+ (gnc-pricedb-get-db (gnc-get-current-book))
+ (gnc:gnc-monetary-amount foreign)
+ (gnc:gnc-monetary-commodity foreign)
+ domestic (timespecCanonicalDayTime date))))
#f))
;; Exchange by the nearest price from pricelist. This function takes
@@ -899,25 +899,25 @@
;; using the price nearest to 'data' found in the pricelist. The
;; function returns a <gnc-monetary>.
(define (gnc:exchange-by-pricealist-nearest
- pricealist foreign domestic date)
- (begin
+ pricealist foreign domestic date)
+ (begin
(gnc:debug "foreign " (gnc:monetary->string foreign))
(gnc:debug "domestic " (gnc-commodity-get-printname domestic))
(gnc:debug "pricealist " pricealist)
-
+
(if (and (record? foreign) (gnc:gnc-monetary? foreign)
- date)
- (or (gnc:exchange-by-euro foreign domestic date)
- (gnc:exchange-if-same foreign domestic)
- (if (not (null? pricealist))
- (gnc:exchange-by-pricevalue-helper
- foreign domestic
- (gnc:pricealist-lookup-nearest-in-time
- pricealist (gnc:gnc-monetary-commodity foreign) date))
- #f))
- #f)))
+ date)
+ (or (gnc:exchange-by-euro foreign domestic date)
+ (gnc:exchange-if-same foreign domestic)
+ (if (not (null? pricealist))
+ (gnc:exchange-by-pricevalue-helper
+ foreign domestic
+ (gnc:pricealist-lookup-nearest-in-time
+ pricealist (gnc:gnc-monetary-commodity foreign) date))
+ #f))
+ #f)))
+
-
@@ -929,32 +929,32 @@
;; Return a ready-to-use function. Which one to use is determined by
;; the value of 'source-option', whose possible values are set in
;; gnc:options-add-price-source!.
-(define (gnc:case-exchange-fn
- source-option report-currency to-date-tp)
+(define (gnc:case-exchange-fn
+ source-option report-currency to-date-tp)
(case source-option
- ((average-cost) (gnc:make-exchange-function
+ ((average-cost) (gnc:make-exchange-function
(gnc:make-exchange-cost-alist
report-currency to-date-tp)))
- ((weighted-average) (gnc:make-exchange-function
- (gnc:make-exchange-alist
- report-currency to-date-tp)))
+ ((weighted-average) (gnc:make-exchange-function
+ (gnc:make-exchange-alist
+ report-currency to-date-tp)))
((pricedb-latest) gnc:exchange-by-pricedb-latest)
((pricedb-nearest) (lambda (foreign domestic)
- (gnc:exchange-by-pricedb-nearest
- foreign domestic to-date-tp)))
- (else
+ (gnc:exchange-by-pricedb-nearest
+ foreign domestic to-date-tp)))
+ (else
(begin
- ;; FIX-ME
+ ;; FIX-ME
;; this is a hack to prevent report crashing if a report
;; implements source-options that aren't fully implemented. We
;; return a reasonably sane fallback function: nearest.
;;
;; known to be missing: pricedb-latest-before
- (gnc:warn "gnc:case-exchange-fn: bad price-source value: "
- source-option " using pricedb-nearest.")
+ (gnc:warn "gnc:case-exchange-fn: bad price-source value: "
+ source-option " using pricedb-nearest.")
(lambda (foreign domestic)
- (gnc:exchange-by-pricedb-nearest
- foreign domestic to-date-tp))))))
+ (gnc:exchange-by-pricedb-nearest
+ foreign domestic to-date-tp))))))
;; Return a ready-to-use function. Which one to use is determined by
;; the value of 'source-option', whose possible values are set in
@@ -963,36 +963,36 @@
;; <int> start-percent, delta-percent: Fill in the [start:start+delta]
;; section of the progress bar while running this function.
;;
-(define (gnc:case-exchange-time-fn
- source-option report-currency commodity-list to-date-tp
- start-percent delta-percent)
+(define (gnc:case-exchange-time-fn
+ source-option report-currency commodity-list to-date-tp
+ start-percent delta-percent)
(case source-option
;; Make this the same as gnc:case-exchange-fn
((average-cost) (let* ((exchange-fn (gnc:make-exchange-function
(gnc:make-exchange-cost-alist
- report-currency to-date-tp))))
+ report-currency to-date-tp))))
(lambda (foreign domestic date)
- (exchange-fn foreign domestic))))
+ (exchange-fn foreign domestic))))
((weighted-average) (let ((pricealist
- (gnc:get-commoditylist-totalavg-prices
- commodity-list report-currency to-date-tp
- start-percent delta-percent)))
- (lambda (foreign domestic date)
- (gnc:exchange-by-pricealist-nearest
- pricealist foreign domestic date))))
+ (gnc:get-commoditylist-totalavg-prices
+ commodity-list report-currency to-date-tp
+ start-percent delta-percent)))
+ (lambda (foreign domestic date)
+ (gnc:exchange-by-pricealist-nearest
+ pricealist foreign domestic date))))
((actual-transactions) (let ((pricealist
- (gnc:get-commoditylist-inst-prices
- commodity-list report-currency to-date-tp)))
- (lambda (foreign domestic date)
- (gnc:exchange-by-pricealist-nearest
- pricealist foreign domestic date))))
+ (gnc:get-commoditylist-inst-prices
+ commodity-list report-currency to-date-tp)))
+ (lambda (foreign domestic date)
+ (gnc:exchange-by-pricealist-nearest
+ pricealist foreign domestic date))))
((pricedb-latest) (lambda (foreign domestic date)
- (gnc:exchange-by-pricedb-latest foreign domestic)))
+ (gnc:exchange-by-pricedb-latest foreign domestic)))
((pricedb-nearest) gnc:exchange-by-pricedb-nearest)
- (else
+ (else
(begin
- (gnc:warn "gnc:case-exchange-time-fn: bad price-source value: "
- source-option ". Using pricedb-nearest.")
+ (gnc:warn "gnc:case-exchange-time-fn: bad price-source value: "
+ source-option ". Using pricedb-nearest.")
;; FIX-ME another hack to prevent report crashing when an
;; unimplemented source-option comes through
gnc:exchange-by-pricedb-nearest
@@ -1051,44 +1051,43 @@
(define (gnc:sum-collector-stocks foreign domestic exchange-fn)
(if foreign
(let ((balance (gnc:make-commodity-collector)))
- (foreign
- 'format
- (lambda (curr val)
- (if (gnc-commodity-equiv domestic curr)
- (balance 'add domestic val)
- (if (gnc-commodity-is-currency curr)
- (balance 'add curr val)
- (balance 'add domestic
- (gnc:gnc-monetary-amount
- (exchange-fn (gnc:make-gnc-monetary curr val)
- domestic))))))
- #f)
- balance)
+ (foreign
+ 'format
+ (lambda (curr val)
+ (if (gnc-commodity-equiv domestic curr)
+ (balance 'add domestic val)
+ (if (gnc-commodity-is-currency curr)
+ (balance 'add curr val)
+ (balance 'add domestic
+ (gnc:gnc-monetary-amount
+ (exchange-fn (gnc:make-gnc-monetary curr val)
+ domestic))))))
+ #f)
+ balance)
#f))
;; Returns the number of commodities in a commodity-collector.
;; (If this were implemented as a record, I would be able to
;; just (length ...) the alist, but....)
(define (gnc-commodity-collector-commodity-count collector)
- (let ((commodities 0))
- (gnc-commodity-collector-map
- collector
- (lambda (comm amt)
- (set! commodities (+ commodities 1))))
- commodities
+ (let ((commodities 0))
+ (gnc-commodity-collector-map
+ collector
+ (lambda (comm amt)
+ (set! commodities (+ commodities 1))))
+ commodities
))
(define (gnc:uniform-commodity? amt report-commodity)
;; function to see if the commodity-collector amt
;; contains any foreign commodities
(let ((elts (gnc-commodity-collector-commodity-count amt))
- )
+ )
(or (equal? elts 0)
- (and (equal? elts 1)
- (gnc-commodity-collector-contains-commodity?
- amt report-commodity)
- )
- )
+ (and (equal? elts 1)
+ (gnc-commodity-collector-contains-commodity?
+ amt report-commodity)
+ )
+ )
)
)
-
Summary of changes:
AUTHORS | 569 +++--
ChangeLog | 264 +-
DOCUMENTERS | 46 +-
NEWS | 47 +
README | 2 +-
doc/CMakeLists.txt | 5 -
po/da.po | 2685 ++++++++++----------
po/sr.po | 781 +++---
src/app-utils/date-utilities.scm | 66 +-
src/base-typemaps.i | 47 +
src/engine/Transaction.c | 10 +-
src/engine/test/test-extras.scm | 8 +-
src/engine/test/test-split.scm | 2 +-
src/gnome-utils/gnc-file.c | 20 +-
src/import-export/qif-imp/qif-parse.scm | 9 +-
src/import-export/qif-imp/qif-to-gnc.scm | 10 +-
src/libqof/qof/gnc-date-p.h | 1 +
src/libqof/qof/gnc-date.cpp | 1 +
src/libqof/qof/test/test-gnc-date.c | 16 +
src/report/business-reports/fancy-invoice.scm | 18 +-
src/report/business-reports/invoice.scm | 2 +-
src/report/business-reports/job-report.scm | 2 +-
src/report/business-reports/owner-report.scm | 2 +-
src/report/locale-specific/us/taxtxf-de_DE.scm | 28 +-
src/report/locale-specific/us/taxtxf.scm | 40 +-
src/report/report-system/commodity-utilities.scm | 1305 +++++-----
.../report-system/test/test-report-utilities.scm | 2 +-
src/report/standard-reports/account-piecharts.scm | 2 +-
src/report/standard-reports/account-summary.scm | 2 +-
src/report/standard-reports/balance-sheet.scm | 2 +-
.../standard-reports/budget-balance-sheet.scm | 2 +-
.../standard-reports/budget-income-statement.scm | 2 +-
src/report/standard-reports/budget.scm | 2 +-
src/report/standard-reports/equity-statement.scm | 2 +-
src/report/standard-reports/income-statement.scm | 2 +-
src/report/standard-reports/sx-summary.scm | 2 +-
.../standard-reports/test/test-cash-flow.scm | 6 +-
src/report/standard-reports/trial-balance.scm | 2 +-
src/report/utility-reports/hello-world.scm | 10 +-
39 files changed, 3253 insertions(+), 2771 deletions(-)
More information about the gnucash-changes
mailing list