summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@cib.de>2020-02-03 17:25:44 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2020-02-04 20:13:25 +0100
commitbf0baf83fe1ff3e0b46f18294729ad0dd4598104 (patch)
treea07475ec36d4fe0d222d0ea78bcf6058adca47bb
parent1cff94d109c38cc4c929e9ab69c8d5fbd881ba84 (diff)
Revert "Add ODF 1.3 strings to Save options page"
This reverts commit ef39938dea14666a5835b6ae85091c1010f8ae8d. Reason for revert: Nasty side effects if the user actually selects the new values because the dialog code isn't adapted, see https://gerrit.libreoffice.org/c/core/+/87900 Change-Id: Ie220974dcf58b23401b21e5fa43e7d2f5d7978ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87901 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Jenkins
-rw-r--r--cui/uiconfig/ui/optsavepage.ui15
1 files changed, 1 insertions, 14 deletions
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
@@ -296,17 +296,6 @@
</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>
<property name="can_focus">False</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>