Sync branch with r14658 from trunk.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/swigify@14659 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -4,11 +4,6 @@
 	currency problems when importing QIF files (introduced by the
 	widget cleanup.)
 
-2006-08-09  Derek Atkins  <derek@ihtfp.com>
-
-	* move gnc-gtk-utils from core-utils to gnome-utils because
-	  core-utils should not depend on gtk.
-
 2006-08-08  Christian Stimming <stimming@tuhh.de>
 
 	* configure.in, src/gnome-utils/schemas/Makefile.am: Find absolute

doc/tip_of_the_day.list.in

@@ -57,6 +57,9 @@ Accounts -> Open Subaccounts from the menu.")
 decrement the selected date. You can use '+' and '-' to increment and \
 decrement check numbers as well.")
 
+ N_( "To switch between multiple tabs in the main window, press \
+Control+Alt+Page Up/Down.")
+
  N_( "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.")

src/business/business-reports/aging.scm

@@ -643,9 +643,7 @@ totals to report currency")
 	(gnc:html-document-add-object!
 	 document
 	 (gnc:make-html-text
-	  (string-append
-	   "No Valid Account Selected.  "
-	   "Click on the Options button and select the account to use."))))
+	  (_ "No valid account selected.  Click on the Options button and select the account to use."))))
     (gnc:free-query query)
     (gnc:report-finished)
     document))

src/business/business-reports/owner-report.scm

@@ -617,7 +617,7 @@
 	 (gnc:make-html-text
 	  (sprintf #f 
 		   (_ "No valid %s selected.  Click on the Options button to select a company.")
-		   type-str))))
+		   (_ type-str))))) ;; FIXME because of translations: Please change this string into full sentences instead of sprintf, because in non-english languages the "no valid" has different forms depending on the grammatical gender of the "%s".
 
     (gnc:free-query query)
     document))

src/core-utils/Makefile.am

@@ -6,11 +6,13 @@ libcore_utils_la_SOURCES = \
   gnc-gdate-utils.c \
   gnc-gkeyfile-utils.c \
   gnc-glib-utils.c \
-  gnc-gobject-utils.c
+  gnc-gobject-utils.c \
+  gnc-gtk-utils.c
 
 libcore_utils_la_LIBADD = \
   ${GLIB_LIBS} \
-  ${GCONF_LIBS}
+  ${GCONF_LIBS} \
+  ${GTK_LIBS}
 
 nodist_libgw_core_utils_la_SOURCES = \
   gw-core-utils.c
@@ -27,7 +29,8 @@ noinst_HEADERS = \
   gnc-gdate-utils.h \
   gnc-gkeyfile-utils.h \
   gnc-glib-utils.h \
-  gnc-gobject-utils.h
+  gnc-gobject-utils.h \
+  gnc-gtk-utils.h
 
 EXTRA_DIST = ${gwmod_DATA}
 
@@ -35,7 +38,8 @@ AM_CFLAGS = \
   ${G_WRAP_COMPILE_ARGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
-  ${GCONF_CFLAGS}
+  ${GCONF_CFLAGS} \
+  ${GTK_CFLAGS}
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
 gwmod_DATA = gw-core-utils-spec.scm

src/core-utils/gnc-gobject-utils.c

@@ -26,6 +26,10 @@
 #include <stdio.h>
 #include "gnc-gobject-utils.h"
 
+#include <gtk/gtk.h>	// For gtk_main_quit(). Can't get this to work with
+			// a g_source attached to the main glib context.
+
+
 static void gnc_gobject_weak_cb (gpointer user_data, GObject *object);
 
 /************************************************************/

src/gnome-utils/Makefile.am

@@ -66,7 +66,6 @@ libgncmod_gnome_utils_la_SOURCES = \
   gnc-recurrence.c \
   gnc-general-select.c \
   gnc-gnome-utils.c \
-  gnc-gtk-utils.c \
   gnc-gui-query.c \
   gnc-html-graph-gog.c \
   gnc-html-history.c \
@@ -133,7 +132,6 @@ gncinclude_HEADERS = \
   gnc-recurrence.h \
   gnc-general-select.h \
   gnc-gnome-utils.h \
-  gnc-gtk-utils.h \
   gnc-gui-query.h \
   gnc-html-graph-gog.h \
   gnc-html-history.h \

src/import-export/import-backend.c

@@ -592,7 +592,9 @@ static void split_find_match (GNCImportTransInfo * trans_info,
       /*DEBUG(" downloaded_split_amount=%f", downloaded_split_amount);*/
       match_split_amount = gnc_numeric_to_double(xaccSplitGetAmount(split));
       /*DEBUG(" match_split_amount=%f", match_split_amount);*/
-      if(downloaded_split_amount == match_split_amount)
+      if(fabs(downloaded_split_amount - match_split_amount) < 1e-6)
+	/* bug#347791: Doubly type shouldn't be compared for exact
+	   equality, so we're using fabs() instead. */
 	/*if (gnc_numeric_equal(xaccSplitGetAmount
 	  (gnc_import_TransInfo_get_fsplit (trans_info)),
 	  xaccSplitGetAmount(split))) 

src/report/report-system/html-utilities.scm

@@ -794,9 +794,9 @@
     (gnc:html-text-append!
      p
      (gnc:html-markup-h2 (string-append
-			  report-title-string
+			  (_ report-title-string)
 			  ":"))
-     (gnc:html-markup-h2 (_ ""))
+     (gnc:html-markup-h2 "")
      (gnc:html-markup-p
       (_ "This report requires you to specify certain report options.")))
     (if report-id
@@ -818,7 +818,7 @@
     (gnc:html-text-append! 
      p 
      (gnc:html-markup-h2 (string-append 
-			  report-title-string
+			  (_ report-title-string)
 			  ":"))
      (gnc:html-markup-h2 (_ "No accounts selected"))
      (gnc:html-markup-p

src/report/standard-reports/account-summary.scm

@@ -133,7 +133,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-report-title
-      "a" opthelp-report-title reportname))
+      "a" opthelp-report-title (_ reportname)))
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-name

src/report/standard-reports/balance-sheet.scm

@@ -151,7 +151,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-report-title
-      "a" opthelp-report-title reportname))
+      "a" opthelp-report-title (_ reportname)))
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-name

src/report/standard-reports/equity-statement.scm

@@ -107,7 +107,7 @@
     (add-option
       (gnc:make-string-option
       (N_ "General") optname-report-title
-      "a" opthelp-report-title reportname))
+      "a" opthelp-report-title (_ reportname)))
     (add-option
       (gnc:make-string-option
       (N_ "General") optname-party-name

src/report/standard-reports/general-journal.scm

@@ -83,15 +83,15 @@
       (list "query" (gnc:query->scm query)) ;; think this wants an scm...
       (list "journal" #t)
       (list "double" #t)
-      (list "debit-string" (N_ "Debit"))
-      (list "credit-string" (N_ "Credit"))
+      (list "debit-string" (_ "Debit"))
+      (list "credit-string" (_ "Credit"))
       )
      )
     ;; we'll leave query malloc'd in case this is required by the C side...
     
     ;; set options in the general tab...
     (set-option!
-     gnc:pagename-general (N_ "Title") (N_ "General Journal"))
+     gnc:pagename-general (N_ "Title") (_ reportname))
     ;; we can't (currently) set the Report name here
     ;; because it is automatically set to the template
     ;; name... :(

src/report/standard-reports/income-statement.scm

@@ -134,7 +134,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-report-title
-      "a" opthelp-report-title reportname))
+      "a" opthelp-report-title (_ reportname)))
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-name

src/report/standard-reports/trial-balance.scm

@@ -144,7 +144,7 @@
     (add-option
       (gnc:make-string-option
       (N_ "General") optname-report-title
-      "a" opthelp-report-title reportname))
+      "a" opthelp-report-title (_ reportname)))
     (add-option
       (gnc:make-string-option
       (N_ "General") optname-party-name

src/report/utility-reports/Makefile.am

@@ -21,8 +21,9 @@ gncscmmod_DATA = \
   hello-world.scm \
   utility-reports.scm \
   view-column.scm \
-  welcome-to-gnucash.scm \
-  test-graphing.scm
+  welcome-to-gnucash.scm
+
+#  test-graphing.scm -- not intended for general public?!? Surely not translated at all.
 
 if GNUCASH_SEPARATE_BUILDDIR
 #For separate build directory

src/report/utility-reports/utility-reports.scm

@@ -12,6 +12,6 @@
 (use-modules (gnucash report view-column))
 (use-modules (gnucash report welcome-to-gnucash))
 
-(use-modules (gnucash report test-graphing))
+;;(use-modules (gnucash report test-graphing))
 
 (re-export gnc:make-welcome-report)