Author: jani
Date: Sun Nov  3 21:10:29 2013
New Revision: 1538453

URL: http://svn.apache.org/r1538453
Log:
changes to make build work after merge.

Modified:
    openoffice/branches/l10n40/main/l10ntools/source/gConPoWrap.cxx
    openoffice/branches/l10n40/main/languages/source/af/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/as/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/ast/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/be-BY/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/br/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/brx/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/bs/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/ca-XV/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/ca/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/cs/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/cy/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/da/connectivity.po
    openoffice/branches/l10n40/main/languages/source/da/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/de/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/dgo/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/en-AU/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/en-GB/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/en-ZA/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/eo/readlicense_oo.po
    openoffice/branches/l10n40/main/languages/source/es/connectivity.po
    openoffice/branches/l10n40/main/languages/source/es/readlicense_oo.po
    openoffice/branches/l10n40/main/solenv/inc/_tg_srs.mk
    openoffice/branches/l10n40/main/solenv/inc/rules.mk
    openoffice/branches/l10n40/main/solenv/inc/target.mk
    openoffice/branches/l10n40/main/solenv/inc/tg_config.mk
    openoffice/branches/l10n40/main/solenv/inc/tg_srs.mk

Modified: openoffice/branches/l10n40/main/l10ntools/source/gConPoWrap.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConPoWrap.cxx?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConPoWrap.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConPoWrap.cxx Sun Nov  3 
21:10:29 2013
@@ -121,7 +121,6 @@ void convert_po::setKey(char *syyText)
   // Activate "look for msg" mode.
   startLook();
 
-
   // skip "#:" and any blanks
   for (syyText += 2; *syyText == ' ' || *syyText == '\t'; ++syyText) ;
   msKey = syyText;

Modified: openoffice/branches/l10n40/main/languages/source/af/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/af/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/af/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/af/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -455,7 +455,7 @@ msgstr ""
 msgid "The Apache OpenOffice Community"
 msgstr "Die OpenOffice.org-gemeenskap"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 #, fuzzy
 msgid "Used / Modified Source Code"
 msgstr "Gebruikte/gewysigde bronkode"

Modified: openoffice/branches/l10n40/main/languages/source/as/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/as/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/as/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/as/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -519,7 +519,7 @@ msgstr ""
 msgid "The Apache OpenOffice Community"
 msgstr "OpenOffice.org সম্প্ৰদায়"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 #, fuzzy
 msgid "Used / Modified Source Code"
 msgstr "ব্যৱহৃত/ ৰূপান্তৰিত উত্স 
ক'ড "

Modified: openoffice/branches/l10n40/main/languages/source/ast/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/ast/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/ast/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/ast/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -488,7 +488,7 @@ msgstr "Pue ayudar xuniéndose a la ll
 msgid  "The Apache OpenOffice Community"
 msgstr "La comunidá d'Apache OpenOffice"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 #, fuzzy
 msgid  "Used / Modified Source Code"
 msgstr "Códigu fonte usáu/modificáu"

Modified: 
openoffice/branches/l10n40/main/languages/source/be-BY/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/be-BY/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/be-BY/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/be-BY/readlicense_oo.po 
Sun Nov  3 21:10:29 2013
@@ -325,6 +325,6 @@ msgstr "Спадзяем
 msgid  "The Apache OpenOffice Community"
 msgstr "Супольнасць OpenOffice.org"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 msgid  "Used / Modified Source Code"
 msgstr "Выкарыстаны/зменены выточны код"

Modified: openoffice/branches/l10n40/main/languages/source/br/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/br/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/br/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/br/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -404,6 +404,6 @@ msgstr ""
 msgid "The Apache OpenOffice Community"
 msgstr ""
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 msgid "Used / Modified Source Code"
 msgstr ""

Modified: openoffice/branches/l10n40/main/languages/source/brx/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/brx/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/brx/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/brx/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -311,6 +311,6 @@ msgstr ""
 msgid  "The Apache OpenOffice Community"
 msgstr ""
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 msgid  "Used / Modified Source Code"
 msgstr ""

Modified: openoffice/branches/l10n40/main/languages/source/bs/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/bs/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/bs/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/bs/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -571,7 +571,7 @@ msgstr ""
 msgid "The Apache OpenOffice Community"
 msgstr "${PRODUCTNAME} zajednica"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 #, fuzzy
 msgid "Used / Modified Source Code"
 msgstr "Korišten / izmijenjen izvorni kod"

Modified: 
openoffice/branches/l10n40/main/languages/source/ca-XV/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/ca-XV/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/ca-XV/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/ca-XV/readlicense_oo.po 
Sun Nov  3 21:10:29 2013
@@ -333,7 +333,7 @@ msgstr "Esperem que gaudiu treballant am
 msgid  "The Apache OpenOffice Community"
 msgstr "La comunitat OpenOffice.org"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 #, fuzzy
 msgid  "Used / Modified Source Code"
 msgstr "Codi font utilitzat / modificat"

Modified: openoffice/branches/l10n40/main/languages/source/ca/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/ca/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/ca/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/ca/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -653,7 +653,7 @@ msgstr ""
 msgid "The Apache OpenOffice Community"
 msgstr ""
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 #, fuzzy
 msgid "Used / Modified Source Code"
 msgstr "Codi font utilitzat / modificat"

Modified: openoffice/branches/l10n40/main/languages/source/cs/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/cs/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/cs/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/cs/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -627,6 +627,6 @@ msgid "The Apache OpenOffice Community"
 msgstr "Komunita Apache OpenOffice"
 
 #: readme.xrm#SDFFD23R3CEFWEFEW
-#, fuzzy
+#, readme.xrm#MODIFIEDSOURCECODEHEADING
 msgid "Used / Modified Source Code"
 msgstr "Použité/upravené zdrojové kódy"

Modified: openoffice/branches/l10n40/main/languages/source/cy/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/cy/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/cy/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/cy/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -596,7 +596,7 @@ msgstr ""
 msgid "The Apache OpenOffice Community"
 msgstr "Cymuned OpenOffice.org"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 #, fuzzy
 msgid "Used / Modified Source Code"
 msgstr "Cod Ffynhonnell Defnyddwyr / Addaswyd"

Modified: openoffice/branches/l10n40/main/languages/source/da/connectivity.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/da/connectivity.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/da/connectivity.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/da/connectivity.po Sun Nov 
 3 21:10:29 2013
@@ -103,7 +103,7 @@ msgid "This statement type not supported
 msgstr "Denne sætningstype understøttes ikke af denne databasedriver."
 
 #: resource/conn_shared_res.src#STR_UNSPECIFIED_ERROR.STRING.TEXT
-msgid "An unknown error occured."
+msgid "An unknown error occurred."
 msgstr "Der opstod en ukendt fejl."
 
 #: resource/conn_shared_res.src#STR_COULD_NOT_CREATE_ADDRESSBOOK.STRING.TEXT
@@ -115,11 +115,11 @@ msgid "The library '$libname$' could not
 msgstr "Biblioteket '$libname$' kunne ikke indlæses."
 
 #: resource/conn_shared_res.src#STR_ERROR_REFRESH_ROW.STRING.TEXT
-msgid "An error occured while refreshing the current row."
+msgid "An error occurred while refreshing the current row."
 msgstr "En fejl opstod under opdatering af den aktuelle række."
 
 #: resource/conn_shared_res.src#STR_ERROR_GET_ROW.STRING.TEXT
-msgid "An error occured while getting the current row."
+msgid "An error occurred while getting the current row."
 msgstr "En fejl opstod under læsning af den aktuelle række."
 
 #: resource/conn_shared_res.src#STR_CAN_NOT_CANCEL_ROW_UPDATE.STRING.TEXT
@@ -136,7 +136,7 @@ msgstr ""
 "Forespørgslen kan ikke udføres. 'IS NULL' kan kun bruges med et 
kolonnenavn."
 
 #: resource/conn_shared_res.src#STR_ILLEGAL_MOVEMENT.STRING.TEXT
-msgid "Illegal cursor movement occured."
+msgid "Illegal cursor movement occurred."
 msgstr "Der opstod en ulovlig markørbevægelse."
 
 #: resource/conn_shared_res.src#STR_COMMIT_ROW.STRING.TEXT
@@ -347,7 +347,7 @@ msgstr ""
 "installeret."
 
 #: resource/conn_shared_res.src#STR_COULD_NOT_DELETE_INDEX.STRING.TEXT
-msgid "The index could not be deleted. An unknown error while accessing the 
file system occured."
+msgid "The index could not be deleted. An unknown error while accessing the 
file system occurred."
 msgstr ""
 "Indekset kunne ikke slettes. En ukendt fejl opstod under tilgangen til "
 "filsystemet."
@@ -656,14 +656,14 @@ msgstr ""
 
 #: resource/conn_shared_res.src#STR_NO_TABLE_CONTAINER.STRING.TEXT
 #, fuzzy
-msgid "An error occured while obtaining the connection's table container."
+msgid "An error occurred while obtaining the connection's table container."
 msgstr ""
 "Der opstod en fejl ved forsøg på at oprette forbindelse til "
 "tabelcontaineren."
 
 #: resource/conn_shared_res.src#STR_NO_TABLE_EDITOR_DIALOG.STRING.TEXT
 #, fuzzy
-msgid "An error occured while creating the table editor dialog."
+msgid "An error occurred while creating the table editor dialog."
 msgstr "En fejl opstod under oprettelse af tabelredigeringsdialogen."
 
 #: resource/conn_shared_res.src#STR_NO_TABLENAME.STRING.TEXT

Modified: openoffice/branches/l10n40/main/languages/source/da/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/da/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/da/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/da/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -621,7 +621,7 @@ msgstr ""
 msgid "The Apache OpenOffice Community"
 msgstr ""
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 #, fuzzy
 msgid "Used / Modified Source Code"
 msgstr "Anvendt/ændret kildetekst"

Modified: openoffice/branches/l10n40/main/languages/source/de/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/de/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/de/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/de/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -644,7 +644,7 @@ msgstr ""
 msgid "The Apache OpenOffice Community"
 msgstr "Die Apache OpenOffice Gemeinschaft"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 #, fuzzy
 msgid "Used / Modified Source Code"
 msgstr "Benutzter / Modifizierter Quelltext"

Modified: openoffice/branches/l10n40/main/languages/source/dgo/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/dgo/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/dgo/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/dgo/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -311,6 +311,6 @@ msgstr ""
 msgid  "The Apache OpenOffice Community"
 msgstr ""
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 msgid  "Used / Modified Source Code"
 msgstr ""

Modified: 
openoffice/branches/l10n40/main/languages/source/en-AU/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/en-AU/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/en-AU/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/en-AU/readlicense_oo.po 
Sun Nov  3 21:10:29 2013
@@ -381,7 +381,7 @@ msgstr "We hope you enjoy working with t
 msgid  "The Apache OpenOffice Community"
 msgstr "The OpenOffice.org Community"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 #, fuzzy
 msgid  "Used / Modified Source Code"
 msgstr "Used / Modified Source Code"

Modified: 
openoffice/branches/l10n40/main/languages/source/en-GB/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/en-GB/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/en-GB/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/en-GB/readlicense_oo.po 
Sun Nov  3 21:10:29 2013
@@ -353,7 +353,7 @@ msgstr "We hope you enjoy working with t
 msgid  "The Apache OpenOffice Community"
 msgstr "The OpenOffice.org Community"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 #, fuzzy
 msgid  "Used / Modified Source Code"
 msgstr "Used / Modified Source Code"

Modified: 
openoffice/branches/l10n40/main/languages/source/en-ZA/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/en-ZA/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/en-ZA/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/en-ZA/readlicense_oo.po 
Sun Nov  3 21:10:29 2013
@@ -333,7 +333,7 @@ msgstr "We hope you enjoy working with t
 msgid  "The Apache OpenOffice Community"
 msgstr "The OpenOffice.org Community"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING 
 #, fuzzy
 msgid  "Used / Modified Source Code"
 msgstr "Used / Modified Source Code"

Modified: openoffice/branches/l10n40/main/languages/source/eo/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/eo/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/eo/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/eo/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -404,6 +404,6 @@ msgstr ""
 msgid "The Apache OpenOffice Community"
 msgstr ""
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 msgid "Used / Modified Source Code"
 msgstr ""

Modified: openoffice/branches/l10n40/main/languages/source/es/connectivity.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/es/connectivity.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/es/connectivity.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/es/connectivity.po Sun Nov 
 3 21:10:29 2013
@@ -114,7 +114,7 @@ msgstr ""
 "datos."
 
 #: resource/conn_shared_res.src#STR_UNSPECIFIED_ERROR.STRING.TEXT
-msgid "An unknown error occured."
+msgid "An unknown error occurred."
 msgstr "Ha ocurrido un error desconocido."
 
 #: resource/conn_shared_res.src#STR_COULD_NOT_CREATE_ADDRESSBOOK.STRING.TEXT
@@ -128,11 +128,11 @@ msgid "The library '$libname$' could not
 msgstr "La biblioteca '$libname$' no pudo ser cargada."
 
 #: resource/conn_shared_res.src#STR_ERROR_REFRESH_ROW.STRING.TEXT
-msgid "An error occured while refreshing the current row."
+msgid "An error occurred while refreshing the current row."
 msgstr "Ha ocurrido un error mientras se actualizaba la fila actual."
 
 #: resource/conn_shared_res.src#STR_ERROR_GET_ROW.STRING.TEXT
-msgid "An error occured while getting the current row."
+msgid "An error occurred while getting the current row."
 msgstr "Ha ocurrido un error mientras se obtenía la fila actual."
 
 #: resource/conn_shared_res.src#STR_CAN_NOT_CANCEL_ROW_UPDATE.STRING.TEXT
@@ -150,7 +150,7 @@ msgstr ""
 "nombre de columna."
 
 #: resource/conn_shared_res.src#STR_ILLEGAL_MOVEMENT.STRING.TEXT
-msgid "Illegal cursor movement occured."
+msgid "Illegal cursor movement occurred."
 msgstr "Ha ocurrido un movimiento ilegal del cursor."
 
 #: resource/conn_shared_res.src#STR_COMMIT_ROW.STRING.TEXT
@@ -363,7 +363,7 @@ msgstr ""
 "sean instalados."
 
 #: resource/conn_shared_res.src#STR_COULD_NOT_DELETE_INDEX.STRING.TEXT
-msgid "The index could not be deleted. An unknown error while accessing the 
file system occured."
+msgid "The index could not be deleted. An unknown error while accessing the 
file system occurred."
 msgstr ""
 "El índice no puede ser borrado. Se produjo un error desconocido al acceder "
 "al sistema de archivos."
@@ -677,14 +677,14 @@ msgstr ""
 
 #: resource/conn_shared_res.src#STR_NO_TABLE_CONTAINER.STRING.TEXT
 #, fuzzy
-msgid "An error occured while obtaining the connection's table container."
+msgid "An error occurred while obtaining the connection's table container."
 msgstr ""
 "Ha ocurrido un error mientras se obtenía el contenedor de la tabla de la "
 "conexión."
 
 #: resource/conn_shared_res.src#STR_NO_TABLE_EDITOR_DIALOG.STRING.TEXT
 #, fuzzy
-msgid "An error occured while creating the table editor dialog."
+msgid "An error occurred while creating the table editor dialog."
 msgstr ""
 "Ha ocurrido un error mientras se creaba el dialogo del editor de la tabla."
 

Modified: openoffice/branches/l10n40/main/languages/source/es/readlicense_oo.po
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/es/readlicense_oo.po?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/es/readlicense_oo.po 
(original)
+++ openoffice/branches/l10n40/main/languages/source/es/readlicense_oo.po Sun 
Nov  3 21:10:29 2013
@@ -667,6 +667,6 @@ msgstr ""
 msgid "The Apache OpenOffice Community"
 msgstr "La comunidad de Apache OpenOffice"
 
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
 msgid "Used / Modified Source Code"
 msgstr "Código fuente usado / modificado"

Modified: openoffice/branches/l10n40/main/solenv/inc/_tg_srs.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/_tg_srs.mk?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/_tg_srs.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/_tg_srs.mk Sun Nov  3 21:10:29 
2013
@@ -36,7 +36,7 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)/$
        $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
        $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o 
$(@).$(INPATH) -m $(LOCALIZESDF) -l all
 
 $(SRS)/$(SRS1NAME).srs: $(LOCALIZE_ME_DEST)
@@ -76,7 +76,7 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)/$
        $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
        $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o 
$(@).$(INPATH) -m $(LOCALIZESDF) -l all
 
 $(SRS)/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST)
@@ -116,7 +116,7 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)/$
        $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
        $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o 
$(@).$(INPATH) -m $(LOCALIZESDF) -l all
 
 $(SRS)/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST)
@@ -156,7 +156,7 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)/$
        $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
        $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o 
$(@).$(INPATH) -m $(LOCALIZESDF) -l all
 
 $(SRS)/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST)
@@ -196,7 +196,7 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)/$
        $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
        $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o 
$(@).$(INPATH) -m $(LOCALIZESDF) -l all
 
 $(SRS)/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST)
@@ -236,7 +236,7 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)/$
        $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
        $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o 
$(@).$(INPATH) -m $(LOCALIZESDF) -l all
 
 $(SRS)/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST)
@@ -276,7 +276,7 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)/$
        $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
        $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o 
$(@).$(INPATH) -m $(LOCALIZESDF) -l all
 
 $(SRS)/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST)
@@ -316,7 +316,7 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)/$
        $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
        $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o 
$(@).$(INPATH) -m $(LOCALIZESDF) -l all
 
 $(SRS)/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST)
@@ -356,7 +356,7 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)/$
        $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
        $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o 
$(@).$(INPATH) -m $(LOCALIZESDF) -l all
 
 $(SRS)/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST)
@@ -396,7 +396,7 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)/
        $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
        $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o 
$(@).$(INPATH) -m $(LOCALIZESDF) -l all
 
 $(SRS)/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST)

Modified: openoffice/branches/l10n40/main/solenv/inc/rules.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/rules.mk?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/rules.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/rules.mk Sun Nov  3 21:10:29 2013
@@ -693,7 +693,7 @@ $(MISC)/%.sh : %.sh
 $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
        @echo "Making: (.ulf)   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -d -f $<
 
 
 $(COMMONMISC)/$(TARGET)/%.xrb : %.xrb

Modified: openoffice/branches/l10n40/main/solenv/inc/target.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/target.mk?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/target.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/target.mk Sun Nov  3 21:10:29 
2013
@@ -1493,7 +1493,7 @@ $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_
 .ENDIF                 # "$(LASTRUN_MERGED)"=="TRUE"
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o 
$(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
 #    $(COMMAND_ECHO)$(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@
 

Modified: openoffice/branches/l10n40/main/solenv/inc/tg_config.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/tg_config.mk?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/tg_config.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/tg_config.mk Sun Nov  3 21:10:29 
2013
@@ -133,7 +133,7 @@ $(XCU_LANG) : $(LOCALIZESDF)
 
 $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu : %.xcu
        @-$(MKDIRHIER) $(@:d)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t $(PROCESSOUT)/merge/$(PACKAGEDIR) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t $(PROCESSOUT)/merge/$(PACKAGEDIR) -d -v -f $<
 
 
 

Modified: openoffice/branches/l10n40/main/solenv/inc/tg_srs.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/tg_srs.mk?rev=1538453&r1=1538452&r2=1538453&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/tg_srs.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/tg_srs.mk Sun Nov  3 21:10:29 
2013
@@ -40,7 +40,7 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMI
        $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
        $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -v -f $<
+        $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source 
"$(WITH_LANG)" -t  $(COMMONMISC)/$(TARGET) -d -v -f $<
 #      $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o 
$(@).$(INPATH) -m $(LOCALIZESDF) -l all
 
 $(SRS)/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST)


Reply via email to