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

Thu May 24 11:17:14 UTC 2018

loleaflet/debug/document/loleaflet.html |    2 +-
 loleaflet/dist/loleaflet.html           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1047a0f13ec5689cded4b0661992e242569607ca
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed May 23 15:53:12 2018 +0200

    Help translations should take precedence (stray ~ chars were detected in German help)
    
    Change-Id: I21a71743b4cc39edee7391a9b57191f7ae2c67f8
    Reviewed-on: https://gerrit.libreoffice.org/54710
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/debug/document/loleaflet.html b/loleaflet/debug/document/loleaflet.html
index 2d7a6a758..ddb760f98 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -29,8 +29,8 @@
 <link rel="stylesheet" href="/loleaflet/%VERSION%/toolbar/evol.colorpicker.min.css">
 <link rel="localizations" href="/loleaflet/%VERSION%/l10n/localizations.json" type="application/vnd.oftn.l10n+json"/>
 <link rel="localizations" href="/loleaflet/%VERSION%/l10n/locore-localizations.json" type="application/vnd.oftn.l10n+json" />
-<link rel="localizations" href="/loleaflet/%VERSION%/l10n/uno-localizations.json" type="application/vnd.oftn.l10n+json" />
 <link rel="localizations" href="/loleaflet/%VERSION%/l10n/help-localizations.json" type="application/vnd.oftn.l10n+json"/>
+<link rel="localizations" href="/loleaflet/%VERSION%/l10n/uno-localizations.json" type="application/vnd.oftn.l10n+json" />
 <style type="text/css"></style></head>
 <body>
     <script src="/loleaflet/%VERSION%/jquery/2.1.0/jquery.min.js"></script>
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 470b0acad..e18a9cda8 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -21,8 +21,8 @@
 <!--%BRANDING_CSS%--> <!-- add your logo here -->
 <link rel="localizations" href="/loleaflet/%VERSION%/l10n/localizations.json" type="application/vnd.oftn.l10n+json"/>
 <link rel="localizations" href="/loleaflet/%VERSION%/l10n/locore-localizations.json" type="application/vnd.oftn.l10n+json" />
-<link rel="localizations" href="/loleaflet/%VERSION%/l10n/uno-localizations.json" type="application/vnd.oftn.l10n+json" />
 <link rel="localizations" href="/loleaflet/%VERSION%/l10n/help-localizations.json" type="application/vnd.oftn.l10n+json"/>
+<link rel="localizations" href="/loleaflet/%VERSION%/l10n/uno-localizations.json" type="application/vnd.oftn.l10n+json" />
   <body style="user-select: none;">
     <!--The "controls" div holds map controls such as the Zoom button and
         it's separated from the map in order to have the controls on the top
