gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Tue May 20 04:39:57 EDT 2014
Updated via https://github.com/Gnucash/gnucash/commit/5af8d231 (commit)
via https://github.com/Gnucash/gnucash/commit/c742110c (commit)
via https://github.com/Gnucash/gnucash/commit/3cd2fc56 (commit)
via https://github.com/Gnucash/gnucash/commit/25d9b420 (commit)
from https://github.com/Gnucash/gnucash/commit/15e9bde7 (commit)
commit 5af8d2318debccc72cf1ef833d3bb49ffe7da4a7
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 20 10:31:12 2014 +0200
Backport John's fix for a truly ancient bug
diff --git a/src/libqof/qof/gnc-date.c b/src/libqof/qof/gnc-date.c
index 2bfbf7d..33c390f 100644
--- a/src/libqof/qof/gnc-date.c
+++ b/src/libqof/qof/gnc-date.c
@@ -1343,7 +1343,7 @@ char dateSeparator (void)
gnc_localtime_r(&secs, &tm);
qof_strftime(string, sizeof(string), GNC_D_FMT, &tm);
- for (s = string; s != '\0'; s++)
+ for (s = string; *s != '\0'; s++)
if (!isdigit(*s))
return (locale_separator = *s);
}
commit c742110c11a3776c986a32ad31c73cd7945d398d
Merge: 3cd2fc5 25d9b42
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 20 10:05:29 2014 +0200
Merge branch 'scheduled_tx_i18n_prefix' of https://github.com/zeldigas/gnucash into maint
commit 3cd2fc56532983624a25652d2ccda340f019169b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon May 19 21:37:10 2014 +0200
Bug 610202 - gnucash silently closes when no X11/$DISPLAY is present
diff --git a/src/bin/gnucash-bin.c b/src/bin/gnucash-bin.c
index a8ca481..bf041cf 100644
--- a/src/bin/gnucash-bin.c
+++ b/src/bin/gnucash-bin.c
@@ -761,7 +761,8 @@ main(int argc, char ** argv)
if(!gtk_init_check (&argc, &argv))
{
g_printerr(_("%s\nRun '%s --help' to see a full list of available command line options.\n"),
- _("Error: could not initialize graphical user interface and option add-price-quotes was not set."),
+ _("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 ?"),
argv[0]);
return 1;
}
commit 25d9b420c665bd72359f471dd002d4f1329c5dbb
Author: Dmitry Pavlov <zeldigas at gmail.com>
Date: Mon May 19 21:02:19 2014 +0400
added context to ambigous i18n keys for scheduled transaction add/edit dialog
diff --git a/src/gnome-utils/gtkbuilder/gnc-frequency.glade b/src/gnome-utils/gtkbuilder/gnc-frequency.glade
index 2c22c8b..f3869c5 100644
--- a/src/gnome-utils/gtkbuilder/gnc-frequency.glade
+++ b/src/gnome-utils/gtkbuilder/gnc-frequency.glade
@@ -168,7 +168,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Every</property>
+ <property name="label" translatable="yes" context="Daily">Every</property>
<property name="justify">right</property>
</object>
<packing>
@@ -202,7 +202,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">days.</property>
+ <property name="label" translatable="yes" context="Daily">days.</property>
<property name="justify">center</property>
</object>
<packing>
@@ -247,7 +247,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Every</property>
+ <property name="label" translatable="yes" context="Weekly">Every</property>
<property name="justify">right</property>
</object>
<packing>
@@ -280,7 +280,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">weeks.</property>
+ <property name="label" translatable="yes" context="Weekly">weeks.</property>
<property name="justify">fill</property>
</object>
<packing>
@@ -490,7 +490,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Every</property>
+ <property name="label" translatable="yes" context="Semimonthly">Every</property>
<property name="justify">right</property>
</object>
<packing>
@@ -523,7 +523,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">months.</property>
+ <property name="label" translatable="yes" context="Semimonthly">months.</property>
</object>
<packing>
<property name="expand">False</property>
@@ -732,7 +732,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Every</property>
+ <property name="label" translatable="yes" context="Monthly">Every</property>
<property name="justify">center</property>
</object>
<packing>
@@ -767,7 +767,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">months.</property>
+ <property name="label" translatable="yes" context="Monthly">months.</property>
<property name="justify">center</property>
</object>
<packing>
Summary of changes:
src/bin/gnucash-bin.c | 3 ++-
src/gnome-utils/gtkbuilder/gnc-frequency.glade | 16 ++++++++--------
src/libqof/qof/gnc-date.c | 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
More information about the gnucash-changes
mailing list