You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/02/21 16:01:10 UTC

[openoffice] branch AOO42X updated: Cleaned up resource file - This fixes truncated text in Pootle

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new b8539b3  Cleaned up resource file - This fixes truncated text in Pootle
b8539b3 is described below

commit b8539b34a534c8407a3061845c188494f3e6bd8b
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Feb 21 16:59:09 2020 +0100

    Cleaned up resource file - This fixes truncated text in Pootle
    
    (cherry picked from commit 0a252a6c22a81186f9c06389f71ca29d32e40bde)
---
 main/cui/source/dialogs/passwdomdlg.src | 388 ++++++++++++++++----------------
 1 file changed, 192 insertions(+), 196 deletions(-)

diff --git a/main/cui/source/dialogs/passwdomdlg.src b/main/cui/source/dialogs/passwdomdlg.src
index 2b7dc82..44b13f0 100644
--- a/main/cui/source/dialogs/passwdomdlg.src
+++ b/main/cui/source/dialogs/passwdomdlg.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,20 +7,19 @@
  * 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.
- * 
+ *
  *************************************************************/
 
 
- 
 
 #include <cuires.hrc>
 #include "passwdomdlg.hrc"
@@ -29,202 +28,199 @@
 
 ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
 {
-    Size = MAP_APPFONT( 171, 150 );
-    Text [ en-US ] = "Set Password";
-    HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY;
-    Border = TRUE ;
-    Moveable = TRUE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-
-    FixedLine FL_FILE_ENCRYPTION
-    {
-        Pos = MAP_APPFONT( 3, 3 );
-        Size = MAP_APPFONT( 165, 8 );
-        Text [ en-US ] = "File encryption password";
-    };
-  
-    FixedText FT_PASSWD_TO_OPEN
-    {
-        Pos = MAP_APPFONT( 6, 17 );
-        Size = MAP_APPFONT( 159, 8 );
-        Text [ en-US ] = "~Enter password to open";
-        WordBreak = TRUE;
-    };
-
-    Edit ED_PASSWD_TO_OPEN
-    {
-        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN;
-        Pos = MAP_APPFONT( 6, 28 );
-        Size = MAP_APPFONT( 159, 12 );
-        Border = TRUE ;
-        PassWord = TRUE ;
-    };
-
-    FixedText FT_REENTER_PASSWD_TO_OPEN
-    {
-        Pos = MAP_APPFONT( 6, 45 );
-        Size = MAP_APPFONT( 159, 8 );
-        Text [ en-US ] = "Confirm password";
-        WordBreak = TRUE;
-    };
-
-    Edit ED_REENTER_PASSWD_TO_OPEN
-    {
-        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN;
-        Pos = MAP_APPFONT( 6, 56 );
-        Size = MAP_APPFONT( 159, 12 );
-        Border = TRUE ;
-        PassWord = TRUE ;
-    };
+	Size = MAP_APPFONT ( 171, 150 ) ;
+	Text [ en-US ] = "Set Password" ;
+	HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY ;
+	Border = TRUE ;
+	Moveable = TRUE ;
+	OutputSize = TRUE ;
+	SVLook = TRUE ;
+
+	FixedLine FL_FILE_ENCRYPTION
+	{
+		Pos = MAP_APPFONT ( 3, 3 ) ;
+		Size = MAP_APPFONT ( 165, 8 ) ;
+		Text [ en-US ] = "File encryption password" ;
+	};
+
+	FixedText FT_PASSWD_TO_OPEN
+	{
+		Pos = MAP_APPFONT ( 6, 17 ) ;
+		Size = MAP_APPFONT ( 159, 8 ) ;
+		Text [ en-US ] = "~Enter password to open" ;
+		WordBreak = TRUE ;
+	};
+
+	Edit ED_PASSWD_TO_OPEN
+	{
+		HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN ;
+		Pos = MAP_APPFONT ( 6, 28 ) ;
+		Size = MAP_APPFONT ( 159, 12 ) ;
+		Border = TRUE ;
+		PassWord = TRUE ;
+	};
+
+	FixedText FT_REENTER_PASSWD_TO_OPEN
+	{
+		Pos = MAP_APPFONT ( 6, 45 ) ;
+		Size = MAP_APPFONT ( 159, 8 ) ;
+		Text [ en-US ] = "Confirm password" ;
+		WordBreak = TRUE ;
+	};
+
+	Edit ED_REENTER_PASSWD_TO_OPEN
+	{
+		HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN ;
+		Pos = MAP_APPFONT ( 6, 56 ) ;
+		Size = MAP_APPFONT ( 159, 12 ) ;
+		Border = TRUE ;
+		PassWord = TRUE ;
+	};
 /*
-    FixedImage FI_PASSWD_TO_OPEN_MATCH
-    {
-        Pos = MAP_APPFONT ( 150, 42 ) ;
-        Size = MAP_APPFONT ( 12 , 12 ) ;
-    };
+	FixedImage FI_PASSWD_TO_OPEN_MATCH
+	{
+		Pos = MAP_APPFONT ( 150, 42 ) ;
+		Size = MAP_APPFONT ( 12, 12 ) ;
+	};
 */
-    FixedText FT_PASSWD_NOTE
-    {
-        Pos = MAP_APPFONT( 6, 80 );
-        Size = MAP_APPFONT( 159, 4*8 );     // some extra space for translation in other languages
-        Text [ en-US ] = "Note: After a password has been set, the document will only open with "\
-                "the password. Should you lose the password, there will be no way to "\
-                "recover the document. Please also note that this password is case-sensitive.";
-        WordBreak = TRUE;
-    };
-
-    FixedLine FL_BUTTONS
-    {
-        Pos = MAP_APPFONT( 0, 117 );
-        Size = MAP_APPFONT( 171, 8 );
-    };
-  
-    MoreButton BTN_MORE_FEWER_OPTIONS
-    {
-        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE;
-        Pos = MAP_APPFONT( 6 , 130 ) ;
-        Size = MAP_APPFONT( 50 , 14 ) ;
-        Delta = 92 ;
-        MapUnit = MAP_APPFONT ;
-        State = FALSE ;
-    };
-
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT( 62, 130 );
-        Size = MAP_APPFONT( 50, 14 );
-        DefButton = TRUE ;
-    };
-
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT( 115, 130 );
-        Size = MAP_APPFONT( 50, 14 );
-    };
-
-    FixedLine FL_FILE_SHARING_OPTIONS
-    {
-        Pos = MAP_APPFONT( 3, 154 );
-        Size = MAP_APPFONT( 165, 8 );
-        Text [ en-US ] = "File sharing password";
-    };
-
-    CheckBox CB_OPEN_READONLY
-    {
-        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY;
-        Pos = MAP_APPFONT( 6, 170 );
-        Size = MAP_APPFONT( 159, 8 );
-
-        Text [ en-US ] = "Open file read-only";
-    };
-
-    FixedText FT_PASSWD_TO_MODIFY
-    {
-        Pos = MAP_APPFONT( 6, 186 );
-        Size = MAP_APPFONT( 159, 8 );
-        Text [ en-US ] = "Enter password to allow editing";
-        WordBreak = TRUE;
-    };
-
-    Edit ED_PASSWD_TO_MODIFY
-    {
-        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY;
-        Pos = MAP_APPFONT( 6, 196 );
-        Size = MAP_APPFONT( 159, 12 );
-        Border = TRUE ;
-        PassWord = TRUE ;
-    };
-
-    FixedText FT_REENTER_PASSWD_TO_MODIFY
-    {
-        Pos = MAP_APPFONT( 6, 214 );
-        Size = MAP_APPFONT( 159, 8 );
-        Text [ en-US ] = "Confirm password";
-        WordBreak = TRUE;
-    };
-
-    Edit ED_REENTER_PASSWD_TO_MODIFY
-    {
-        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY;
-        Pos = MAP_APPFONT( 6, 224 );
-        Size = MAP_APPFONT( 159, 12 );
-        Border = TRUE ;
-        PassWord = TRUE ;
-    };
+	FixedText FT_PASSWD_NOTE
+	{
+		Pos = MAP_APPFONT ( 6, 80 ) ;
+		Size = MAP_APPFONT ( 159, 4*8 ) ; // some extra space for translation in other languages
+		Text [ en-US ] = "Note: After a password has been set, the document will only open with the password. Should you lose the password, there will be no way to recover the document. Please also note that this password is case-sensitive." ;
+		WordBreak = TRUE ;
+	};
+
+	FixedLine FL_BUTTONS
+	{
+		Pos = MAP_APPFONT ( 0, 117 ) ;
+		Size = MAP_APPFONT ( 171, 8 ) ;
+	};
+
+	MoreButton BTN_MORE_FEWER_OPTIONS
+	{
+		HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE ;
+		Pos = MAP_APPFONT ( 6, 130 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		Delta = 92 ;
+		MapUnit = MAP_APPFONT ;
+		State = FALSE ;
+	};
+
+	OKButton BTN_OK
+	{
+		Pos = MAP_APPFONT ( 62, 130 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		DefButton = TRUE ;
+	};
+
+	CancelButton BTN_CANCEL
+	{
+		Pos = MAP_APPFONT ( 115, 130 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+	};
+
+	FixedLine FL_FILE_SHARING_OPTIONS
+	{
+		Pos = MAP_APPFONT ( 3, 154 ) ;
+		Size = MAP_APPFONT ( 165, 8 ) ;
+		Text [ en-US ] = "File sharing password" ;
+	};
+
+	CheckBox CB_OPEN_READONLY
+	{
+		HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY ;
+		Pos = MAP_APPFONT ( 6, 170 ) ;
+		Size = MAP_APPFONT ( 159, 8 ) ;
+		Text [ en-US ] = "Open file read-only" ;
+	};
+
+	FixedText FT_PASSWD_TO_MODIFY
+	{
+		Pos = MAP_APPFONT ( 6, 186 ) ;
+		Size = MAP_APPFONT ( 159, 8 ) ;
+		Text [ en-US ] = "Enter password to allow editing" ;
+		WordBreak = TRUE ;
+	};
+
+	Edit ED_PASSWD_TO_MODIFY
+	{
+		HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY ;
+		Pos = MAP_APPFONT ( 6, 196 ) ;
+		Size = MAP_APPFONT ( 159, 12 ) ;
+		Border = TRUE ;
+		PassWord = TRUE ;
+	};
+
+	FixedText FT_REENTER_PASSWD_TO_MODIFY
+	{
+		Pos = MAP_APPFONT ( 6, 214 ) ;
+		Size = MAP_APPFONT ( 159, 8 ) ;
+		Text [ en-US ] = "Confirm password" ;
+		WordBreak = TRUE ;
+	};
+
+	Edit ED_REENTER_PASSWD_TO_MODIFY
+	{
+		HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY ;
+		Pos = MAP_APPFONT ( 6, 224 ) ;
+		Size = MAP_APPFONT ( 159, 12 ) ;
+		Border = TRUE ;
+		PassWord = TRUE ;
+	};
 /*
-    FixedImage FI_PASSWD_TO_MODIFY_MATCH
-    {
-        Pos = MAP_APPFONT ( 150, 224 ) ;
-        Size = MAP_APPFONT ( 12 , 12 ) ;
-    };
+	FixedImage FI_PASSWD_TO_MODIFY_MATCH
+	{
+		Pos = MAP_APPFONT ( 150, 224 ) ;
+		Size = MAP_APPFONT ( 12, 12 ) ;
+	};
 */
 
-    String STR_PASSWD_MUST_BE_CONFIRMED
-    {
-        Text [ en-US ] = "Password must be confirmed" ;
-    };
-
-    String STR_MORE_OPTIONS
-    {
-        Text [ en-US ] = "More ~Options" ;
-    };
-    
-    String STR_FEWER_OPTIONS
-    {
-        Text [ en-US ] = "Fewer ~Options" ;
-    };
-
-    String STR_ONE_PASSWORD_MISMATCH
-    {
-        Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ;
-    };
-
-    String STR_TWO_PASSWORDS_MISMATCH
-    {
-        Text [ en-US ] = "The confirmation passwords did not match the original passwords. Set the passwords again." ;
-    };
-
-    String STR_INVALID_STATE_FOR_OK_BUTTON
-    {
-        Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ;
-    };
-    
-	// this missing string was detected late - so for 3.4 we just add an english string
-    String STR_INVALID_STATE_FOR_OK_BUTTON_V2
-    {
-		Text = "Set the password by entering the same password in both boxes." ;
-	};  
-/*    
-    Image IMG_PASSWD_MATCH
-    {
-        ImageBitmap = Bitmap { File = "apply.png"; };
-    };
-    
-    Image IMG_PASSWD_MATCH_HC
-    {
-        ImageBitmap = Bitmap { File = "apply_h.png"; };
-    };
+	String STR_PASSWD_MUST_BE_CONFIRMED
+	{
+		Text [ en-US ] = "Password must be confirmed" ;
+	};
+
+	String STR_MORE_OPTIONS
+	{
+		Text [ en-US ] = "More ~Options" ;
+	};
+
+	String STR_FEWER_OPTIONS
+	{
+		Text [ en-US ] = "Fewer ~Options" ;
+	};
+
+	String STR_ONE_PASSWORD_MISMATCH
+	{
+		Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ;
+	};
+
+	String STR_TWO_PASSWORDS_MISMATCH
+	{
+		Text [ en-US ] = "The confirmation passwords did not match the original passwords. Set the passwords again." ;
+	};
+
+	String STR_INVALID_STATE_FOR_OK_BUTTON
+	{
+		Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ;
+	};
+
+	String STR_INVALID_STATE_FOR_OK_BUTTON_V2
+	{
+		Text [ en-US ] = "Set the password by entering the same password in both boxes." ;
+	};
+/*
+	Image IMG_PASSWD_MATCH
+	{
+		ImageBitmap = Bitmap {File = "apply.png" ;} ;
+	};
+
+	Image IMG_PASSWD_MATCH_HC
+	{
+		ImageBitmap = Bitmap {File = "apply_h.png" ;} ;
+	};
 */
 };
 
+// ********************************************************************** EOF