From d86ecf7dff71c451c2eb58a7f5a82ba7d83f1d62 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 25 Jul 2012 02:26:34 +0000 Subject: [PATCH] 2012-07-25 04:24 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/rddads/rddads.hbc * do not force shared mode for host project if HB_DYNLOAD_RDDADS is enabled. It should fix hbide forced to be built in -shared mode unconditionally after enabling rddads support in hbide in 2012-06-14 12:01 UTC+0200 ; please test * src/lang/hu.c + translated rest of strings to Hungarian (though they seem to make much more sense in English) --- harbour/ChangeLog | 18 +++++++++++--- harbour/contrib/rddads/rddads.hbc | 4 +++- harbour/src/lang/hu.c | 40 +++++++++++++++---------------- 3 files changed, 38 insertions(+), 24 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4d35e62ab4..7c7d9f5357 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2012-07-25 04:24 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/rddads/rddads.hbc + * do not force shared mode for host project if HB_DYNLOAD_RDDADS + is enabled. It should fix hbide forced to be built in + -shared mode unconditionally after enabling rddads + support in hbide in 2012-06-14 12:01 UTC+0200 + ; please test + + * src/lang/hu.c + + translated rest of strings to Hungarian + (though they seem to make much more sense in English) + 2012-07-24 19:22 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/docks.prg ! Fix to prev commit. @@ -25,11 +37,11 @@ + contrib/hbide/docs/faq.htm * contrib/hbide/hbide.qrc + Discovered: how .html resources can be embedded into executable - and brought to service in QTextBrowser. + and brought to service in QTextBrowser. HbIDE's FAQ is now shown in docking widget. - It is scheduled to be extended to bring all the help I could + It is scheduled to be extended to bring all the help I could write over-time under it. The design may be changed. - Now it is much easier to write/edit/embed .htm pages + Now it is much easier to write/edit/embed .htm pages inside HbIDE. 2012-07-25 01:34 UTC+0200 Viktor Szakats (harbour syenar.net) diff --git a/harbour/contrib/rddads/rddads.hbc b/harbour/contrib/rddads/rddads.hbc index 190caed95a..a60d5dd194 100644 --- a/harbour/contrib/rddads/rddads.hbc +++ b/harbour/contrib/rddads/rddads.hbc @@ -10,7 +10,9 @@ skip={!(linux|win)} incpaths=. {HB_DYNLOAD_RDDADS}prgflags=-D__HBDYNLOAD__RDDADS__ -{HB_DYNLOAD_RDDADS}shared=yes +# Dynamic loading requires -shared executable, but +# let's leave enabling that to the host project. +#{HB_DYNLOAD_RDDADS}shared=yes {!HB_DYNLOAD_RDDADS}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {!HB_DYNLOAD_RDDADS&win&x86}libs=ace32 diff --git a/harbour/src/lang/hu.c b/harbour/src/lang/hu.c index 10f08d8d34..05091c57df 100644 --- a/harbour/src/lang/hu.c +++ b/harbour/src/lang/hu.c @@ -167,26 +167,26 @@ static HB_LANG s_lang = "Túl sok rekurzív hiba kezelő hívás", "Az RDD hibás vagy nem sikerült betölteni", "Nem megfelelő típusú metódus (%s)", - "hb_xgrab can't allocate memory", - "hb_xrealloc called with a NULL pointer", - "hb_xrealloc called with an invalid pointer", - "hb_xrealloc can't reallocate memory", - "hb_xfree called with an invalid pointer", - "hb_xfree called with a NULL pointer", - "Can\'t locate the starting procedure: \'%s\'", - "No starting procedure", - "Unsupported VM opcode", - "Symbol item expected from %s", - "Invalid symbol type for self from %s", - "Codeblock expected from %s", - "Incorrect item type on the stack trying to pop from %s", - "Stack underflow", - "An item was going to be copied to itself from %s", - "Invalid symbol item passed as memvar %s", - "Memory buffer overflow", - "hb_xgrab requested to allocate zero bytes", - "hb_xrealloc requested to resize to zero bytes", - "hb_xalloc requested to allocate zero bytes", + "hb_xgrab nem tud memóriát foglalni", + "hb_xrealloc NULL mutatóval került meghívásra", + "hb_xrealloc hibás mutatóval került meghívásra", + "hb_xrealloc nem tud memóriát újrafoglalni", + "hb_xfree hibás mutatóval került meghívásra", + "hb_xfree NULL mutatóval került meghívásra", + "Nem sikerült megtalálni az indítási procedúrát: \'%s\'", + "Nem található indítási procedúra", + "Ismeretlen VM opkód", + "%s hívásnak szimbólum adatra van szüksége", + "%s hívásnál hibás 'self' szimbólum típus", + "%s hívásnak kódblokkra van szüksége", + "%s hívásnál helytelen adattípus a verem tetején", + "Verem alulcsordulás", + "%s hívás az adatot önmagára kísérelte meg másolni", + "Hibás szimbólum adat került átadásra %s memória változóként", + "Memória puffer túlcsordulás", + "hb_xgrab nulla bájt lefoglalására lett utasítva", + "hb_xrealloc nulla bájt újrafoglalására lett utasítva", + "hb_xalloc nulla bájt lefoglalására lett utasítva", /* Texts */