cui/uiconfig/ui/optsavepage.ui | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
New commits:
commit c7e346ea5e4c27d31c28365534ac137ee4d0ac09
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Wed Jan 15 01:04:02 2020 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Jan 21 10:59:39 2020 +0100
Revert "Add ODF 1.3 strings to Save options page"
This reverts commit ef39938dea14666a5835b6ae85091c1010f8ae8d.
Change was precautionary to get strings in, feature didn't make it in
time. Let's revert for 6.4.0 release.
Change-Id: I5a09dade0f218564bcfc58ca875f39e8103acd1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86819
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Reviewed-by: Michael Stahl <michael.st...@cib.de>
Tested-by: Michael Stahl <michael.st...@cib.de>
diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index aec0dda720de..e9a090d45091 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -295,17 +295,6 @@
<property name="top_attach">0</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="odfwarning13_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="optsavepage|odfwarning_label" comments="EN-US, the term 'extended'
must not be translated.">Not using ODF 1.3 Extended may cause information to be
lost.</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
<child>
<object class="GtkImage" id="odfwarning_image">
<property name="visible">True</property>
@@ -332,9 +321,7 @@
<item translatable="yes"
context="optsavepage|odfversion">1.0/1.1</item>
<item translatable="yes"
context="optsavepage|odfversion">1.2</item>
<item translatable="yes"
context="optsavepage|odfversion">1.2 Extended (compatibility mode)</item>
- <item translatable="yes"
context="optsavepage|odfversion">1.2 Extended</item>
- <item translatable="yes"
context="optsavepage|odfversion">1.3</item>
- <item translatable="yes"
context="optsavepage|odfversion">1.3 Extended (recommended)</item>
+ <item translatable="yes"
context="optsavepage|odfversion">1.2 Extended (recommended)</item>
</items>
</object>
<packing>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
