This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new a65feb6 Cleaned up resource files, removed whitespace, added strings
for translation
a65feb6 is described below
commit a65feb62a3d34ff239b68d270920c0f530f8af5f
Author: mseidel <msei...@apache.org>
AuthorDate: Tue Dec 10 12:26:49 2019 +0100
Cleaned up resource files, removed whitespace, added strings for translation
---
main/uui/source/lockfailed.src | 15 ++--
main/uui/source/logindlg.src | 161 ++++++++++++++++++++-------------------
main/uui/source/openlocked.src | 19 ++---
main/uui/source/passworderrs.src | 40 +++-------
main/uui/source/trylater.src | 17 +++--
5 files changed, 118 insertions(+), 134 deletions(-)
diff --git a/main/uui/source/lockfailed.src b/main/uui/source/lockfailed.src
index c33d13f..0e8b0d6 100644
--- a/main/uui/source/lockfailed.src
+++ b/main/uui/source/lockfailed.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.
- *
+ *
*************************************************************/
@@ -29,14 +29,15 @@
String STR_LOCKFAILED_TITLE
{
- Text = "Document Could Not Be Locked";
+ Text [ en-US ] = "Document Could Not Be Locked" ;
};
String STR_LOCKFAILED_MSG
{
- Text [ en-US ] = "The file could not be locked for exclusive access by
%PRODUCTNAME, due to missing permission to create a lock file on that file
location.";
+ Text [ en-US ] = "The file could not be locked for exclusive access by
%PRODUCTNAME, due to missing permission to create a lock file on that file
location." ;
};
String STR_LOCKFAILED_DONTSHOWAGAIN
{
- Text = "~Do not show this message again";
+ Text [ en-US ] = "~Do not show this message again" ;
};
+// ********************************************************************** EOF
diff --git a/main/uui/source/logindlg.src b/main/uui/source/logindlg.src
index a4e22f4..535427c 100644
--- a/main/uui/source/logindlg.src
+++ b/main/uui/source/logindlg.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.
- *
+ *
*************************************************************/
@@ -38,156 +38,157 @@ ModalDialog DLG_UUI_LOGIN
Moveable = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT( 177 , 247 ) ;
+ Size = MAP_APPFONT ( 177, 247 ) ;
Text [ en-US ] = "Authentication Required" ;
FixedText FT_LOGIN_ERROR
{
- Pos = MAP_APPFONT( 6 , 6 ) ;
- Size = MAP_APPFONT( 165 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 6 ) ;
+ Size = MAP_APPFONT ( 165, 8 ) ;
Text [ en-US ] = "Message from server:" ;
};
FixedText FT_INFO_LOGIN_ERROR
{
- Pos = MAP_APPFONT( 6 , 14 ) ;
- Size = MAP_APPFONT( 165 , 3*8 ) ;
+ Pos = MAP_APPFONT ( 6, 14 ) ;
+ Size = MAP_APPFONT ( 165, 3 * 8 ) ;
WordBreak = TRUE ;
};
-
+
FixedLine FL_LOGIN_1
{
- Pos = MAP_APPFONT( 6 , 41 ) ;
- Size = MAP_APPFONT( 165 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 41 ) ;
+ Size = MAP_APPFONT ( 165, 8 ) ;
};
-
+
FixedText FT_INFO_LOGIN_REQUEST
{
- Pos = MAP_APPFONT( 6 , 52 ) ;
- Size = MAP_APPFONT( 165 , 2*8 ) ;
+ Pos = MAP_APPFONT ( 6, 52 ) ;
+ Size = MAP_APPFONT ( 165, 2*8 ) ;
WordBreak = TRUE ;
Text [ en-US ] = "Enter user name and password for: \n%1" ;
};
-
+
String STR_LOGIN_REALM
{
Text [ en-US ] = "Enter user name and password for: \n\"%2\" on %1" ;
};
-
+
FixedLine FL_LOGIN_2
{
- Pos = MAP_APPFONT( 6 , 71 ) ;
- Size = MAP_APPFONT( 165 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 71 ) ;
+ Size = MAP_APPFONT ( 165, 8 ) ;
};
-
+
FixedText FT_LOGIN_PATH
{
- Pos = MAP_APPFONT( 6 , 84 ) ;
- Size = MAP_APPFONT( 112 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 84 ) ;
+ Size = MAP_APPFONT ( 112, 8 ) ;
Text [ en-US ] = "~Path" ;
};
-
+
Edit ED_LOGIN_PATH
{
- HelpId = HID_LOGIN_DLG_PATH;
+ HelpId = HID_LOGIN_DLG_PATH ;
Border = TRUE ;
- Pos = MAP_APPFONT( 6 , 95 ) ;
- Size = MAP_APPFONT( 112 , 12 ) ;
+ Pos = MAP_APPFONT ( 6, 95 ) ;
+ Size = MAP_APPFONT ( 112, 12 ) ;
};
PushButton BTN_LOGIN_PATH
{
- HelpId = HID_LOGIN_DLG_BROWSE;
- Pos = MAP_APPFONT( 121 , 94 ) ;
- Size = MAP_APPFONT( 50 , 14 ) ;
+ HelpId = HID_LOGIN_DLG_BROWSE ;
+ Pos = MAP_APPFONT ( 121, 94 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text = "~Browse..." ;
};
-
+
FixedText FT_LOGIN_USERNAME
{
- Pos = MAP_APPFONT( 6 , 110 ) ;
- Size = MAP_APPFONT( 165 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 110 ) ;
+ Size = MAP_APPFONT ( 165, 8 ) ;
Text [ en-US ] = "~User name" ;
};
-
+
Edit ED_LOGIN_USERNAME
{
- HelpId = HID_LOGIN_DLG_USER_NAME;
+ HelpId = HID_LOGIN_DLG_USER_NAME ;
Border = TRUE ;
- Pos = MAP_APPFONT( 6 , 121 ) ;
- Size = MAP_APPFONT( 165 , 12 ) ;
+ Pos = MAP_APPFONT ( 6, 121 ) ;
+ Size = MAP_APPFONT ( 165, 12 ) ;
};
-
+
FixedText FT_LOGIN_PASSWORD
{
- Pos = MAP_APPFONT( 6 , 136 ) ;
- Size = MAP_APPFONT( 165 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 136 ) ;
+ Size = MAP_APPFONT ( 165, 8 ) ;
Text [ en-US ] = "Pass~word" ;
};
-
+
Edit ED_LOGIN_PASSWORD
{
- HelpId = HID_LOGIN_DLG_PASSWORD;
+ HelpId = HID_LOGIN_DLG_PASSWORD ;
Border = TRUE ;
- Pos = MAP_APPFONT( 6 , 147 ) ;
- Size = MAP_APPFONT( 165 , 12 ) ;
+ Pos = MAP_APPFONT ( 6, 147 ) ;
+ Size = MAP_APPFONT ( 165, 12 ) ;
PassWord = TRUE ;
};
-
+
FixedText FT_LOGIN_ACCOUNT
{
- Pos = MAP_APPFONT( 6 , 162 ) ;
- Size = MAP_APPFONT( 165 , 8 ) ;
- Text [ en-US ] = "A~ccount";
+ Pos = MAP_APPFONT ( 6, 162 ) ;
+ Size = MAP_APPFONT ( 165, 8 ) ;
+ Text [ en-US ] = "A~ccount" ;
};
-
+
Edit ED_LOGIN_ACCOUNT
{
- HelpId = HID_LOGIN_DLG_ACCOUNT;
+ HelpId = HID_LOGIN_DLG_ACCOUNT ;
Border = TRUE ;
- Pos = MAP_APPFONT( 6 , 173 ) ;
- Size = MAP_APPFONT( 165 , 12 ) ;
+ Pos = MAP_APPFONT ( 6, 173 ) ;
+ Size = MAP_APPFONT ( 165, 12 ) ;
PassWord = TRUE ;
};
-
+
CheckBox CB_LOGIN_SAVEPASSWORD
{
- HelpId = HID_LOGIN_DLG_REMEMBER_PASSWORD;
- Pos = MAP_APPFONT( 6 , 190 ) ;
- Size = MAP_APPFONT( 165 , 10 ) ;
+ HelpId = HID_LOGIN_DLG_REMEMBER_PASSWORD ;
+ Pos = MAP_APPFONT ( 6, 190 ) ;
+ Size = MAP_APPFONT ( 165, 10 ) ;
Text [ en-US ] = "~Remember password" ;
};
-
- CheckBox CB_LOGIN_USESYSCREDS
+
+ CheckBox CB_LOGIN_USESYSCREDS
{
- HelpId = HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS;
- Pos = MAP_APPFONT( 6 , 203 ) ;
- Size = MAP_APPFONT( 165 , 10 ) ;
+ HelpId = HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS ;
+ Pos = MAP_APPFONT ( 6, 203 ) ;
+ Size = MAP_APPFONT ( 165, 10 ) ;
Text [ en-US ] = "~Use system credentials" ;
};
-
+
FixedLine FL_BUTTONS
{
- Pos = MAP_APPFONT( 0 , 216 ) ;
- Size = MAP_APPFONT( 177 , 8 ) ;
+ Pos = MAP_APPFONT ( 0, 216 ) ;
+ Size = MAP_APPFONT ( 177, 8 ) ;
};
- HelpButton BTN_LOGIN_HELP
- {
- Pos = MAP_APPFONT( 6 , 227 ) ;
- Size = MAP_APPFONT( 50 , 14 ) ;
- };
+ HelpButton BTN_LOGIN_HELP
+ {
+ Pos = MAP_APPFONT ( 6, 227 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ };
- OKButton BTN_LOGIN_OK
- {
- Pos = MAP_APPFONT( 66 , 227 ) ;
- Size = MAP_APPFONT( 50 , 14 ) ;
- DefButton = TRUE ;
- };
-
- CancelButton BTN_LOGIN_CANCEL
- {
- Pos = MAP_APPFONT( 121 , 227 ) ;
- Size = MAP_APPFONT( 50 , 14 ) ;
- };
+ OKButton BTN_LOGIN_OK
+ {
+ Pos = MAP_APPFONT ( 66, 227 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ DefButton = TRUE ;
+ };
+
+ CancelButton BTN_LOGIN_CANCEL
+ {
+ Pos = MAP_APPFONT ( 121, 227 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ };
};
+// ********************************************************************** EOF
diff --git a/main/uui/source/openlocked.src b/main/uui/source/openlocked.src
index e591b45..3319283 100644
--- a/main/uui/source/openlocked.src
+++ b/main/uui/source/openlocked.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.
- *
+ *
*************************************************************/
@@ -29,22 +29,23 @@
String STR_OPENLOCKED_TITLE
{
- Text [ en-US ] = "Document in Use";
+ Text [ en-US ] = "Document in Use" ;
};
String STR_OPENLOCKED_MSG
{
- Text [ en-US ] = "Document file '$(ARG1)' is locked for editing
by:\n\n$(ARG2)\n\nOpen document read-only or open a copy of the document for
editing.\n\n";
+ Text [ en-US ] = "Document file '$(ARG1)' is locked for editing
by:\n\n$(ARG2)\n\nOpen document read-only or open a copy of the document for
editing.\n\n" ;
};
String STR_OPENLOCKED_OPENREADONLY_BTN
{
- Text [ en-US ] = "Open ~Read-Only";
+ Text [ en-US ] = "Open ~Read-Only" ;
};
String STR_OPENLOCKED_OPENCOPY_BTN
{
- Text [ en-US ] = "Open ~Copy";
+ Text [ en-US ] = "Open ~Copy" ;
};
String STR_UNKNOWNUSER
{
- Text [ en-US ] = "Unknown User";
+ Text [ en-US ] = "Unknown User" ;
};
+// ********************************************************************** EOF
diff --git a/main/uui/source/passworderrs.src b/main/uui/source/passworderrs.src
index afebde7..5640345 100644
--- a/main/uui/source/passworderrs.src
+++ b/main/uui/source/passworderrs.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.
- *
+ *
*************************************************************/
@@ -29,47 +29,27 @@
String STR_ERROR_PASSWORD_TO_OPEN_WRONG
{
- Text [ en-US ] = "The password is incorrect. The file cannot be opened.";
+ Text [ en-US ] = "The password is incorrect. The file cannot be
opened." ;
};
String STR_ERROR_PASSWORD_TO_MODIFY_WRONG
{
- Text [ en-US ] = "The password is incorrect. The file cannot be modified.";
+ Text [ en-US ] = "The password is incorrect. The file cannot be
modified." ;
};
String STR_ERROR_MASTERPASSWORD_WRONG
{
- Text [ en-US ] = "The master password is incorrect.";
+ Text [ en-US ] = "The master password is incorrect." ;
};
String STR_ERROR_SIMPLE_PASSWORD_WRONG
{
- Text [ en-US ] = "The password is incorrect.";
+ Text [ en-US ] = "The password is incorrect." ;
};
String STR_ERROR_PASSWORDS_NOT_IDENTICAL
{
- Text [ en-US ] = "The password confirmation does not match.";
+ Text [ en-US ] = "The password confirmation does not match." ;
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/uui/source/trylater.src b/main/uui/source/trylater.src
index 70e629e..efd4ad3 100644
--- a/main/uui/source/trylater.src
+++ b/main/uui/source/trylater.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.
- *
+ *
*************************************************************/
@@ -29,18 +29,19 @@
String STR_TRYLATER_TITLE
{
- Text [ en-US ] = "Document in Use";
+ Text [ en-US ] = "Document in Use" ;
};
String STR_TRYLATER_MSG
{
- Text [ en-US ] = "Document file '$(ARG1)' is locked for editing
by:\n\n$(ARG2)\n\nTry again later to save document or save a copy of that
document.\n\n";
+ Text [ en-US ] = "Document file '$(ARG1)' is locked for editing
by:\n\n$(ARG2)\n\nTry again later to save document or save a copy of that
document.\n\n" ;
};
String STR_TRYLATER_RETRYSAVING_BTN
{
- Text [ en-US ] = "~Retry Saving";
+ Text [ en-US ] = "~Retry Saving" ;
};
String STR_TRYLATER_SAVEAS_BTN
{
- Text [ en-US ] = "~Save As...";
+ Text [ en-US ] = "~Save As..." ;
};
+// ********************************************************************** EOF
