Author: jani
Date: Wed Feb 20 19:18:51 2013
New Revision: 1448355
URL: http://svn.apache.org/r1448355
Log:
update with text problems
Modified:
openoffice/branches/l10n/main/dbaccess/source/ext/macromigration/macromigration.src
openoffice/branches/l10n/main/dbaccess/source/ui/app/app.src
openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l
Modified:
openoffice/branches/l10n/main/dbaccess/source/ext/macromigration/macromigration.src
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/dbaccess/source/ext/macromigration/macromigration.src?rev=1448355&r1=1448354&r2=1448355&view=diff
==============================================================================
---
openoffice/branches/l10n/main/dbaccess/source/ext/macromigration/macromigration.src
(original)
+++
openoffice/branches/l10n/main/dbaccess/source/ext/macromigration/macromigration.src
Wed Feb 20 19:18:51 2013
@@ -83,17 +83,7 @@ TabPage TP_PREPARE
TAB_PAGE_HEIGHT - CONTENT_POS_X -
TAB_PAGE_CONTENT_MARGIN - ( 2 * FIXED_TEXT_HEIGHT - SPACING_UNRELATED ) );
WordBreak = TRUE;
- Text [ en-US ] = "This wizard will guide you through the task of
migrating your macros.\n\n"
-
- "After you finished it, all macros which were formerly embedded
into the forms and reports of "
- "the current database document will have been moved to the
document itself. In this course, "
- "libraries will be renamed as needed.\n\n"
-
- "If your forms and reports contain references to those macros,
they will be adjusted, where "
- "possible.\n\n"
-
- "Before the migration can start, all forms, reports, queries and
tables belonging to the document must be closed. "
- "Press 'Next' to do so.";
+ Text [ en-US ] = "This wizard will guide you through the task of
migrating your macros.\n\nAfter you finished it, all macros which were formerly
embedded into the forms and reports of the current database document will have
been moved to the document itself. In this course, libraries will be renamed as
needed.\n\nIf your forms and reports contain references to those macros, they
will be adjusted, where possible.\n\nBefore the migration can start, all forms,
reports, queries and tables belonging to the document must be closed. Press
'Next' to do so.";
};
FixedText FT_CLOSE_DOC_ERROR
@@ -134,9 +124,7 @@ TabPage TP_SAVE_DBDOC_AS
WordBreak = TRUE;
- Text [ en-US ] = "To allow you to go back to the state before the
migration, the database "
- "document will be backed up to a location of your choice. Every
change done by the wizard will "
- "be made to the original document, the backup will stay
untouched.";
+ Text [ en-US ] = "To allow you to go back to the state before the
migration, the database document will be backed up to a location of your
choice. Every change done by the wizard will be made to the original document,
the backup will stay untouched.";
};
FixedText FT_SAVE_AS_LABEL
Modified: openoffice/branches/l10n/main/dbaccess/source/ui/app/app.src
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/dbaccess/source/ui/app/app.src?rev=1448355&r1=1448354&r2=1448355&view=diff
==============================================================================
--- openoffice/branches/l10n/main/dbaccess/source/ui/app/app.src (original)
+++ openoffice/branches/l10n/main/dbaccess/source/ui/app/app.src Wed Feb 20
19:18:51 2013
@@ -429,13 +429,7 @@ String STR_SUB_DOCS_WITH_SCRIPTS
String STR_SUB_DOCS_WITH_SCRIPTS_DETAIL
{
- Text [ en-US ] = "Macros should be embedded into the database document
itself.\n\n"
-
- "You can continue to use your document as before, however,
you are encouraged to migrate "
- "your macros. The menu item 'Tools / Migrate Macros ...'
will assist you with this.\n\n"
-
- "Note that you won't be able to embed macros into the
database document itself until "
- "this migration is done. ";
+ Text [ en-US ] = "Macros should be embedded into the database document
itself.\n\nYou can continue to use your document as before, however, you are
encouraged to migrate your macros. The menu item 'Tools / Migrate Macros ...'
will assist you with this.\n\nNote that you won't be able to embed macros into
the database document itself until this migration is done. ";
};
String RID_STR_EMBEDDED_DATABASE
Modified: openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx?rev=1448355&r1=1448354&r2=1448355&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx Wed Feb 20
19:18:51 2013
@@ -131,6 +131,7 @@ void convert_src::setName(char *syyText)
msName = useText;
else
{
+ mbAutoPush = false;
if (mcStack.size())
mcStack.pop_back();
mcStack.push_back(useText);
@@ -156,6 +157,7 @@ void convert_src::setMacro(char *syyText
mbExpectName =
mbExpectMacro =
mbAutoPush = true;
+ mcStack.push_back("");
}
@@ -197,12 +199,12 @@ void convert_src::setNL(char *syyText, b
sKey += (sKey.size() ? "." : "") + mcStack[nL];
mcMemory.setEnUsKey(sKey, msTextName, msValue);
- mbEnUs = false;
}
if (!bMacro && mbExpectMacro)
{
mcStack.pop_back();
+ mbEnUs =
mbExpectMacro = false;
}
@@ -235,6 +237,7 @@ void convert_src::stopBlock(char *syyTex
if (mcStack.size())
mcStack.pop_back();
mbExpectStringList = false;
+ mbEnUs = false;
}
@@ -243,22 +246,24 @@ void convert_src::stopBlock(char *syyTex
void convert_src::setListItem(char *syyText, bool bIsStart)
{
copySource(syyText);
+ mbExpectStringList = false;
if (bIsStart)
{
- std::stringstream ssBuf;
-
- msTextName = msSaveTextName;
- mbEnUs =
- mbExpectName = true;
- mbExpectName = true;
- ssBuf << ++miListCount;
- msName = ssBuf.str();
+ msTextName = msSaveTextName;
+ mbExpectName = true;
+ msName.clear();
}
else
{
+ std::stringstream ssBuf;
+
mbExpectName = false;
mcStack.pop_back();
+ ssBuf << ++miListCount;
+ if (msName.size())
+ ssBuf << "." << msName;
+ msName = ssBuf.str();
mcStack.push_back(msName);
}
}
Modified: openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l?rev=1448355&r1=1448354&r2=1448355&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l Wed Feb 20
19:18:51 2013
@@ -85,7 +85,7 @@ KEYID [a-zA-Z0-9_-]+
-"//".*\n {
+"//".* {
IMPLptr->copySource(yytext);
}
@@ -103,15 +103,13 @@ KEYID [a-zA-Z0-9_-]+
-{PRE}"{"{SUF} {
- yyless(strlen(yytext)-1);
+"{" {
LOCptr->startBlock(yytext);
}
-{PRE}"}"{SPACE}";"*{SUF} {
- yyless(strlen(yytext)-1);
+"}"{SPACE}";"* {
LOCptr->stopBlock(yytext);
}
@@ -214,7 +212,7 @@ KEYID [a-zA-Z0-9_-]+
IMPLptr->copySource(yytext);
}
-<CMD>[\\\n] {
+<CMD>[\\\n/] {
yyless(1);
BEGIN(INITIAL);
}
