[Libreoffice-commits] core.git: svx/inc sw/inc

[Caolán McNamara (via logerrit)]

 svx/inc/spacing.hrc        |   28 ++++++++++++++--------------
 sw/inc/pageformatpanel.hrc |    6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 6552ce0f510da67be02a5102016bd14957a25a85
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 9 17:18:32 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 9 20:45:28 2019 +0100

    Related: tdf#129267 separate cm from value in built-in en_US strings
    
    Change-Id: Ia3821d734ffda8e873473ac15e4a4dca5404f871
    Reviewed-on: https://gerrit.libreoffice.org/84782
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc
index 3d4e93dc02b3..445484248a07 100644
--- a/svx/inc/spacing.hrc
+++ b/svx/inc/spacing.hrc
@@ -31,13 +31,13 @@ const std::pair<const char*, int> RID_SVXSTRARY_SPACING_INCH[] =
 const std::pair<const char*, int> RID_SVXSTRARY_SPACING_CM[] =
 {
     { NC_("RID_SVXSTRARY_SPACING_CM", "None"),                    0 },
-    { NC_("RID_SVXSTRARY_SPACING_CM", "Extra Small (0.16cm)"),   91 },
-    { NC_("RID_SVXSTRARY_SPACING_CM", "Small (0.32cm)"),        181 },
-    { NC_("RID_SVXSTRARY_SPACING_CM", "Small Medium (0.64cm)"), 363 },
-    { NC_("RID_SVXSTRARY_SPACING_CM", "Medium (0.95cm)"),       539 },
-    { NC_("RID_SVXSTRARY_SPACING_CM", "Medium Large (1.27cm)"), 720 },
-    { NC_("RID_SVXSTRARY_SPACING_CM", "Large (1.9cm)"),        1077 },
-    { NC_("RID_SVXSTRARY_SPACING_CM", "Extra Large (2.54cm)"), 1440 },
+    { NC_("RID_SVXSTRARY_SPACING_CM", "Extra Small (0.16 cm)"),   91 },
+    { NC_("RID_SVXSTRARY_SPACING_CM", "Small (0.32 cm)"),        181 },
+    { NC_("RID_SVXSTRARY_SPACING_CM", "Small Medium (0.64 cm)"), 363 },
+    { NC_("RID_SVXSTRARY_SPACING_CM", "Medium (0.95 cm)"),       539 },
+    { NC_("RID_SVXSTRARY_SPACING_CM", "Medium Large (1.27 cm)"), 720 },
+    { NC_("RID_SVXSTRARY_SPACING_CM", "Large (1.9 cm)"),        1077 },
+    { NC_("RID_SVXSTRARY_SPACING_CM", "Extra Large (2.54 cm)"), 1440 },
     { nullptr, 0 }
 };
 
@@ -59,13 +59,13 @@ const std::pair<const char*, int> RID_SVXSTRARY_MARGINS_INCH[] =
 const std::pair<const char*, int> RID_SVXSTRARY_MARGINS_CM[] =
 {
     { NC_("RID_SVXSTRARY_MARGINS_CM", "None"),                    0 },
-    { NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Small (0.16cm)"),   91 },
-    { NC_("RID_SVXSTRARY_MARGINS_CM", "Small (0.32cm)"),        181 },
-    { NC_("RID_SVXSTRARY_MARGINS_CM", "Small Medium (0.64cm)"), 363 },
-    { NC_("RID_SVXSTRARY_MARGINS_CM", "Medium (0.95cm)"),       539 },
-    { NC_("RID_SVXSTRARY_MARGINS_CM", "Medium Large (1.27cm)"), 720 },
-    { NC_("RID_SVXSTRARY_MARGINS_CM", "Large (1.9cm)"),        1077 },
-    { NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Large (2.54cm)"), 1440 },
+    { NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Small (0.16 cm)"),   91 },
+    { NC_("RID_SVXSTRARY_MARGINS_CM", "Small (0.32 cm)"),        181 },
+    { NC_("RID_SVXSTRARY_MARGINS_CM", "Small Medium (0.64 cm)"), 363 },
+    { NC_("RID_SVXSTRARY_MARGINS_CM", "Medium (0.95 cm)"),       539 },
+    { NC_("RID_SVXSTRARY_MARGINS_CM", "Medium Large (1.27 cm)"), 720 },
+    { NC_("RID_SVXSTRARY_MARGINS_CM", "Large (1.9 cm)"),        1077 },
+    { NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Large (2.54 cm)"), 1440 },
     { nullptr, 0 }
 };
 
diff --git a/sw/inc/pageformatpanel.hrc b/sw/inc/pageformatpanel.hrc
index 048ff93a8776..3d9e7727efca 100644
--- a/sw/inc/pageformatpanel.hrc
+++ b/sw/inc/pageformatpanel.hrc
@@ -34,9 +34,9 @@ const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
     NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "None"),
     NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Narrow"),
     NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Moderate"),
-    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (1.9cm)"),
-    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (2.54cm)"),
-    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (3.18cm)"),
+    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (1.9 cm)"),
+    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (2.54 cm)"),
+    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (3.18 cm)"),
     NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Wide"),
     NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Mirrored")
 };