[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-1' - 5 commits - android/app android/lib ios/Mobile loleaflet/css loleaflet/po loleaflet/src

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Fri Mar 20 14:06:16 UTC 2020


 android/app/src/main/res/values-bg/strings.xml  |    1 
 android/lib/src/main/res/values-ast/strings.xml |    2 +
 android/lib/src/main/res/values-bg/strings.xml  |    2 +
 android/lib/src/main/res/values-ca/strings.xml  |    1 
 android/lib/src/main/res/values-cy/strings.xml  |    5 ++++
 android/lib/src/main/res/values-es/strings.xml  |   14 ++++++------
 android/lib/src/main/res/values-eu/strings.xml  |    1 
 ios/Mobile/Info.plist.in                        |    2 -
 loleaflet/css/loleaflet.css                     |   26 +++++++++++++++++++-----
 loleaflet/css/menubar-mobile.css                |    2 -
 loleaflet/css/menubar.css                       |   14 +-----------
 loleaflet/css/mobilewizard.css                  |    2 -
 loleaflet/po/help-ca.po                         |    6 ++---
 loleaflet/po/help-es.po                         |   18 ++--------------
 loleaflet/src/control/Control.Menubar.js        |    2 -
 loleaflet/src/map/Map.js                        |   17 ++++++++-------
 16 files changed, 60 insertions(+), 55 deletions(-)

New commits:
commit f12bc67aac29e9e1ed251b6318b6b887a69b7d56
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Mar 20 16:02:08 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 20 15:05:40 2020 +0100

    Force portrait for the moment also for iPhone in the iOS app
    
    Change-Id: I1def28e7969cea753e7fc36094fe6514c17d61af

diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index 628e95e7b..33517ab14 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -430,8 +430,6 @@
     <key>UISupportedInterfaceOrientations</key>
     <array>
         <string>UIInterfaceOrientationPortrait</string>
-        <string>UIInterfaceOrientationLandscapeLeft</string>
-        <string>UIInterfaceOrientationLandscapeRight</string>
     </array>
     <key>UISupportedInterfaceOrientations~ipad</key>
     <array>
commit 97988f7c7b84081c9316146745ca5d3008727f01
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Mar 19 17:37:04 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 20 15:05:22 2020 +0100

    Restore cypress test framework's mobile tests.
    
    Broken since: b62dcc025555076a7522809b9f12f873c278205d
    
    The issue here cypress sets the window size and not the device size
    when tries to emulate mobile view.
    https://github.com/cypress-io/cypress/issues/970
    
    For now, let's keep window size media rules too.
    
    [tml: Window size changes depending on orientation. Device size does
    not. We need to change each rule that used only max-device-width into
    one using two subrules using max-width combined with comma (i.e. the
    OR operator), one for portrait using 767px as the limit, one for
    landscape using 1023px as the limit.]
    
    We do this in other places of the css code anyway. In a long term, it
    would be good to find a better way to emulate mobile view by cypress
    or to detect mobile from JS code, so we can enable mobile mode easily
    for cypress tests.
    
    Change-Id: Ic7974f44fcbf6ed2883e93acd28153709514c216

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 334b721ee..2016bc131 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -178,7 +178,7 @@ body {
 #toolbar-hamburger {
 	width: 0;
 }
- at media (max-device-width: 767px) {
+ at media (max-width: 767px) and (orientation: portrait), (max-width: 1023px) and (orientation: landscape) {
 	#toolbar-hamburger {
 		width: 36px;
 	}
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index eb4d613fa..0dde3030a 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -1,4 +1,4 @@
- at media (max-device-width: 767px)  {
+ at media (max-width: 767px) and (orientation: portrait), (max-width: 1023px) and (orientation: landscape) {
 	.menuwizard .menu-entry-icon{
 		padding-left: 4%;
 	}
commit 0b40d94dc23f2a1c5b2e763674c166bea9dfec6c
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Mar 19 16:27:36 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 20 15:05:05 2020 +0100

    Hacks to improve user experience when changing orientation on phones
    
    I now think that much of our media queries with (max-device-height:
    767px) actually should use (max-device-width: 767px) if the intent is
    that they detect the case of mobile phones, as opposed to tablets.
    
    Many mobile phones have a screen.height (which is what
    max-device-height in CSS refers to) that is clearly larger than 767.
    But a screen.width of 768 is what at least my 9.7 iPad has.
    
    Change-Id: I3b44e32ec583837897b4aa390fc0ab92be59d163
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90752
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index a0cf27e43..334b721ee 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -174,9 +174,28 @@ body {
 	width: 0;
 }
 
+/* Hide hamburger except on mobile phones */
 #toolbar-hamburger {
 	width: 0;
 }
+ at media (max-device-width: 767px) {
+	#toolbar-hamburger {
+		width: 36px;
+	}
+	/* In Safari on iPhone, the address bar is auto-hidden in landscape
+	 * orientation. For some reason this prevents jQuery from
+	 * getting events when tapping on the things in the toolbar at
+	 * the top, like the hamburger button. To work around this,
+	 * add a bit of padding to the body element. This is of course
+	 * an extremely silly waste of precious vertical space and
+	 * some other solution should be found.
+	 */
+	@media (orientation: landscape) {
+		body {
+			padding-top: 20px;
+		}
+	}
+}
 
 #mobile-edit-button {
 	position: absolute;
@@ -284,9 +303,6 @@ body {
 		bottom: 35px !important;
 	}
 
-	#toolbar-hamburger {
-	width: 36px;
-	}
 	#closebuttonwrapper {
 		display: none;
 	}
@@ -296,7 +312,7 @@ body {
 	}
 }
 
- at media (max-width: 767px) and (orientation: portrait), (max-device-height: 767px) and (orientation: portrait) {
+ at media (max-width: 767px) and (orientation: portrait) {
 	#presentation-controls-wrapper {
 		top: initial;
 		left: initial;
@@ -327,7 +343,7 @@ body {
 		bottom: 33px;
 	}
 }
- at media (max-width: 767px) and (orientation: landscape), (max-device-height: 767px) and (orientation: landscape) {
+ at media (max-width: 1023px) and (orientation: landscape) {
 	#presentation-controls-wrapper {
 		top: 41px;
 		bottom: 33px;
diff --git a/loleaflet/css/menubar-mobile.css b/loleaflet/css/menubar-mobile.css
index 564eedc3e..cccb63eda 100644
--- a/loleaflet/css/menubar-mobile.css
+++ b/loleaflet/css/menubar-mobile.css
@@ -1,4 +1,4 @@
- at media (max-width: 767px), (max-device-height: 767px) {
+ at media (max-device-width: 767px) {
 	.logo {
 		background-size: 100px;
 		max-width: 24px;
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index f25fb9cb9..df11acf55 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -151,12 +151,11 @@
     overflow: hidden;
 }
 
-/* Mobile menu toggle button */
+/* Hamburger button */
 
 .main-menu-btn {
     margin: 2px 10px;
     position: relative;
-    display: none;
     width: 17px;
     height: 21px;
     text-indent: 17px;
@@ -167,7 +166,7 @@
 }
 
 
-/* hamburger icon */
+/* Hamburger icon */
 
 .main-menu-btn-icon,
 .main-menu-btn-icon:before,
@@ -270,15 +269,6 @@
 	display: none;
     }
 
-    /* hide the menu in mobile view */
-    #main-menu-state:not(:checked) ~ #main-menu {
-        display: none;
-    }
-
-    .main-menu-btn {
-        display: inline-block;
-    }
-
     .main-nav {
         position: absolute;
         height: 0;
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index bb6addd51..eb4d613fa 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -1,4 +1,4 @@
- at media (max-width: 767px), (max-device-height: 767px) {
+ at media (max-device-width: 767px)  {
 	.menuwizard .menu-entry-icon{
 		padding-left: 4%;
 	}
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index c11e54a5e..643850b16 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -879,7 +879,7 @@ L.Control.Menubar = L.Control.extend({
 
 		$('#main-menu').bind('keydown', {self: this}, this._onKeyDown);
 
-		if (L.Browser.mobile)
+		if (window.mode.isMobile())
 			$('#main-menu').parent().css('height', '0');
 
 		var self = this;
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 69f094070..4e8bd7b75 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -224,19 +224,20 @@ L.Map = L.Evented.extend({
 
 			// We need core's knowledge of whether it is a mobile phone or not (which is
 			// what .uno:LOKSetMobile does) to be in sync with the test in
-			// _onJSDialogMsg in TileLayer.js but we don't have the clout to do so
-			// except for the iOS app out of fear of breaking something.
-			if (L.Browser.mobile && (!window.ThisIsTheiOSApp || screen.width < 768))
+			// _onJSDialogMsg in TileLayer.js.
+			if (window.mode.isMobile())
 			{
 				this._size = new L.Point(0,0);
 				this._onResize();
 				this._socket.sendMessage('uno .uno:LOKSetMobile');
-				// Add a style sheet for mobile phones. Just a placeholder so far.
+				// Add a style sheet for mobile phones. Doing it here is hopefully more
+				// reliable that relying on CSS media queries looking at the window or device size.
 				var style = document.createElement('style');
-				style.innerHTML = ' \
-#foobar { \
-        background: red; \
-} \
+				style.innerHTML = '  \
+/* Hide the menu bar in a horribly convoluted way */ \
+#main-menu-state:not(:checked) ~ #main-menu {        \
+    display: none;                                   \
+}                                                    \
 ';
 				document.head.appendChild(style);
 			}
commit 98ea661482d7edf91f8dac80c8df0f18565465ec
Author:     Weblate <noreply at documentfoundation.org>
AuthorDate: Fri Mar 20 08:25:31 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 20 15:04:46 2020 +0100

    update translations
    
    LibreOffice Online/android-app (Bulgarian)
    Currently translated at 100.0% (100 of 100 strings)
    
    Change-Id: Ia0adbe259646f2fda33a25b30f8811dc147cc5a3
    
    update translations
    
    LibreOffice Online/android-lib (Bulgarian)
    Currently translated at 75.0% (9 of 12 strings)
    
    Change-Id: I9206580869c83825c95c9079cc8fe052d860e2a9
    
    update translations
    
    LibreOffice Online/loleaflet-help (Catalan)
    Currently translated at 74.3% (309 of 416 strings)
    
    Change-Id: If5c7bb3dab8e0d84010d7c4c3c149d5eed99183e
    
    update translations
    
    LibreOffice Online/android-lib (Asturian)
    Currently translated at 58.3% (7 of 12 strings)
    
    Change-Id: Ic5b84d1302c52727c27c7acc3d8f23ae39c286d5
    
    update translations
    
    LibreOffice Online/android-lib (Catalan)
    Currently translated at 100.0% (12 of 12 strings)
    
    Change-Id: Id176e6b42a7571fbfbacbbf00f6f9293f255f815
    
    update translations
    
    LibreOffice Online/android-lib (Spanish)
    Currently translated at 100.0% (12 of 12 strings)
    
    Change-Id: Ia75341ad1c6408648600e9f01702ac0408865d50
    
    update translations
    
    LibreOffice Online/loleaflet-help (Catalan)
    Currently translated at 74.3% (309 of 416 strings)
    
    Change-Id: I09fda62f77693d651390db378eb9f2fa62f3c6e0
    
    update translations
    
    LibreOffice Online/loleaflet-help (Spanish)
    Currently translated at 100.0% (416 of 416 strings)
    
    Change-Id: I9b2cb58ac67e3136408b5493d4ab3d4c6e64e9a2
    
    update translations
    
    LibreOffice Online/android-lib (Welsh)
    Currently translated at 100.0% (12 of 12 strings)
    
    Change-Id: I0c4e7d1bfadcd652dc4450abfe65134b055e0060
    
    update translations
    
    LibreOffice Online/android-lib (Welsh)
    Currently translated at 83.3% (10 of 12 strings)
    
    Change-Id: Icda607bf7238045a1ade6f237fb18c61fb0bcff5
    
    update translations
    
    LibreOffice Online/android-lib (Basque)
    Currently translated at 100.0% (12 of 12 strings)
    
    Change-Id: Iebbc610027b26b1202d6e1c78978ed35213e8bcd
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90736
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 3540dec88..30a5fd173 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -99,4 +99,5 @@
     <string name="app_version">Версия: %1$s, Build ID: %2$s</string>
     <string name="pref_enable_chrome_debugger_info">Включва използването на дебъгера на Chrome в документа.</string>
     <string name="pref_enable_chrome_debugger">Дебъгер на Chrome</string>
+    <string name="pref_category_editor">Настройки на редактора</string>
 </resources>
\ No newline at end of file
diff --git a/android/lib/src/main/res/values-ast/strings.xml b/android/lib/src/main/res/values-ast/strings.xml
index ab73e35e0..9f2f7300f 100644
--- a/android/lib/src/main/res/values-ast/strings.xml
+++ b/android/lib/src/main/res/values-ast/strings.xml
@@ -5,4 +5,6 @@
     <string name="preparing_for_the_first_start_after_an_update">Preparando pal primer aniciu dempués d\'un anovamientu.</string>
     <string name="storage_permission_required">Ríquese permisu d\'almacenamientu</string>
     <string name="later">Sero</string>
+    <string name="failed_to_load_file">Nun pudo determinase qué ficheru cargar</string>
+    <string name="exiting">Colando…</string>
 </resources>
\ No newline at end of file
diff --git a/android/lib/src/main/res/values-bg/strings.xml b/android/lib/src/main/res/values-bg/strings.xml
index bcdef509d..affadd8f2 100644
--- a/android/lib/src/main/res/values-bg/strings.xml
+++ b/android/lib/src/main/res/values-bg/strings.xml
@@ -8,4 +8,6 @@
     <string name="temp_file_saving_disabled">Този файл е само за четене, записването е изключено.</string>
     <string name="saving">Записване...</string>
     <string name="preparing_for_the_first_start_after_an_update">Подготвя се първо стартиране след актуализация.</string>
+    <string name="later">По-късно</string>
+    <string name="rate_now">Оценяване сега</string>
 </resources>
\ No newline at end of file
diff --git a/android/lib/src/main/res/values-ca/strings.xml b/android/lib/src/main/res/values-ca/strings.xml
index e7ee2aaae..74682a355 100644
--- a/android/lib/src/main/res/values-ca/strings.xml
+++ b/android/lib/src/main/res/values-ca/strings.xml
@@ -12,4 +12,5 @@
     <string name="later">Més tard</string>
     <string name="rate_our_app_text">Si en gaudiu, poseu-li 5 estrelles al Google Play. Les vostres ressenyes positives són la nostra motivació més gran.</string>
     <string name="rate_our_app_title">Gràcies per utilitzar el %1$s!</string>
+    <string name="exiting">S\'està sortint…</string>
 </resources>
\ No newline at end of file
diff --git a/android/lib/src/main/res/values-cy/strings.xml b/android/lib/src/main/res/values-cy/strings.xml
index be80d2eff..8b9294bab 100644
--- a/android/lib/src/main/res/values-cy/strings.xml
+++ b/android/lib/src/main/res/values-cy/strings.xml
@@ -8,4 +8,9 @@
     <string name="temp_file_saving_disabled">Darllen yn unig yw\'r ffeil hon, mae cadw wedi ei analluogi.</string>
     <string name="saving">Yn cadw...</string>
     <string name="preparing_for_the_first_start_after_an_update">Paratoi am y cychwyn cyntaf ar ôl diweddariad.</string>
+    <string name="rate_our_app_title">Diolch am ddefnyddio %1$s!</string>
+    <string name="later">Hwyrach</string>
+    <string name="rate_now">Graddio nawr</string>
+    <string name="exiting">Gorffen...</string>
+    <string name="rate_our_app_text">Os ydych yn ei hoffi, rhowch 5 seren i ni ar Google Play. Mae eich adolygiadau da yn ein hysbrydoli.</string>
 </resources>
\ No newline at end of file
diff --git a/android/lib/src/main/res/values-es/strings.xml b/android/lib/src/main/res/values-es/strings.xml
index ea77f9dc2..834015b2c 100644
--- a/android/lib/src/main/res/values-es/strings.xml
+++ b/android/lib/src/main/res/values-es/strings.xml
@@ -13,4 +13,5 @@
     <string name="rate_our_app_title">¡Gracias por utilizar %1$s!</string>
     <string name="later">Luego</string>
     <string name="rate_now">Calificar ahora</string>
+    <string name="exiting">Saliendo…</string>
 </resources>
\ No newline at end of file
diff --git a/android/lib/src/main/res/values-eu/strings.xml b/android/lib/src/main/res/values-eu/strings.xml
index c15a6fcb3..4a9ed79a8 100644
--- a/android/lib/src/main/res/values-eu/strings.xml
+++ b/android/lib/src/main/res/values-eu/strings.xml
@@ -12,4 +12,5 @@
     <string name="rate_our_app_title">Eskerrik asko %1$s erabiltzeagatik!</string>
     <string name="later">Geroago</string>
     <string name="rate_now">Eman puntuazioa orain</string>
+    <string name="exiting">Irteten...</string>
 </resources>
\ No newline at end of file
diff --git a/loleaflet/po/help-ca.po b/loleaflet/po/help-ca.po
index d05ad1577..5594c04fb 100644
--- a/loleaflet/po/help-ca.po
+++ b/loleaflet/po/help-ca.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-03-15 22:15+0200\n"
-"PO-Revision-Date: 2020-03-18 14:17+0000\n"
+"PO-Revision-Date: 2020-03-19 14:34+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fito at libreoffice.org>\n"
 "Language-Team: Catalan <https://weblate.documentfoundation.org/projects/libo_online/loleaflet-help/ca/>\n"
 "Language: ca\n"
@@ -1211,7 +1211,7 @@ msgstr "Si no se selecciona cap taula o interval, es mostra el prototip d'un dia
 
 #: html/loleaflet-help.html%2Bdiv.p:319-5
 msgid "<span class=\"def\">Chart editing:</span> Double click the chart to select. Use context menus to add chart elements such as title, axis, and other. Choose <span class=\"ui\">Data Range</span> and <span class=\"ui\">Chart Type</span> to edit chart data and select chart type."
-msgstr ""
+msgstr "<span class=\"def\">Edició dels diagrames:</span> feu doble clic al diagrama per a seleccionar-lo. Feu servir els menús contextuals per a afegir-hi elements com ara el títol i els eixos. Trieu <span class=\"ui\">Interval de dades</span> i <span class=\"ui\">Tipus de diagrama</span> per a modificar les dades del diagrama i seleccionar-ne el tipus, respectivament."
 
 #: html/loleaflet-help.html%2Bdiv.p:320-5
 msgid "<span class=\"def\">Chart formatting:</span> The same context menu brings you to chart data table and chart type selection."
@@ -1415,7 +1415,7 @@ msgstr ""
 
 #: html/loleaflet-help.html%2Bdiv.div.p:415-5
 msgid "<span class=\"def\">Footnotes and endnotes:</span> Footnotes and endnotes are supported."
-msgstr ""
+msgstr "<span class=\"def\">Notes al peu i finals:</span> s'admet l'ús de notes al peu i finals."
 
 #: html/loleaflet-help.html%2Bdiv.div.p:422-5
 msgid "<span class=\"productname\">%productName</span> Impress edits presentations in a way that should be familiar to people. Operations like typing text, cut, copy and pasting contents, selecting text , inserting, resizing, anchoring images, adding and handling tables, are similar to a desktop presentation application. Use the keyboard, menus and toolbars to perform actions in your document."
diff --git a/loleaflet/po/help-es.po b/loleaflet/po/help-es.po
index e1f5fac6a..4f890b5ee 100644
--- a/loleaflet/po/help-es.po
+++ b/loleaflet/po/help-es.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-03-15 22:15+0200\n"
-"PO-Revision-Date: 2020-03-17 18:53+0000\n"
+"PO-Revision-Date: 2020-03-19 13:49+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fito at libreoffice.org>\n"
 "Language-Team: Spanish <https://weblate.documentfoundation.org/projects/libo_online/loleaflet-help/es/>\n"
 "Language: es\n"
@@ -1170,8 +1170,6 @@ msgid "Pasting"
 msgstr "Pegar"
 
 #: html/loleaflet-help.html%2Bdiv.p:301-5
-#, fuzzy
-#| msgid "When you paste content copied from within the same document, the format and elements are maintained. If you copy from another document, in another tab or browser window, of from outside of the browser, the pasted content will preserve rich text."
 msgid "When you paste content copied from within the same document, the format and elements are maintained. If you copy from another document, in another tab or browser window, or from outside of the browser, the pasted content will preserve rich text."
 msgstr "Al pegar el contenido copiado del mismo documento, se conserva el formato y el contenido. Si copia de otro documento, en otra pestaña del navegador o ventana, o incluso de otra aplicación que no sea el navegador, el contenido pegado preserva el formato y el contenido."
 
@@ -1188,10 +1186,8 @@ msgid "When you paste text from outside of the document (another browser window
 msgstr "Al pegar texto desde fuera del documento (otra ventana del navegador o aplicación de escritorio), el texto se pegará con texto con formato (texto enriquecido)."
 
 #: html/loleaflet-help.html%2Bdiv.p:305-5
-#, fuzzy
-#| msgid "When you have internal cut or copied content, you can paste this content with the right mouse button menu."
 msgid "When you have internal cut or copied content, you can paste this content using the context menu."
-msgstr "Y cuando haya cortado o copiado contenido interno, puede pegar este contenido con el menú del botón derecho del ratón."
+msgstr "Y cuando haya cortado o copiado contenido interno, puede pegar este contenido con el menú contextual."
 
 #: html/loleaflet-help.html%2Bdiv.h4:308-5
 msgid "Adding charts"
@@ -1366,8 +1362,6 @@ msgid "<span class=\"def\">Direct formatting:</span> You can format text documen
 msgstr "<span class=\"def\">Formato directo:</span> Puede formatear objetos del documento de texto directamente desde los menús, la barra de herramientas y los menús contextuales. El formato directo sólo se aplica al objeto seleccionado."
 
 #: html/loleaflet-help.html%2Bdiv.div.p:397-5
-#, fuzzy
-#| msgid "<span class=\"def\">Style formatting:</span> <span class=\"productname\">%productName</span> support paragraph styles. You can apply an existing paragraph style to a paragraph. Choose menu <span class=\"ui\">Edit</span> → <span class=\"ui\">Edit styles</span> to change style."
 msgid "<span class=\"def\">Style formatting:</span> <span class=\"productname\">%productName</span> supports paragraph styles. You can apply an existing paragraph style to a paragraph. Choose menu <span class=\"ui\">Edit</span> → <span class=\"ui\">Edit styles</span> to change style."
 msgstr "<span class=\"def\">Formato por estilo:</span> <span class=\"productname\">%productName</span> admite estilos de párrafo. Puede aplicar un estilo de párrafo existente a varios párrafos. Seleccione el menú <span class=\"ui\">Editar</span> ▸ <span class=\"ui\">Editar estilo</span> para modificar el estilo."
 
@@ -1420,10 +1414,8 @@ msgid "<span class=\"def\">Page header and footer:</span> Headers and footers ar
 msgstr "<span class=\"def\">Cabecera y pie de página:</span> Cabeceras y pies de página están disponibles para el estilo de página existente aplicado en el documento en la posición del cursor."
 
 #: html/loleaflet-help.html%2Bdiv.div.p:415-5
-#, fuzzy
-#| msgid "<span class=\"def\">Footnotes and endnotes:</span> Footnotes and endnotes are supported, being rendered as they are shown."
 msgid "<span class=\"def\">Footnotes and endnotes:</span> Footnotes and endnotes are supported."
-msgstr "<span class=\"def\">Notas al pie y notas finales:</span> se admiten las notas al pie de página y finales y se visualizan en cuanto se insertan."
+msgstr "<span class=\"def\">Notas al pie y notas finales:</span> se admite la utilización de notas al pie de página y finales."
 
 #: html/loleaflet-help.html%2Bdiv.div.p:422-5
 msgid "<span class=\"productname\">%productName</span> Impress edits presentations in a way that should be familiar to people. Operations like typing text, cut, copy and pasting contents, selecting text , inserting, resizing, anchoring images, adding and handling tables, are similar to a desktop presentation application. Use the keyboard, menus and toolbars to perform actions in your document."
@@ -1542,8 +1534,6 @@ msgid "What is the blue wavy underline in some words in the text?"
 msgstr "¿Y las líneas onduladas azules en el texto?"
 
 #: html/loleaflet-help.html%2Bdiv.p:465-5
-#, fuzzy
-#| msgid "Grammar errors in the text is marked with the blue wavy underline. Click on the underlined text with the right mouse button to open a menu with suggestions to correct the grammar error and the offending grammar rules. Select the right suggestion to change the text."
 msgid "Grammar errors in the text is marked with the blue wavy underline. Click on the underlined text with the right mouse button to open a menu with suggestions to correct the grammar error and the offended grammar rules. Select the right suggestion to change the text."
 msgstr "Los errores gramaticales en el texto se marcan con un subrayado ondulado azul. Pulse con el botón secundario del ratón para abrir un menú con sugerencias para corregir el error gramatical y conocer la regla infringida. Seleccione la sugerencia adecuada para cambiar el texto."
 
@@ -1608,8 +1598,6 @@ msgid "You have the Track Changes feature enabled for the document. Track Change
 msgstr "Usted tiene el seguimiento de cambios activado. El seguimiento de cambios escribe todos los cambios en el texto y muestra las ediciones para una revisión posterior. Es muy útil para marcar cambios en textos y hojas de cálculo. El seguimiento de cambios se activa al elegir <span class=\"ui\">Editar</span> ▸ <span class=\"ui\">Seguimiento de cambios</span> ▸ <span class=\"ui\">Grabar</span>."
 
 #: html/loleaflet-help.html%2Bdiv.div.p:491-5
-#, fuzzy
-#| msgid "With track changes enabled your document show the following settings:"
 msgid "With track changes enabled your document is shown the following manner:"
 msgstr "Con el seguimiento de cambio activado, su documento presenta las siguientes características:"
 
commit d12df2f7a252ca7b8bdec92f0ac6303ad6152a1e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Mar 20 12:20:00 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 20 15:04:46 2020 +0100

    Revert "[cp] add 1 missing Spanish string, because Weblate was late"
    
    This reverts commit 5a19ae03d7e7c493e43209d23859be819b65e1f0.
    Release was delayed, translations have arrived.
    
    Change-Id: Ic140722ddcc290af1bc94458ad07bc6793899205

diff --git a/android/lib/src/main/res/values-es/strings.xml b/android/lib/src/main/res/values-es/strings.xml
index 6ed5673ef..ea77f9dc2 100644
--- a/android/lib/src/main/res/values-es/strings.xml
+++ b/android/lib/src/main/res/values-es/strings.xml
@@ -5,13 +5,12 @@
     <string name="failed_to_load_file">No se pudo determinar el archivo para cargar</string>
     <string name="failed_to_insert_image">Error al insertar imagen</string>
     <string name="cannot_open_file_chooser">No se puede abrir el selector de archivos</string>
-    <string name="preparing_for_the_first_start_after_an_update">Preparándose para el primer inicio tras una actualización.</string>
-    <string name="rate_now">Calificar ahora</string>
-    <string name="later">Luego</string>
-    <string name="rate_our_app_title">¡Gracias por utilizar %1$s!</string>
-    <string name="rate_our_app_text">Si le gusta, denos 5 estrellas en Google Play. Su reseña positiva es nuestra mayor motivación.</string>
-
     <!-- Loading SlideShow Dialog Strings -->
     <string name="loading">Cargando…</string>
-    <string name="exiting">Saliendo…</string>
-</resources>
+    <string name="saving">Guardando…</string>
+    <string name="preparing_for_the_first_start_after_an_update">Preparándose para el primer inicio tras una actualización.</string>
+    <string name="rate_our_app_text">Si le gusta, denos 5 estrellas en Google Play. Su reseña positiva es nuestra mayor motivación.</string>
+    <string name="rate_our_app_title">¡Gracias por utilizar %1$s!</string>
+    <string name="later">Luego</string>
+    <string name="rate_now">Calificar ahora</string>
+</resources>
\ No newline at end of file


More information about the Libreoffice-commits mailing list