[Libreoffice-commits] core.git: 2 commits - cui/uiconfig sc/source

[Adolfo Jayme Barrientos]

 cui/uiconfig/ui/colorpage.ui       |    2 +-
 sc/source/ui/src/condformatdlg.src |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 16e5fe1af6025fecb06d4cfdd300903019e4eac9
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date:   Sat May 16 11:31:01 2015 -0500

    Spelling: smilies → smileys
    
    Change-Id: I855060d91933414ffb51f45420abf8d0bd69399b

diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src
index 4d2ca4c..f7cb9e5 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -285,10 +285,10 @@ Control RID_COND_ENTRY
             "3 Signs";
             "3 Symbols 1";
             "3 Symbols 2";
-            "3 Smilies";
+            "3 Smileys";
             "3 Stars";
             "3 Triangles";
-            "3 Colored Smilies";
+            "3 Colored Smileys";
             "4 Arrows";
             "4 Gray Arrows";
             "4 Circles Red to Black";
commit af764d0b8171d87d5457604467afe9b16426d41d
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date:   Sat May 16 11:22:46 2015 -0500

    Add missing ellipsis to the color picking button
    
    Change-Id: I19fc41fdffc2579a6316807ba3dc4d937864a37c

diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 5d91456..2027800 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -430,7 +430,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="edit">
-                        <property name="label">_Pick</property>
+                        <property name="label">_Pick…</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>