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 2019/07/14 22:50:16 UTC
svn commit: r1863068 - in /openoffice/branches/AOO42X: ./
main/svx/source/src/errtxt.src
Author: mseidel
Date: Sun Jul 14 22:50:16 2019
New Revision: 1863068
URL: http://svn.apache.org/viewvc?rev=1863068&view=rev
Log:
Merged r1857222 from trunk
Cleaned up resource file, fixed typo, removed whitespace
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/svx/source/src/errtxt.src
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 14 22:50:16 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862234,1862415-1862416,1862420,1862666,1862697,1862776,1862940,1862964,1862974,1863005,1863007,1863057
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857222,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,185
9839,1860288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862234,1862415-1862416,1862420,1862666,1862697,1862776,1862940,1862964,1862974,1863005,1863007,1863057
Modified: openoffice/branches/AOO42X/main/svx/source/src/errtxt.src
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/svx/source/src/errtxt.src?rev=1863068&r1=1863067&r2=1863068&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/svx/source/src/errtxt.src (original)
+++ openoffice/branches/AOO42X/main/svx/source/src/errtxt.src Sun Jul 14 22:50:16 2019
@@ -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.
- *
+ *
*************************************************************/
@@ -42,11 +42,11 @@ Resource RID_ERRCTX
};
String ERRCTX_SFX_SAVEDOC
{
- Text [ en-US ] = "$(ERR) saving the document $(ARG1)";
+ Text [ en-US ] = "$(ERR) saving the document $(ARG1)" ;
};
String ERRCTX_SFX_SAVEASDOC
{
- Text [ en-US ] = "$(ERR) saving the document $(ARG1)";
+ Text [ en-US ] = "$(ERR) saving the document $(ARG1)" ;
};
String ERRCTX_SFX_DOCINFO
{
@@ -86,7 +86,7 @@ Resource RID_ERRCTX
};
String ERRCTX_SFX_SEARCHADDRESS
{
- Text [ en-US ] = "$(ERR) searching for an address";
+ Text [ en-US ] = "$(ERR) searching for an address" ;
};
};
Resource RID_ERRHDL
@@ -307,7 +307,7 @@ Resource RID_ERRHDL
{
Text [ en-US ] = "The wrong password has been entered." ;
};
- String ERRCODE_SFX_DOLOADFAILED
+ String ERRCODE_SFX_DOLOADFAILED
{
Text [ en-US ] = "Error reading file." ;
};
@@ -329,7 +329,7 @@ Resource RID_ERRHDL
};
String ERRCODE_INET_READ
{
- Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ;
+ Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ;
};
String ERRCODE_INET_WRITE
{
@@ -337,11 +337,11 @@ Resource RID_ERRHDL
};
String ERRCODE_INET_GENERAL
{
- Text [ en-US ] = "General Internet error has occurred." ;
+ Text [ en-US ] = "General Internet error has occurred." ;
};
String ERRCODE_INET_OFFLINE
{
- Text [ en-US ] = "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ;
+ Text [ en-US ] = "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not been activated." ;
};
String ERRCODE_SFXMSG_STYLEREPLACE
{
@@ -446,15 +446,15 @@ Resource RID_ERRHDL
};
String ERRCODE_IO_NOTSTORABLEINBINARYFORMAT
{
- Text [ en-US ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format.";
+ Text [ en-US ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format." ;
};
String ERRCODE_SFX_TARGETFILECORRUPTED
{
- Text [ en-US ] = "The file $(FILENAME) cannot be saved. Please check your system settings. You can find an automatically generated backup copy of this file in folder $(PATH) named $(BACKUPNAME).";
+ Text [ en-US ] = "The file $(FILENAME) cannot be saved. Please check your system settings. You can find an automatically generated backup copy of this file in folder $(PATH) named $(BACKUPNAME)." ;
};
String ERRCODE_SFX_NOMOREDOCUMENTSALLOWED
{
- Text [ en-US ] = "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document.";
+ Text [ en-US ] = "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document." ;
};
String ERRCODE_SFX_CANTCREATEBACKUP
{
@@ -462,20 +462,20 @@ Resource RID_ERRHDL
};
String ERRCODE_SFX_MACROS_SUPPORT_DISABLED
{
- Text [ en-US ] = "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled.";
+ Text [ en-US ] = "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled." ;
};
String ERRCODE_SFX_DOCUMENT_MACRO_DISABLED
{
- Text [ en-US ] = "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ;
+ Text [ en-US ] = "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ;
+ };
+ String ERRCODE_SFX_BROKENSIGNATURE
+ {
+ Text [ en-US ] = "The digitally signed document content and/or macros do not match the current document signature.\n\nThis could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n" ;
+ };
+ String ERRCODE_SFX_INCOMPLETE_ENCRYPTION
+ {
+ Text [ en-US ] = "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n" ;
};
- String ERRCODE_SFX_BROKENSIGNATURE
- {
- Text [ en-US ] = "The digitally signed document content and/or macros do not match the current document signature.\n\nThis could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ;
- };
- String ERRCODE_SFX_INCOMPLETE_ENCRYPTION
- {
- Text [ en-US ] = "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ;
- };
String ERRCODE_IO_INVALIDLENGTH
{
@@ -501,11 +501,10 @@ Resource RID_ERRHDL
{
Text [ en-US ] = "Function not possible: write protected." ;
};
- String ERRCODE_SFX_SHARED_NOPASSWORDCHANGE
+ String ERRCODE_SFX_SHARED_NOPASSWORDCHANGE
{
- Text [ en-US ] = "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first.";
+ Text [ en-US ] = "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first." ;
};
};
-// eof ------------------------------------------------------------------------
-
+// ********************************************************************** EOF