diff --git a/ChangeLog.txt b/ChangeLog.txt index 9296d130e0..7b91de6ba2 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,16 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-04-03 00:19 UTC+0200 Viktor Szakats (harbour syenar.net) + * include/hblang.hbx + * src/lang/Makefile + * src/rtl/langcomp.prg + + src/lang/l_es_419.c + + added 'es_419' - Spanish (Latin America) to Harbour + core languages + ! fixed typo in language mapping of 'sr-sp-cyrl' to 'sr_cyr' + + accept 'zh' for Chinese (Traditional) + 2013-04-02 23:44 UTC+0200 Viktor Szakats (harbour syenar.net) * tests/lang2po.hb * tests/po2lang.hb diff --git a/include/hblang.hbx b/include/hblang.hbx index 3cadb77021..b43d0a0128 100644 --- a/include/hblang.hbx +++ b/include/hblang.hbx @@ -38,6 +38,7 @@ DYNAMIC HB_LANG_EL DYNAMIC HB_LANG_EN DYNAMIC HB_LANG_EO DYNAMIC HB_LANG_ES +DYNAMIC HB_LANG_ES_419 DYNAMIC HB_LANG_EU DYNAMIC HB_LANG_FR DYNAMIC HB_LANG_GL diff --git a/src/lang/Makefile b/src/lang/Makefile index f121da6cc2..30c2566f1e 100644 --- a/src/lang/Makefile +++ b/src/lang/Makefile @@ -10,6 +10,7 @@ C_SOURCES := \ l_el.c \ l_eo.c \ l_es.c \ + l_es_419.c \ l_eu.c \ l_fr.c \ l_gl.c \ diff --git a/src/lang/l_es_419.c b/src/lang/l_es_419.c new file mode 100644 index 0000000000..063122b18e --- /dev/null +++ b/src/lang/l_es_419.c @@ -0,0 +1,197 @@ +/* + * Harbour Project source code: + * Language Support Module (es_419) + * + * Copyright 2000 Jose Lalin + * Copyright 2000 Antonio Linares + * www - http://harbour-project.org + * + * 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, 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 software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#include "hbapilng.h" + +static HB_LANG s_lang = +{ + { + /* Identification */ + + "es_419", /* ISO ID (2 chars) */ + "Spanish (Latin American)", /* Name (in English) */ + "Español", /* Name (in native language) */ + "ES", /* RFC ID */ + "UTF8", /* Codepage */ + "", /* Version */ + + /* Month names */ + + "Enero", + "Febrero", + "Marzo", + "Abril", + "Mayo", + "Junio", + "Julio", + "Agosto", + "Septiembre", + "Octubre", + "Noviembre", + "Diciembre", + + /* Day names */ + + "Domingo", + "Lunes", + "Martes", + "Miércoles", + "Jueves", + "Viernes", + "Sábado", + + /* CA-Cl*pper compatible natmsg items */ + + "Bases de Datos # Registros Ultima act. Tamaño", + "Desea Vd. más ejemplos?", + "Página Nº.", + "** Subtotal **", + "* Subsubtotal *", + "*** Total ***", + "Ins", + " ", + "Fecha no válida", + "Rango: ", + " - ", + "S/N", + "EXPRESION NO VÁLIDA", + + /* Error description names */ + + "Error desconocido", + "Error de argumento", + "Error de rango", + "Desbordamiento en cadena de caracteres", + "Desbordamiento numérico", + "División por cero", + "Error numérico", + "Error de sintaxis", + "Operación demasiado compleja", + "", + "", + "Poca memoria", + "Función no definida", + "No existe el método", + "No existe la variable", + "No existe el alias", + "No existe la variable de instancia", + "Alias con caracteres no válidos", + "Alias actualmente en uso", + "", + "Error de creación", + "Error de apertura", + "Error de cierre", + "Error de lectura", + "Error de escritura", + "Error de impresión", + "", + "", + "", + "", + "Operación no soportada", + "Límite excedido", + "Se detectó corrupción", + "Error de tipo de datos", + "Error de anchura de datos", + "Area de trabajo no usada", + "Area de trabajo no indexada", + "Se requiere uso exclusivo", + "Se requiere bloqueo", + "Escritura no autorizada", + "Fallo en el bloqueo de adición", + "Fallo en bloqueo", + "", + "", + "", + "", + "acceso al array", + "asignación del array", + "dimensión del array", + "no es un array", + "conditional", + + /* Internal error names */ + + "Error irrecuperable %d: ", + "Fallo en recuperación de error", + "No hay ERRORBLOCK() para el error", + "Demasiadas llamadas recursivas al controlador de errores", + "RDD no válido ó fallo al cargar", + "Tipo de método no válido desde %s", + "hb_xgrab no puede asignar memoria", + "hb_xrealloc llamado con un puntero nulo", + "hb_xrealloc llamado con un puntero no válido", + "hb_xrealloc no puede reubicar la memoria", + "hb_xfree llamado con un puntero no válido", + "hb_xfree llamado con un puntero nulo", + "No se puede localizar el procedimiento de inicio: \'%s\'", + "No hay procedimiento de inicio", + "Opcode no soportado por la VM", + "Símbolo item esperado desde %s", + "Tipo de símbolo para self no válido desde %s", + "Bloque de código esperado desde %s", + "Tipo item incorrecto en la Pila al tratar de sacarlo desde %s", + "Desbordamiento negativo en la Pila", + "Un item estaba siendo copiado sobre sí mismo desde %s", + "Símbolo item no válido pasado como memvar %s", + "Desbordamiento de buffer de memoria", + "hb_xgrab requirió apartar cero bytes", + "hb_xrealloc requirió redimensionar a cero bytes", + "hb_xalloc requirió apartar cero bytes", + + /* Texts */ + + "DD/MM/YYYY", + "S", + "N" + } +}; + +#define HB_LANG_ID ES +#include "hbmsgreg.h" diff --git a/src/rtl/langcomp.prg b/src/rtl/langcomp.prg index 42bbaa1039..bac57446a3 100644 --- a/src/rtl/langcomp.prg +++ b/src/rtl/langcomp.prg @@ -242,7 +242,7 @@ STATIC FUNCTION __LangStdToLangHb( cLangStd ) CASE "en-zw" CASE "en" ; cLangHb := "en" ; EXIT CASE "eo" ; cLangHb := "eo" ; EXIT - CASE "es-419" + CASE "es-419" ; cLangHb := "es_419" ; EXIT CASE "es-ar" CASE "es-bo" CASE "es-cl" @@ -353,7 +353,7 @@ STATIC FUNCTION __LangStdToLangHb( cLangStd ) CASE "sl" ; cLangHb := "sl" ; EXIT CASE "sq-al" ; EXIT CASE "sq" ; EXIT - CASE "sr-sp-cyrl" ; cLangHb := "sr_cyrl" ; EXIT + CASE "sr-sp-cyrl" ; cLangHb := "sr_cyr" ; EXIT CASE "sr-sp-latn" ; cLangHb := "sr_lat" ; EXIT CASE "sv-fi" CASE "sv-se" @@ -387,7 +387,8 @@ STATIC FUNCTION __LangStdToLangHb( cLangStd ) CASE "zh-hk" CASE "zh-mo" CASE "zh-sg" - CASE "zh-tw" ; cLangHb := "zh_tra" ; EXIT + CASE "zh-tw" + CASE "zh" ; cLangHb := "zh_tra" ; EXIT ENDSWITCH ENDIF