[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 2 14:01:12 UTC 2018
sc/uiconfig/scalc/ui/pagetemplatedialog.ui | 20 +++++++++++++++++---
sc/uiconfig/scalc/ui/paratemplatedialog.ui | 2 +-
sd/uiconfig/simpress/ui/templatedialog.ui | 2 +-
sw/uiconfig/swriter/ui/templatedialog1.ui | 2 +-
sw/uiconfig/swriter/ui/templatedialog16.ui | 2 +-
sw/uiconfig/swriter/ui/templatedialog2.ui | 2 +-
sw/uiconfig/swriter/ui/templatedialog4.ui | 2 +-
sw/uiconfig/swriter/ui/templatedialog8.ui | 2 +-
8 files changed, 24 insertions(+), 10 deletions(-)
New commits:
commit 80e840a5208a822aa92ae5869ce34fe0dad8c63e
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 2 09:16:36 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Oct 2 16:00:47 2018 +0200
tdf#120227 'standard' button missing from .ui
and 'standard' just has to exist, doesn't need to be translatable
Change-Id: I1e5157781ea81c40952c462253a2e3d53557aecb
Reviewed-on: https://gerrit.libreoffice.org/61229
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
index 4b05b7ad2dc9..86810058a28b 100644
--- a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
@@ -38,6 +38,20 @@
</packing>
</child>
<child>
+ <object class="GtkButton" id="standard">
+ <property name="label" translatable="no">_Standard</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
@@ -50,7 +64,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -64,7 +78,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -78,7 +92,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
<property name="secondary">True</property>
</packing>
</child>
diff --git a/sc/uiconfig/scalc/ui/paratemplatedialog.ui b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
index b20303872520..b668058b5f32 100644
--- a/sc/uiconfig/scalc/ui/paratemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
@@ -25,7 +25,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes" context="paratemplatedialog|standard">_Standard</property>
+ <property name="label" translatable="no">_Standard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui b/sd/uiconfig/simpress/ui/templatedialog.ui
index 23f96aa513b4..8ab22be072a1 100644
--- a/sd/uiconfig/simpress/ui/templatedialog.ui
+++ b/sd/uiconfig/simpress/ui/templatedialog.ui
@@ -77,7 +77,7 @@
</child>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes" context="templatedialog|standard">_Standard</property>
+ <property name="label" translatable="no">_Standard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui b/sw/uiconfig/swriter/ui/templatedialog1.ui
index d3d1d695c9d2..a7960a1646b6 100644
--- a/sw/uiconfig/swriter/ui/templatedialog1.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog1.ui
@@ -52,7 +52,7 @@
</child>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes" context="templatedialog1|standard">_Standard</property>
+ <property name="label" translatable="no">_Standard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui b/sw/uiconfig/swriter/ui/templatedialog16.ui
index 5e498be71720..3bebf8e38684 100644
--- a/sw/uiconfig/swriter/ui/templatedialog16.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog16.ui
@@ -68,7 +68,7 @@
</child>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes" context="templatedialog16|standard">Standard</property>
+ <property name="label" translatable="no">Standard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui b/sw/uiconfig/swriter/ui/templatedialog2.ui
index 2a33e22e201c..237fc0c7b5e7 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -52,7 +52,7 @@
</child>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes" context="templatedialog2|standard">_Standard</property>
+ <property name="label" translatable="no">_Standard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui b/sw/uiconfig/swriter/ui/templatedialog4.ui
index c6fac0ad2c6c..6dd1aebca436 100644
--- a/sw/uiconfig/swriter/ui/templatedialog4.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog4.ui
@@ -52,7 +52,7 @@
</child>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes" context="templatedialog4|standard">_Standard</property>
+ <property name="label" translatable="no">_Standard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui b/sw/uiconfig/swriter/ui/templatedialog8.ui
index 3bab63f2f5e9..720382741b1a 100644
--- a/sw/uiconfig/swriter/ui/templatedialog8.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog8.ui
@@ -68,7 +68,7 @@
</child>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes" context="templatedialog8|standard">Standard</property>
+ <property name="label" translatable="no">Standard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
More information about the Libreoffice-commits
mailing list