Merge branch 'maint'

Resolved conflicts:
	src/core-utils/gnc-features.c
	src/core-utils/gnc-features.h
	src/engine/test/CMakeLists.txt
	src/gnc-module/test/test-dynload.c
	src/import-export/import-match-map.c

CMakeLists.txt

@@ -91,7 +91,10 @@ IF(GNC_BUILD_AS_INSTALL)
 ENDIF()
 
 SET(SHELL_FROM_ENV $ENV{SHELL})
-SET(SHELL bin/bash)
+SET(SHELL /bin/bash)
+IF (WIN32)
+  SET(SHELL ${CMAKE_PREFIX_PATH}/mingw/msys/1.0/bin/bash.exe)
+ENDIF()
 IF (SHELL_FROM_ENV) # Replacing this with IF ($ENV{SHELL}) doesn't work.
   SET(SHELL ${SHELL_FROM_ENV})
 ENDIF()
@@ -224,16 +227,10 @@ IF (GUILE2_FOUND) # found guile-2.0
   ADD_DEFINITIONS (-DHAVE_GUILE20)
   SET(HAVE_GUILE2 TRUE)
   SET(GUILE_EFFECTIVE_VERSION 2.0)
-  # We also need to look up the executable
-  FIND_PROGRAM (GUILE_EXECUTABLE guile)
-  FIND_PROGRAM (GUILD_EXECUTABLE guild)
-
   SET(GUILE_INCLUDE_DIRS ${GUILE2_INCLUDE_DIRS})
   SET(GUILE_LDFLAGS ${GUILE2_LDFLAGS})
 
-  IF (NOT GUILE_EXECUTABLE)
-    MESSAGE (SEND_ERROR "The guile executable was not found, but is required. Please set GUILE_EXECUTABLE.")
-  ENDIF (NOT GUILE_EXECUTABLE)
+  FIND_PROGRAM (GUILD_EXECUTABLE guild)
   IF (NOT GUILD_EXECUTABLE)
     MESSAGE (SEND_ERROR "The guild executable was not found, but is required. Please set GUILD_EXECUTABLE.")
   ENDIF (NOT GUILD_EXECUTABLE)
@@ -245,13 +242,18 @@ ELSE()
     MESSAGE (SEND_ERROR "Neither guile 1.8 nor guile 2.0 where find. Please set PKG_CONFIG_PATH one of these is found.")
   ENDIF(NOT GUILE1_FOUND)
 
-  SET(GUILE_INCLUDE_DIRS ${GUILE1_INCLUDE_DIRS})
-  SET(GUILE_LDFLAGS ${GUILE1_LDFLAGS})
   SET(HAVE_GUILE1 TRUE)
   SET(GUILE_EFFECTIVE_VERSION 1.8)
+  SET(GUILE_INCLUDE_DIRS ${GUILE1_INCLUDE_DIRS})
+  SET(GUILE_LDFLAGS ${GUILE1_LDFLAGS})
   MESSAGE(STATUS "Using guile-1.8.x")
 ENDIF()
 
+FIND_PROGRAM (GUILE_EXECUTABLE guile)
+IF (NOT GUILE_EXECUTABLE)
+  MESSAGE (SEND_ERROR "The guile executable was not found, but is required. Please set GUILE_EXECUTABLE.")
+ENDIF (NOT GUILE_EXECUTABLE)
+
 # Qt
 IF (WITH_CUTECASH)
   SET (QT_MIN_VERSION "4.5.0")
@@ -429,7 +431,7 @@ ADD_CUSTOM_TARGET(check
      scm-test-core scm-test-report-system scm-standard-reports-2
      scm-test-standard-reports foo gncmodfoo baz gncmodbaz
      bar gncmodbar gncmod_agedver gncmod_incompatdep
-     gncmod_futuremodsys
+     gncmod_futuremodsys test-core-guile
 )
 IF (NOT WIN32)
   ADD_DEPENDENCIES(check gncmod-backend-xml-link)

accounts/fr_CA/acctchrt_basecommune.gnucash-xea

@@ -6,7 +6,7 @@
 		<gnc-act:short-description>
 			Ensemble des comptes de base les plus couramment utilisés	</gnc-act:short-description>
 		<gnc-act:long-description>
-			La plupart des utilisateurs sélectionneront ce groupe/hiérarchie  de comptes.  Il inclut des comptes de base couramment utilisés par les particuliers, tels que compte chèques, compte d'éargne, encaisse, carte de crédit. revenus et dépenses.
+			La plupart des utilisateurs sélectionneront ce groupe/hiérarchie  de comptes.  Il inclut des comptes de base couramment utilisés par les particuliers, tels que compte chèques, compte d'épargne, encaisse, carte de crédit. revenus et dépenses.
 		</gnc-act:long-description>    
 		<gnc-act:start-selected>1</gnc-act:start-selected>
 		<gnc:account version="2.0.0">

doc/README.translator.txt

@@ -48,7 +48,7 @@ You need to update this with the current information.
 
 For example in the de.po file, we have this:
 
-# Messages in Deutsch f�r GnuCash
+# Messages in Deutsch für GnuCash
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Jan-Uwe Finck <Jan-Uwe.Finck@bigfoot.de>, 1999.
 
@@ -64,14 +64,14 @@ msgid ""
 "The GNU way to manage your money!"
 msgstr ""
 
-After, the tranlation in the de.po file:
+After, the translation in the de.po file:
 
 #: messages-i18n.c:11
 msgid ""
 "The GnuCash personal finance manager.\n"
 "The GNU way to manage your money!"
 msgstr ""
-"GnuCash: Ihr pers�nlicher Finanzmanager.\n"
+"GnuCash: Ihr persönlicher Finanzmanager.\n"
 "Der GNU-Weg, ihr Geld zu verwalten !"
 
 
@@ -145,7 +145,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Es gab einen Fehler beim �ffnen der Datei. \n"
+"Es gab einen Fehler beim Öffnen der Datei. \n"
 "     %s."
 
 You need to correct the translated string and remove the 'fuzzy' keyword.
@@ -159,7 +159,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Es gab einen Fehler beim �ffnen der Datei. \n"
+"Es gab einen Fehler beim Öffnen der Datei. \n"
 "     %s."
 
 2) You have this:
@@ -205,7 +205,7 @@ For each file:
 4) Change the gnc-act:title, gnc-act:short-description, and
    gnc-act:long-description to contain appropriately translated text.
    Do not add any newlines in the long description except at the end
-   and begining of the string.
+   and beginning of the string.
 5) For each gnc:account in the file translate the act:name, and
    act:description fields.  Please do not translate any other fields.
 

doc/tip_of_the_day.list.in

@@ -17,7 +17,8 @@ account details. For more information on choosing an account type \
 or setting up a chart of accounts, please see the GnuCash online \
 manual.")
 
- N_( "Click the right mouse button in the main window to bring up the \
+ N_( "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.")
 
@@ -43,8 +44,8 @@ of the parent account, followed by ':' and the first letter(s) of \
 the subaccount (e.g. A:C for Assets:Cash.)")
 
  N_( "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.")
+From the Accounts tab in the main window, highlight the parent account \
+and select View -> Open Subaccounts from the menu.")
 
  N_( "When entering dates, you can type '+' or '-' to increment or \
 decrement the selected date. You can use '+' and '-' to increment and \
@@ -84,8 +85,8 @@ you can choose the monthly basic frequency and then set 'Every \
 12 months'.")
 
  N_( "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.")
+registers after midnight, to get the new date as default for new \
+transactions. It is not necessary to restart GnuCash.")
 
  N_( "The GnuCash developers are easy to contact. As well \
 as several mailing lists, you can chat to them live on IRC! \