You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ma...@apache.org on 2021/01/04 17:36:25 UTC

[openoffice-org] branch main updated (ca7396a -> 9b32617)

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

marcus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git.


    from ca7396a  Revert logo
     new 284d912  Added Windows 10, fixed typos
     new 9b32617  Updated strings for the platform hint text for Windows

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 assets/download/msg_prop_l10n_en.js |  8 ++++----
 content/product/windows.md          | 19 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)


[openoffice-org] 01/02: Added Windows 10, fixed typos

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit 284d912dec01365b28b1065e7ad4bcebfcbbfd09
Author: Marcus <ma...@apache.org>
AuthorDate: Mon Jan 4 18:31:17 2021 +0100

    Added Windows 10, fixed typos
---
 content/product/windows.md | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/content/product/windows.md b/content/product/windows.md
index e8e5edd..59a8dd4 100644
--- a/content/product/windows.md
+++ b/content/product/windows.md
@@ -1,10 +1,10 @@
-type=page
+type=page
 title=Apache OpenOffice for Windows
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+notice=https://www.apache.org/licenses/LICENSE-2.0
+~~~~~~
 ## Windows Version Support
 
-The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows 7 and Windows 8.
+The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows 7, Windows 8 and Windows 10.
 
 Specific platform version notes:
 
@@ -12,13 +12,12 @@ Specific platform version notes:
   - **Windows XP**: Tested, stable, no platform-specific problems known.
   - **Windows Vista**: Tested, stable, no platform-specific problems known.
   - **Windows 7**: Tested, stable.
-  - **Windows 8**: We run as a "desktop application", not a Metro "App". Requires x86 or 64-bit Windows. 
+  - **Windows 8, 10**: We run as a "desktop application", not a Metro "App". Requires x86 or 64-bit Windows. 
     We do not support Windows RT, the ARM-based version, intended for tablets.
 
 **Please note**: Apache OpenOffice is distributed as a 32-bit application. It will run successfully in
-32-bit mode on 64-bit versions of Windows 7 and Windows 8. But in those cases a 32-bit JVM is required
-for some functionality. Details are 
-[here](http://www.openoffice.org/download/common/java.html).
+32-bit mode on 64-bit versions of Windows 7, 8 and 10. But in those cases a 32-bit JVM is required
+for some functionality. Details are [here](http://www.openoffice.org/download/common/java.html).
 
 
 ## Hardware Requirements
@@ -27,7 +26,7 @@ Hardware demands are quite modest and even older machines should be able to run
 
   - **Memory**: Minimum 256 Mbytes RAM (512 MB RAM recommended).
   - **Storage**: At least 650 Mbytes available disk space for a default install via download. After installation and deletion of temporary installation files, Apache OpenOffice will use approximately 440 Mbytes disk space.
-  - **Graphics**: 1024 x 768 or higher resolution with at least 256 colours.
+  - **Graphics**: 1024 x 768 or higher resolution with at least 256 colors.
 
 
 ## Windows-specific Features
@@ -43,6 +42,6 @@ Apache OpenOffice has the following special features on Windows:
   - Click here to 
     [download](http://www.openoffice.org/download/)
   - Click here to get 
-    [Install intructions for OpenOffice on Windows](http://www.openoffice.org/download/common/instructions.html#win)
+    [Install instructions for OpenOffice on Windows](http://www.openoffice.org/download/common/instructions.html#win)
   - Click here to get help and support in the 
     [Community Support Forums](http://forum.openoffice.org/)


[openoffice-org] 02/02: Updated strings for the platform hint text for Windows

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit 9b3261732dc1b86df9a37efcdf17d7972cdee9a5
Author: Marcus <ma...@apache.org>
AuthorDate: Mon Jan 4 18:34:57 2021 +0100

    Updated strings for the platform hint text for Windows
---
 assets/download/msg_prop_l10n_en.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/download/msg_prop_l10n_en.js b/assets/download/msg_prop_l10n_en.js
index 2664660..a7ce3d4 100644
--- a/assets/download/msg_prop_l10n_en.js
+++ b/assets/download/msg_prop_l10n_en.js
@@ -228,12 +228,12 @@ l10n.dl_full_link_text				= "Download full installation";
 l10n.dl_full_link_title				= "Click to download: ";
 l10n.dl_langpack_link_text			= "Download language pack";
 l10n.dl_langpack_link_title			= "Click to download: ";
-l10n.dl_win_info_text				= "Windows : Title";
-l10n.dl_win_info_title				= "Windows : Text";
+l10n.dl_win_info_text				= "32-bit, 64-bit and Java - What to choose?";
+l10n.dl_win_info_title				= "At the moment there is a 32-bit (x86) version for Windows. However, this installs and runs also on Windows 64-bit (x86-64).\nPlease note that you may need Java in 32-bit for additional functionality which must then be selected only ones (see menu 'Tools - Options - OpenOffice - Java').\n\nFor more information about OpenOffice and Java please see the link on the right 'Java and Apache OpenOffice'.";
 l10n.dl_linux_info_text				= "RPM vs. DEB = What to choose?";
 l10n.dl_linux_info_title			= "RPM is used in:\nCentOS, Fedora, Mageia, Mandriva, MeeGo, openSUSE, Oracle Linux, PCLinuxOS, Red Hat Enterprise Linux, Sailfish OS, Scientific Linux, SUSE Linux Enterprise Server\n\nDEB is used in:\nDebian, Kanotix, Knoppix, Kubuntu, Linux Mint, Lubuntu, Ubuntu, Xubuntu";
-l10n.dl_mac_info_text				= "macOS : Title";
-l10n.dl_mac_info_title				= "macOS : Text";
+// l10n.dl_mac_info_text			= "macOS : Title";
+// l10n.dl_mac_info_title			= "macOS : Text";
 
 l10n.dl_full_link_porting_text			= "Porting: Click to choose from 3rd party vendors";
 l10n.dl_full_link_porting_title			= "Click to browse to the porting webpage and download from 3rd party vendors";