[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/inc svx/inc sw/inc

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Dec 11 08:59:52 UTC 2019


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

New commits:
commit 9888183a126a76f35971e57cbd08be2603dba7b0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 9 19:52:12 2019 +0000
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed Dec 11 09:59:07 2019 +0100

    use double prime for inch symbol
    
    Change-Id: I6a663bcb55155bd2331aa79cebd5b922c2ee7605
    Reviewed-on: https://gerrit.libreoffice.org/84787
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit af728b8ce5cc7c5b3860282f87ee3dfed79f1fcc)
    Reviewed-on: https://gerrit.libreoffice.org/84910
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc
index b7309ee69748..6d36ec2871ad 100644
--- a/sd/inc/pageformatpanel.hrc
+++ b/sd/inc/pageformatpanel.hrc
@@ -21,9 +21,9 @@ const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
     NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "None"),
     NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Narrow"),
     NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Moderate"),
-    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (0.75\")"),
-    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1\")"),
-    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1.25\")"),
+    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (0.75″)"),
+    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1″)"),
+    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1.25″)"),
     NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Wide"),
 };
 
diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc
index 3d4e93dc02b3..e5263677826d 100644
--- a/svx/inc/spacing.hrc
+++ b/svx/inc/spacing.hrc
@@ -17,13 +17,13 @@
 const std::pair<const char*, int> RID_SVXSTRARY_SPACING_INCH[] =
 {
     { NC_("RID_SVXSTRARY_SPACING_INCH", "None"),                    0 },
-    { NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Small (1/16\")"),   91 },
-    { NC_("RID_SVXSTRARY_SPACING_INCH", "Small (1/8\")"),         181 },
-    { NC_("RID_SVXSTRARY_SPACING_INCH", "Small Medium (1/4\")"),  363 },
-    { NC_("RID_SVXSTRARY_SPACING_INCH", "Medium (3/8\")"),        539 },
-    { NC_("RID_SVXSTRARY_SPACING_INCH", "Medium Large (1/2\")"),  720 },
-    { NC_("RID_SVXSTRARY_SPACING_INCH", "Large (3/4\")"),        1077 },
-    { NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Large (1\")"),    1440 },
+    { NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Small (1/16″)"),   91 },
+    { NC_("RID_SVXSTRARY_SPACING_INCH", "Small (1/8″)"),         181 },
+    { NC_("RID_SVXSTRARY_SPACING_INCH", "Small Medium (1/4″)"),  363 },
+    { NC_("RID_SVXSTRARY_SPACING_INCH", "Medium (3/8″)"),        539 },
+    { NC_("RID_SVXSTRARY_SPACING_INCH", "Medium Large (1/2″)"),  720 },
+    { NC_("RID_SVXSTRARY_SPACING_INCH", "Large (3/4″)"),        1077 },
+    { NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Large (1″)"),    1440 },
     { nullptr, 0 }
 };
 
@@ -45,13 +45,13 @@ const std::pair<const char*, int> RID_SVXSTRARY_SPACING_CM[] =
 const std::pair<const char*, int> RID_SVXSTRARY_MARGINS_INCH[] =
 {
     { NC_("RID_SVXSTRARY_MARGINS_INCH", "None"),                    0 },
-    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Small (1/16\")"),   91 },
-    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Small (1/8\")"),         181 },
-    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Small Medium (1/4\")"),  363 },
-    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium (3/8\")"),        539 },
-    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium Large (1/2\")"),  720 },
-    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Large (3/4\")"),        1077 },
-    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Large (1\")"),    1440 },
+    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Small (1/16″)"),   91 },
+    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Small (1/8″)"),         181 },
+    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Small Medium (1/4″)"),  363 },
+    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium (3/8″)"),        539 },
+    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium Large (1/2″)"),  720 },
+    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Large (3/4″)"),        1077 },
+    { NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Large (1″)"),    1440 },
     { nullptr, 0 }
 };
 
diff --git a/sw/inc/pageformatpanel.hrc b/sw/inc/pageformatpanel.hrc
index 048ff93a8776..9889cd93853d 100644
--- a/sw/inc/pageformatpanel.hrc
+++ b/sw/inc/pageformatpanel.hrc
@@ -21,9 +21,9 @@ const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
     NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "None"),
     NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Narrow"),
     NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Moderate"),
-    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (0.75\")"),
-    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1\")"),
-    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1.25\")"),
+    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (0.75″)"),
+    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1″)"),
+    NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1.25″)"),
     NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Wide"),
     NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Mirrored")
 };


More information about the Libreoffice-commits mailing list