You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/02/19 20:23:41 UTC
svn commit: r1447878 - in /openoffice/branches/l10n/main:
cui/source/customize/ cui/source/dialogs/ cui/source/options/
dbaccess/source/ui/app/ l10ntools/source/
Author: jani
Date: Tue Feb 19 19:23:40 2013
New Revision: 1447878
URL: http://svn.apache.org/r1447878
Log:
removed [ de ] and [ x-comment ]
Modified:
openoffice/branches/l10n/main/cui/source/customize/cfg.src
openoffice/branches/l10n/main/cui/source/dialogs/sdrcelldlg.src
openoffice/branches/l10n/main/cui/source/options/optchart.src
openoffice/branches/l10n/main/cui/source/options/optsave.src
openoffice/branches/l10n/main/dbaccess/source/ui/app/app.src
openoffice/branches/l10n/main/l10ntools/source/gConUlf.hxx
openoffice/branches/l10n/main/l10ntools/source/gConUlfWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConUlflex.l
Modified: openoffice/branches/l10n/main/cui/source/customize/cfg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/customize/cfg.src?rev=1447878&r1=1447877&r2=1447878&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/customize/cfg.src (original)
+++ openoffice/branches/l10n/main/cui/source/customize/cfg.src Tue Feb 19 19:23:40 2013
@@ -27,7 +27,6 @@
TabDialog RID_SVXDLG_CUSTOMIZE
{
OutputSize = TRUE ;
- Text [ de ] = "Anpassen" ;
Text [ en-US ] = "Customize" ;
Moveable = TRUE ;
SvLook = TRUE ;
@@ -39,28 +38,24 @@ TabDialog RID_SVXDLG_CUSTOMIZE
PageItem
{
Identifier = RID_SVXPAGE_MENUS ;
- Text [ de ] = "Menüs" ;
Text [ en-US ] = "Menus" ;
PageResID = 300 ;
};
PageItem
{
Identifier = RID_SVXPAGE_KEYBOARD ;
- Text [ de ] = "Tastatur" ;
Text [ en-US ] = "Keyboard" ;
PageResID = 301 ;
};
PageItem
{
Identifier = RID_SVXPAGE_TOOLBARS ;
- Text [ de ] = "Symbolleisten" ;
Text [ en-US ] = "Toolbars" ;
PageResID = 302 ;
};
PageItem
{
Identifier = RID_SVXPAGE_EVENTS ;
- Text [ de ] = "Ereignisse" ;
Text [ en-US ] = "Events" ;
PageResID = 303 ;
};
@@ -69,47 +64,36 @@ TabDialog RID_SVXDLG_CUSTOMIZE
};
#define TEXT_MENU \
- Text [ de ] = "Menü" ; \
Text [ en-US ] = "Menu" ;\
#define TEXT_BEGIN_GROUP \
- Text [ de ] = "Gruppe beginnen" ; \
Text [ en-US ] = "Begin a Group" ;\
#define TEXT_RENAME \
- Text [ de ] = "Umbenennen..." ; \
Text [ en-US ] = "Rename..." ;\
#define TEXT_DELETE \
- Text [ de ] = "Entfernen..." ; \
Text [ en-US ] = "Delete..." ;\
#define TEXT_DELETE_NODOTS \
- Text [ de ] = "Entfernen" ; \
Text [ en-US ] = "Delete" ;\
#define TEXT_MOVE \
- Text [ de ] = "Verschieben..." ; \
Text [ en-US ] = "Move..." ;\
#define TEXT_DEFAULT_STYLE \
- Text [ de ] = "Standard Einstellungen herstellen" ; \
Text [ en-US ] = "Restore Default Settings" ;\
#define TEXT_DEFAULT_COMMAND \
- Text [ de ] = "Standardbefehl ~wiederherstellen" ; \
Text [ en-US ] = "Restore Default Command" ;\
#define TEXT_TEXT_ONLY \
- Text [ de ] = "Nur Text" ; \
Text [ en-US ] = "Text only" ;\
#define TEXT_TOOLBAR_NAME \
- Text [ de ] = "Name der Symbolleiste" ; \
Text [ en-US ] = "Toolbar Name" ;\
#define TEXT_SAVE_IN \
- Text [ de ] = "Speichern in" ; \
Text [ en-US ] = "Save In" ;\
TabPage RID_SVXPAGE_MENUS
@@ -121,7 +105,6 @@ TabPage RID_SVXPAGE_MENUS
{
Pos = MAP_APPFONT ( 6 , 11 ) ;
Size = MAP_APPFONT ( 261 , 8 ) ;
- Text [ de ] = "%PRODUCTNAME %MODULENAME Menüs" ;
Text [ en-US ] = "%PRODUCTNAME %MODULENAME Menus" ;
};
FixedText FT_MENUS
@@ -144,7 +127,6 @@ TabPage RID_SVXPAGE_MENUS
Pos = MAP_APPFONT ( 192 , 22 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
- Text [ de ] = "Neu..." ;
Text [ en-US ] = "New..." ;
};
MenuButton BTN_CHANGE
@@ -159,7 +141,6 @@ TabPage RID_SVXPAGE_MENUS
{
Pos = MAP_APPFONT ( 6 , 56 ) ;
Size = MAP_APPFONT ( 261 , 8 ) ;
- Text [ de ] = "Menüinhalt" ;
Text [ en-US ] = "Menu Content" ;
};
FixedText GRP_MENU_ENTRIES
@@ -167,7 +148,6 @@ TabPage RID_SVXPAGE_MENUS
Pos = MAP_APPFONT ( 9 , 67 ) ;
Size = MAP_APPFONT ( 55 , 8 ) ;
Group = TRUE ;
- Text [ de ] = "Einträge" ;
Text [ en-US ] = "Entries" ;
};
Control BOX_ENTRIES
@@ -184,7 +164,6 @@ TabPage RID_SVXPAGE_MENUS
Pos = MAP_APPFONT ( 192 , 67 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
- Text [ de ] = "Hinzufügen..." ;
Text [ en-US ] = "Add..." ;
};
MenuButton BTN_CHANGE_ENTRY
@@ -193,7 +172,6 @@ TabPage RID_SVXPAGE_MENUS
Pos = MAP_APPFONT ( 192 , 84 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
- Text [ de ] = "Ãndern" ;
Text [ en-US ] = "Modify" ;
};
ImageButton BTN_UP
@@ -233,7 +211,6 @@ TabPage RID_SVXPAGE_MENUS
{
Pos = MAP_APPFONT ( 6 , 205 ) ;
Size = MAP_APPFONT ( 261 , 8 ) ;
- Text [ de ] = "Beschreibung" ;
Text [ en-US ] = "Description" ;
};
MultiLineEdit ED_DESCRIPTION
@@ -281,7 +258,6 @@ Menu MODIFY_ENTRY
MenuItem
{
Identifier = ID_ADD_SUBMENU ;
- Text [ de ] = "Untermenü einfügen..." ;
Text [ en-US ] = "Add Submenu..." ;
};
MenuItem
@@ -342,7 +318,6 @@ Menu MODIFY_TOOLBAR
Identifier = ID_ICONS_ONLY ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
- Text [ de ] = "Nur Symbole" ;
Text [ en-US ] = "Icons Only" ;
};
MenuItem
@@ -357,7 +332,6 @@ Menu MODIFY_TOOLBAR
Identifier = ID_ICONS_AND_TEXT ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
- Text [ de ] = "Symbole & Text" ;
Text [ en-US ] = "Icons & Text" ;
};
};
@@ -399,7 +373,6 @@ Menu MODIFY_TOOLBAR_CONTENT
MenuItem
{
Identifier = ID_ICON_ONLY ;
- Text [ de ] = "Nur Symbol" ;
Text [ en-US ] = "Icon Only" ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
@@ -407,7 +380,6 @@ Menu MODIFY_TOOLBAR_CONTENT
MenuItem
{
Identifier = ID_TEXT_ONLY ;
- Text [ de ] = "Nur Text" ;
Text [ en-US ] = "Text Only" ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
@@ -415,7 +387,6 @@ Menu MODIFY_TOOLBAR_CONTENT
MenuItem
{
Identifier = ID_ICON_AND_TEXT ;
- Text [ de ] = "Symbol & Text" ;
Text [ en-US ] = "Icon & Text" ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
@@ -428,13 +399,11 @@ Menu MODIFY_TOOLBAR_CONTENT
MenuItem
{
Identifier = ID_CHANGE_SYMBOL ;
- Text [ de ] = "Symbol austauschen..." ;
Text [ en-US ] = "Change Icon..." ;
};
MenuItem
{
Identifier = ID_RESET_SYMBOL ;
- Text [ de ] = "Symbol zurücksetzen" ;
Text [ en-US ] = "Reset Icon" ;
};
};
@@ -443,38 +412,32 @@ Menu MODIFY_TOOLBAR_CONTENT
/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */
String RID_SVXSTR_NEW_MENU
{
- Text [ de ] = "Neues Menü %n";
Text [ en-US ] = "New Menu %n";
};
/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */
String RID_SVXSTR_NEW_TOOLBAR
{
- Text [ de ] = "Neue Symbolleiste %n";
Text [ en-US ] = "New Toolbar %n";
};
String RID_SVXSTR_MOVE_MENU
{
- Text [ de ] = "Menü verschieben";
Text [ en-US ] = "Move Menu";
};
String RID_SVXSTR_ADD_SUBMENU
{
- Text [ de ] = "Untermenü hinzufügen";
Text [ en-US ] = "Add Submenu";
};
String RID_SVXSTR_SUBMENU_NAME
{
- Text [ de ] = "Name des Untermenüs";
Text [ en-US ] = "Submenu name";
};
String RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION
{
- Text [ de ] = "Um Befehle einem menu hinzuzufügen, wählen Sie zuerst eine Kategorie und dann den Befehl. Alternativ ziehen Sie den Befehl in die Befehlsliste auf der Registerseite 'Menüs' im Dialog 'Anpassen'.";
Text [ en-US ] = "To add a command to a menu, select the category and then the command. You can also drag the command to the Commands list of the Menus tab page in the Customize dialog.";
};
@@ -482,7 +445,6 @@ ModalDialog MD_MENU_ORGANISER
{
OutputSize = TRUE ;
Size = MAP_APPFONT ( 172 , 154 ) ;
- Text [ de ] = "Neues Menü" ;
Text [ en-US ] = "New Menu" ;
SvLook = TRUE ;
Moveable = TRUE ;
@@ -493,7 +455,6 @@ ModalDialog MD_MENU_ORGANISER
Size = MAP_APPFONT ( 93 , 8 ) ;
Group = TRUE ;
Left = TRUE ;
- Text [ de ] = "Menüname" ;
Text [ en-US ] = "Menu name" ;
};
Edit EDIT_MENU_NAME
@@ -510,7 +471,6 @@ ModalDialog MD_MENU_ORGANISER
Size = MAP_APPFONT ( 93 , 8 ) ;
Group = TRUE ;
Left = TRUE ;
- Text [ de ] = "Menüposition" ;
Text [ en-US ] = "Menu position" ;
};
Control BOX_MAIN_MENUS
@@ -562,7 +522,6 @@ ModalDialog MD_NEW_TOOLBAR
OutputSize = TRUE ;
SvLook = TRUE ;
Size = MAP_APPFONT ( 165 , 63 ) ;
- Text [ de ] = "Name" ;
Text [ en-US ] = "Name" ;
Moveable = TRUE ;
FixedText FT_NAME
@@ -625,7 +584,6 @@ ModalDialog MD_ICONSELECTOR
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 240 , 152 ) ;
- Text [ de ] = "Symbole Austauschen" ;
Text [ en-US ] = "Change Icon" ;
Moveable = TRUE ;
HelpId = HID_SVX_CONFIG_ICON_SELECTOR;
@@ -633,7 +591,6 @@ ModalDialog MD_ICONSELECTOR
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 172 , 8 ) ;
- Text [ de ] = "Symbole" ;
Text [ en-US ] = "Icons" ;
};
ToolBox TB_SYMBOLS
@@ -669,7 +626,6 @@ ModalDialog MD_ICONSELECTOR
Pos = MAP_APPFONT ( 184 , 7 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
- Text [ de ] = "Importieren..." ;
Text[ en-US ] = "Import...";
};
PushButton BTN_DELETE
@@ -684,7 +640,6 @@ ModalDialog MD_ICONSELECTOR
{
Pos = MAP_APPFONT ( 12 , 95 ) ;
Size = MAP_APPFONT ( 200 , 24 ) ;
- Text [ de ] = "Hinweis:\nBitte beachten Sie das für einen erfolgreichen Import die Symbole eine GröÃe von 16x16 Pixel haben müssen." ;
Text [ en-US ] = "Note:\nThe size of an icon should be 16x16 pixel to achieve best quality. Different sized icons will be scaled automatically." ;
Left = TRUE ;
WordBreak = TRUE;
@@ -749,7 +704,6 @@ ModalDialog MD_ICONCHANGE
// Strings ---------------------------------------------------------------
String RID_SVXSTR_IMPORT_ICON_ERROR
{
- Text [ de ] = "Die aufgelisteten Dateien konnten nicht importiert werden. Die Symbole entsprechen nicht der GröÃe von 16x16 Pixel." ;
Text [ en-US ] = "The files listed below could not be imported. The file format could not be interpreted." ;
};
@@ -775,31 +729,26 @@ String RID_SVXSTR_YESTOALL //added for i
String RID_SVXSTR_PRODUCTNAME_TOOLBARS
{
- Text [ de ] = "%PRODUCTNAME %MODULENAME Symbolleisten" ;
Text [ en-US ] = "%PRODUCTNAME %MODULENAME Toolbars" ;
};
String RID_SVXSTR_TOOLBAR
{
- Text [ de ] = "Symbolleiste" ;
Text [ en-US ] = "Toolbar" ;
};
String RID_SVXSTR_TOOLBAR_CONTENT
{
- Text [ de ] = "Symbolleisteninhalt" ;
Text [ en-US ] = "Toolbar Content" ;
};
String RID_SVXSTR_COMMANDS
{
- Text [ de ] = "Befehle" ;
Text [ en-US ] = "Commands" ;
};
String RID_SVXSTR_COMMAND
{
- Text [ de ] = "Befehl" ;
Text [ en-US ] = "Command" ;
};
@@ -811,7 +760,6 @@ String RID_SVXSTR_TOOLBAR_NAME
/* %MENUNAME will be replaced at runtime by the name of the selected menu. */
QueryBox QBX_CONFIRM_DELETE_MENU
{
- Message [ de ] = "Sind Sie sicher, dass Sie das Menü '%MENUNAME' löschen möchten?";
Message [ en-US ] = "Are you sure you want to delete the '%MENUNAME' menu?";
BUTTONS = WB_YES_NO ;
DEFBUTTON = WB_DEF_NO ;
@@ -819,7 +767,6 @@ QueryBox QBX_CONFIRM_DELETE_MENU
QueryBox QBX_CONFIRM_DELETE_TOOLBAR
{
- Message [ de ] = "Die Symbolleiste beinhaltet keine Befehle mehr. Soll die Symbolleiste gelöscht werden?";
Message [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?";
BUTTONS = WB_YES_NO ;
DEFBUTTON = WB_DEF_NO ;
@@ -830,7 +777,6 @@ QueryBox QBX_CONFIRM_DELETE_TOOLBAR
*/
QueryBox QBX_CONFIRM_RESET
{
- Message [ de ] = "Die Menükonfiguration für %SAVE IN SELECTION% wird auf die Standardeinstellung zurückgesetzt. Möchten Sie fortfahren?";
Message [ en-US ] = "The menu configuration for %SAVE IN SELECTION% will be reset to the factory settings. Do you want to continue?";
BUTTONS = WB_YES_NO ;
DEFBUTTON = WB_DEF_NO ;
@@ -842,19 +788,16 @@ QueryBox QBX_CONFIRM_RESET
*/
String RID_SVXSTR_CONFIRM_MENU_RESET
{
- Text [ de ] = "Die Menükonfiguration für %SAVE IN SELECTION% wird auf die Standardeinstellung zurückgesetzt. Möchten Sie fortfahren?";
Text [ en-US ] = "The menu configuration for %SAVE IN SELECTION% will be reset to the factory settings. Do you want to continue?";
};
String RID_SVXSTR_CONFIRM_TOOLBAR_RESET
{
- Text [ de ] = "Die Symbolleistenkonfiguration für %SAVE IN SELECTION% wird auf die Standardeinstellung zurückgesetzt. Möchten Sie fortfahren?";
Text [ en-US ] = "The toolbar configuration for %SAVE IN SELECTION% will be reset to the factory settings. Do you want to continue?";
};
QueryBox QBX_CONFIRM_RESTORE_DEFAULT
{
- Message [ de ] = "Alle Anpassungen die an dieser Symbolleiste vorgenommen wurden werden gelöscht. Möchten Sie diese Symbolleiste wirklich zurücksetzen?";
Message [ en-US ] = "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?";
BUTTONS = WB_YES_NO ;
DEFBUTTON = WB_DEF_NO ;
@@ -862,25 +805,21 @@ QueryBox QBX_CONFIRM_RESTORE_DEFAULT
InfoBox IBX_MNUCFG_ALREADY_INCLUDED
{
- Message [ de ] = "Die Funktion ist bereits in diesem Popup enthalten." ;
Message [ en-US ] = "Function is already included in this popup." ;
};
String RID_SVXSTR_LABEL_NEW_NAME
{
- Text [ de ] = "~Neuer Name";
Text [ en-US ] = "~New name";
};
String RID_SVXSTR_RENAME_MENU
{
- Text [ de ] = "Menü umbenennen";
Text [ en-US ] = "Rename Menu";
};
String RID_SVXSTR_RENAME_TOOLBAR
{
- Text [ de ] = "Symbolleiste umbenennen";
Text [ en-US ] = "Rename Toolbar";
};
Modified: openoffice/branches/l10n/main/cui/source/dialogs/sdrcelldlg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/dialogs/sdrcelldlg.src?rev=1447878&r1=1447877&r2=1447878&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/dialogs/sdrcelldlg.src (original)
+++ openoffice/branches/l10n/main/cui/source/dialogs/sdrcelldlg.src Tue Feb 19 19:23:40 2013
@@ -29,7 +29,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 289 , 176 ) ;
- Text [ de ] = "Zellen formatieren" ;
Text [ en-US ] = "Format Cells" ;
Moveable = TRUE ;
Closeable = TRUE ;
@@ -44,33 +43,25 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
{
Identifier = RID_SVXPAGE_CHAR_NAME ;
PageResID = RID_SVXPAGE_CHAR_NAME ;
- Text [ de ] = "Schrift" ;
Text [ en-US ] = "Font" ;
- Text [ x-comment ] = " ";
};
PageItem
{
Identifier = RID_SVXPAGE_CHAR_EFFECTS ;
PageResID = RID_SVXPAGE_CHAR_EFFECTS ;
- Text [ de ] = "Schrifteffekt" ;
Text [ en-US ] = "Font Effects" ;
- Text [ x-comment ] = " ";
};
PageItem
{
Identifier = RID_SVXPAGE_BORDER;
PageResID = RID_SVXPAGE_BORDER;
- Text [ de ] = "Umrandung" ;
Text [ en-US ] = "Borders" ;
- Text [ x-comment ] = " ";
};
PageItem
{
Identifier = RID_SVXPAGE_AREA;
PageResID = RID_SVXPAGE_AREA;
- Text [ de ] = "Hintergrund";
Text [ en-US ] = "Background";
- Text [ x-comment ] = " ";
};
};
};
@@ -97,12 +88,9 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
Pos = MAP_APPFONT ( 169 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
/* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */
- Text [ de ] = "Zurück" ;
Text [ en-US ] = "Return" ;
TabStop = TRUE ;
- Text [ x-comment ] = " ";
};
- Text [ x-comment ] = " ";
};
Modified: openoffice/branches/l10n/main/cui/source/options/optchart.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/options/optchart.src?rev=1447878&r1=1447877&r2=1447878&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/options/optchart.src (original)
+++ openoffice/branches/l10n/main/cui/source/options/optchart.src Tue Feb 19 19:23:40 2013
@@ -38,7 +38,6 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Text [ en-US ] = "Chart colors";
- Text [ x-comment ] = " ";
};
ListBox LB_CHART_COLOR_LIST
{
@@ -54,7 +53,6 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
Pos = MAP_APPFONT ( 92 , 3 ) ;
Size = MAP_APPFONT ( 106 , 8 ) ;
Text [ en-US ] = "Color table" ;
- Text [ x-comment ] = " ";
};
Control CT_COLOR_BOX
{
@@ -69,7 +67,6 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
Pos = MAP_APPFONT ( 204 , 165 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Default";
- Text [ x-comment ] = " ";
};
};
Modified: openoffice/branches/l10n/main/cui/source/options/optsave.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/options/optsave.src?rev=1447878&r1=1447877&r2=1447878&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/options/optsave.src (original)
+++ openoffice/branches/l10n/main/cui/source/options/optsave.src Tue Feb 19 19:23:40 2013
@@ -227,7 +227,6 @@ TabPage RID_SFXPAGE_SAVE
Size = MAP_APPFONT ( 239 , 8 ) ;
Hide = TRUE;
Text [ en-US ] = "Not using ODF 1.2 Extended may cause infomation to be lost.";
- Text [ x-comment ] = "EN-US, the term 'extended' must not be translated.";
};
Image IMG_ODF_WARNING
{
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=1447878&r1=1447877&r2=1447878&view=diff
==============================================================================
--- openoffice/branches/l10n/main/dbaccess/source/ui/app/app.src (original)
+++ openoffice/branches/l10n/main/dbaccess/source/ui/app/app.src Tue Feb 19 19:23:40 2013
@@ -298,7 +298,6 @@ String RID_STR_FORMS_HELP_TEXT
};
String RID_STR_REPORT_HELP_TEXT
{
- Text [ de ] ="Erstellen Sie einen Bericht, indem Sie die Datensatzquelle, Steuerelemente und Steuerelementeigenschaften angeben." ;
Text [ en-US ] = "Create a report by specifying the record source, controls, and control properties." ;
};
String RID_STR_FORMS_HELP_TEXT_WIZARD
Modified: openoffice/branches/l10n/main/l10ntools/source/gConUlf.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConUlf.hxx?rev=1447878&r1=1447877&r2=1447878&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConUlf.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConUlf.hxx Tue Feb 19 19:23:40 2013
@@ -39,14 +39,15 @@ class convert_ulf : public convert_gen_i
convert_ulf(l10nMem& crMemory);
~convert_ulf();
- void setKey(char *syyText);
- void setText(char *syyText);
+ void setKey(char *syyText);
+ void setText(char *syyText, bool bIsEnUs);
+ void setValue(char *syyText);
private:
- std::string msKey;
+ std::string msKey;
void execute();
- void handleLines();
+ void handleLines();
};
#endif
\ No newline at end of file
Modified: openoffice/branches/l10n/main/l10ntools/source/gConUlfWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConUlfWrap.cxx?rev=1447878&r1=1447877&r2=1447878&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConUlfWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConUlfWrap.cxx Tue Feb 19 19:23:40 2013
@@ -52,7 +52,7 @@ namespace UlfWrap
/********************** I M P L E M E N T A T I O N **********************/
void convert_ulf::execute()
{
- UlfWrap::genulf_lex();
+ UlfWrap::yylex();
}
@@ -69,35 +69,22 @@ void convert_ulf::setKey(char *syyText)
/********************** I M P L E M E N T A T I O N **********************/
-void convert_ulf::setText(char *syyText)
+void convert_ulf::setText(char *syyText, bool bIsEnUs)
{
- std::string useText, sText = copySource(syyText);
- int nL;
+ std::string sText = copySource(syyText) + " is not en-US";
- // isolate text
- nL = sText.find("=");
- if (nL == (int)std::string::npos)
- return;
-//JIX isolateText(sText, nL+1, &nL, useText);
-
- if (mbMergeMode)
- {
- // get all languages (includes en-US)
- std::vector<l10nMem_entry *>& cExtraLangauges = mcMemory.getLanguagesForKey(msKey);
- std::string sNewLine;
- nL = cExtraLangauges.size();
-
- // and all other languages for that key
- for (int i = 0; i < nL; ++i)
- {
- sNewLine = cExtraLangauges[i]->msLanguage + " = \"" +
- cExtraLangauges[i]->msText +
- "\"\n";
-
- writeSourceFile(sNewLine);
- }
- }
- else
- mcMemory.setEnUsKey(msKey, std::string("LngText"), useText);
+ if (!bIsEnUs)
+ showError((char *)sText.c_str());
+}
+
+
+
+/********************** I M P L E M E N T A T I O N **********************/
+void convert_ulf::setValue(char *syyText)
+{
+ std::string sText = copySource(syyText, false);
+
+
+ mcMemory.setEnUsKey(msKey, std::string("LngText"), sText);
}
Modified: openoffice/branches/l10n/main/l10ntools/source/gConUlflex.l
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConUlflex.l?rev=1447878&r1=1447877&r2=1447878&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConUlflex.l (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConUlflex.l Tue Feb 19 19:23:40 2013
@@ -49,23 +49,70 @@
/* --- The following options are for future use (maybe) */
/* yyclass= --> subClass yyFlexLexer to allow own functions */
/* c++ --> generate C++ classes */
-%option 8bit noyywrap never-interactive prefix="genulf_"
+%option 8bit noyywrap never-interactive
%p 24000
%e 1200
%n 500
+/*********************** H E L P E R M A C R O S ***********************/
+PRE ^[ \t]*
+SUF [ \t\r\n]
+SUFT [ \t\r\n\[]
+SPACE [ \t]*
+IDENT ([a-zA-Z0-9][ a-zA-Z0-9_\-\+\*]*[a-zA-Z0-9]|[0-9])
+KEYID [a-zA-Z0-9_-]+
+
/******************* R U L E S D E F I N I T I O N S *******************/
%%
-"["[^\]]*"]" {
+
+
+"/*" {
+ int i = 1;
+ for (;;)
+ {
+ while ((yytext[++i] = yyinput()) != '*') ;
+ if ((yytext[++i] = yyinput()) == '/')
+ break;
+ }
+ yytext[i] = '\0';
+
+ IMPLptr->copySource(yytext);
+}
+
+
+
+"\"" {
+ int i = 0;
+ for (; (yytext[++i] = yyinput()) != '\"';)
+ if (yytext[i] == '\\')
+ yytext[++i] = yyinput();
+ yytext[i] = '\0';
+
+ LOCptr->setValue(&yytext[1]);
+}
+
+
+
+"["[^\]]+"]" {
LOCptr->setKey(yytext);
}
-"en-US"[ ]*"="[^\n]* {
- LOCptr->setText(yytext);
+
+
+"en-US"[ \t]*"=" {
+ LOCptr->setText(yytext, true);
}
+
+
+
+[a-zA-Z_\-]+[ \t]*"=" {
+ LOCptr->setText(yytext, false);
+}
+
+
.|\n {
IMPLptr->copySource(yytext);