[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/dist

[Pranav Kant]

 loleaflet/dist/errormessages.js |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit be3553b47ce1406a1156655865a3e894f02d28e2
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Jun 6 20:23:34 2017 +0530

    Some error strings tweaks
    
    (cherry picked from commit 4711debd9a9c640a6f271f90a7151a6f1ec7de79)
    
     Conflicts:
            loleaflet/dist/errormessages.js
    
    Change-Id: I4f51ad2a3957f8d9bf2d41030342d208bd7529fa
    Reviewed-on: https://gerrit.libreoffice.org/38483
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
index 8ea1185c..dc9ed7f0 100644
--- a/loleaflet/dist/errormessages.js
+++ b/loleaflet/dist/errormessages.js
@@ -12,6 +12,7 @@ exports.faileddocloading = _('Failed to load the document. Please ensure the fil
 exports.storage = {
 	loadfailed: _('Failed to read document from storage. Please contact your storage server (%storageserver) administrator.'),
 	savediskfull: _('Save failed due to no disk space left on storage server. Document will now be read-only. Please contact the server (%storageserver) administrator to continue editing.'),
-	saveunauthorized: _('Document cannot be saved to storage server (%storageserver) due to expired or invalid access token. Refresh your session to not to lose your work.'),
-	savefailed: _('Document cannot be saved to storage. Check your permissions or contact the storage server (%storageserver) administrator.')
+	saveunauthorized: _('Document cannot be saved due to expired or invalid access token.'),
+	savefailed: _('Document cannot be saved. Check your permissions or contact the storage server administrator.'),
+	documentconflict: _('Document has been changed in storage outside WOPI.')
 };