[Libreoffice-commits] online.git: android/app

[Jan Holesovsky (via logerrit)]

 android/app/src/main/res/values/strings.xml |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2a1d62c6a76377e893a184bde6ff74808ff8ad69
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Dec 10 16:57:10 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Dec 10 17:25:27 2019 +0100

    android: Ultimately we want to have this working for both.
    
    Currently it can open files both from the ownCloud and Nextcloud
    storage, but so far it seems that it cannot save back to ownCloud.
    
    Unfortunately both the libraries have the same namespace, so to have
    both the ownCloud's and Nextcloud's library in the same .apk, we'll need
    to use some additional tricks.
    
    Change-Id: I7fd647a42d3bd90b6268017ae392d61f67f548c0
    Reviewed-on: https://gerrit.libreoffice.org/84874
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 786b3b59a..8a2aa4d7b 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -76,9 +76,9 @@
     <string name="remote_server">Remote server</string>
     <string name="usb_connected_configure">USB connected, configure your device.</string>
 
-    <string name="owncloud_wrong_connection">Cannot connect to ownCloud server. Check your configuration.</string>
-    <string name="owncloud_unauthorized">Cannot log into ownCloud server. Check your configuration.</string>
-    <string name="owncloud_unspecified_error">Unspecified error connecting to ownCloud server. Check your configuration and/or try later.</string>
+    <string name="owncloud_wrong_connection">Cannot connect to the Cloud server. Check your configuration.</string>
+    <string name="owncloud_unauthorized">Cannot log into the Cloud server. Check your configuration.</string>
+    <string name="owncloud_unspecified_error">Unspecified error connecting to the Cloud server. Check your configuration and/or try later.</string>
 
     <string name="ext_document_provider_error">Invalid root file. Check your sd card configuration.</string>
     <string name="otg_missing_error">Invalid root file. Check your OTG device and/or configuration.</string>
@@ -89,13 +89,13 @@
 
     <!-- Document provider settings -->
     <string name="storage_provider_settings">Storage provider settings</string>
-    <string name="owncloud_settings">ownCloud settings</string>
+    <string name="owncloud_settings">Cloud server settings</string>
     <string name="physical_storage_settings">Physical storage settings</string>
     <string name="external_sd_path">External SD path</string>
     <string name="otg_device_path">OTG device path</string>
     <string name="otg_warning">Experimental Feature: Use only if OTG device is writable.</string>
     <string name="server_url">Server URL</string>
-    <string name="server_url_and_port">URL and port of the ownCloud server.</string>
+    <string name="server_url_and_port">URL and port of the Cloud server.</string>
     <string name="user_name">User name</string>
     <string name="password">Password</string>