This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new bd8dae885a Changed wording of error dialog
bd8dae885a is described below
commit bd8dae885a4a78e97079413f47c91ac3fdbd4e91
Author: mseidel <[email protected]>
AuthorDate: Sat Jun 18 14:01:41 2022 +0200
Changed wording of error dialog
---
main/uui/source/newerverwarn.src | 85 ++++++++++++++++++++--------------------
1 file changed, 42 insertions(+), 43 deletions(-)
diff --git a/main/uui/source/newerverwarn.src b/main/uui/source/newerverwarn.src
index 8c886c7da3..5dfdc4eb71 100644
--- a/main/uui/source/newerverwarn.src
+++ b/main/uui/source/newerverwarn.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -26,53 +26,52 @@
#include "newerverwarn.hrc"
#include "ids.hrc"
-#define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
-
ModalDialog RID_DLG_NEWER_VERSION_WARNING
{
- HelpId = HID_DLG_NEWERVERSIONWARNING;
+ HelpId = HID_DLG_NEWERVERSIONWARNING ;
OutputSize = TRUE ;
- Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH, DLG_HEIGHT ) ;
SvLook = TRUE ;
Moveable = TRUE ;
- Closeable = TRUE ;
- Text [ en-US ] = "%PRODUCTNAME Update Available" ;
- FixedImage FI_IMAGE
- {
- Pos = MAP_APPFONT ( COL_1 , ROW_1 );
- Size = MAP_APPFONT ( IMAGE_WIDTH , IMAGE_HEIGHT );
- Hide = FALSE;
- Fixed = Image
- {
- ImageBitmap = Bitmap { File = "versionwarning.png"; };
- MaskColor = STD_MASKCOLOR;
- };
- };
- FixedText FT_INFO
- {
- Pos = MAP_APPFONT( COL_2, ROW_1 );
- Size = MAP_APPFONT( INFO_WIDTH, INFO_LINES * RSC_CD_FIXEDTEXT_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "This document was created by a newer version of
%PRODUCTNAME. It may contain features not supported by your current
version.\n\nClick 'Update Now...' to run online update and get the latest
version of %PRODUCTNAME.";
- };
- FixedLine FL_BUTTON
+ Closeable = TRUE ;
+ Text [ en-US ] = "ODF Version Conflict" ;
+ FixedImage FI_IMAGE
+ {
+ Pos = MAP_APPFONT ( COL_1, ROW_1 ) ;
+ Size = MAP_APPFONT ( IMAGE_WIDTH, IMAGE_HEIGHT ) ;
+ Hide = FALSE ;
+ Fixed = Image
+ {
+ ImageBitmap = Bitmap {File = "versionwarning.png" ;} ;
+ };
+ };
+ FixedText FT_INFO
+ {
+ Pos = MAP_APPFONT ( COL_2, ROW_1 ) ;
+ Size = MAP_APPFONT ( INFO_WIDTH, INFO_LINES *
RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Wordbreak = TRUE ;
+ Text [ en-US ] = "This document uses an unsupported version of
the Open Document Format. Some features may not be displayed
correctly.\n\nClick 'Update Now' to run online update and see if there is a new
version of %PRODUCTNAME available." ;
+ };
+ FixedLine FL_BUTTON
{
- Pos = MAP_APPFONT ( 0 , ROW_2 ) ;
- Size = MAP_APPFONT ( DLG_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 0, ROW_2 ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
};
- PushButton PB_UPDATE
+ PushButton PB_UPDATE
{
- HelpID = "uui:PushButton:RID_DLG_NEWER_VERSION_WARNING:PB_UPDATE";
- Pos = MAP_APPFONT ( COL_3 , ROW_3 ) ;
- Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH ,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+ HelpID =
"uui:PushButton:RID_DLG_NEWER_VERSION_WARNING:PB_UPDATE" ;
+ Pos = MAP_APPFONT ( COL_3, ROW_3 ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
- Text [ en-US ] = "~Update Now..." ;
+ Text [ en-US ] = "~Update Now..." ;
+ };
+ CancelButton PB_LATER
+ {
+ Pos = MAP_APPFONT ( COL_4, ROW_3 ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "~Later" ;
};
- CancelButton PB_LATER
- {
- Pos = MAP_APPFONT ( COL_4 , ROW_3 ) ;
- Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH ,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Later" ;
- };
};
+
+// ********************************************************************** EOF
