openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject svn commit: r1853669 - in /openoffice/branches/AOO42X: ./ main/desktop/source/migration/wizard.src
Date Fri, 15 Feb 2019 21:29:34 GMT
Author: mseidel
Date: Fri Feb 15 21:29:34 2019
New Revision: 1853669

URL: http://svn.apache.org/viewvc?rev=1853669&view=rev
Log:
Merge r1853668 from trunk

This is no longer a registration wizard, so changing the wording.

Modified:
    openoffice/branches/AOO42X/   (props changed)
    openoffice/branches/AOO42X/main/desktop/source/migration/wizard.src

Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 15 21:29:34 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
+/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,1853668

Modified: openoffice/branches/AOO42X/main/desktop/source/migration/wizard.src
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/desktop/source/migration/wizard.src?rev=1853669&r1=1853668&r2=1853669&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/desktop/source/migration/wizard.src (original)
+++ openoffice/branches/AOO42X/main/desktop/source/migration/wizard.src Fri Feb 15 21:29:34
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.
- * 
+ *
  *************************************************************/
 
 
@@ -82,7 +82,7 @@ String STR_WELCOME_MIGRATION
 
 String STR_WELCOME_WITHOUT_LICENSE
 {
-    Text [ en-US ] = "This wizard will guide you through the registration of %PRODUCTNAME.\n\nClick
'Next' to continue.";
+    Text [ en-US ] = "This wizard will guide you through the setup of %PRODUCTNAME.\n\nClick
'Next' to continue.";
 };
 
 String STR_FINISH
@@ -436,3 +436,4 @@ TabPage TP_REGISTRATION
     };
 };
 
+// ********************************************************************** EOF



Mime
View raw message