[Libreoffice-commits] core.git: i18npool/source sw/uiconfig

[Seth Chaiklin (via logerrit)]

 i18npool/source/localedata/data/en_US.xml |    4 ++--
 sw/uiconfig/swriter/ui/tocindexpage.ui    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 64d0e5cfb8e9b05b5de02121b948c15b94310204
Author:     Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Wed Jan 1 20:07:57 2020 +0100
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Wed Jan 8 09:17:28 2020 +0100

    tdf#94411 use f. and ff. in alphabetical index
    
    Corrects en_US for index
    At present en_GB index is defined as en_US,
    and all other (en_*) are defined as en_US or en_GB
    
    Change-Id: Ib4c3e189c1d9a08c8f4eb17a1da526fbf23291d4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86080
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>

diff --git a/i18npool/source/localedata/data/en_US.xml b/i18npool/source/localedata/data/en_US.xml
index c765bc5a63cc..f10f4e66dfb7 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -255,8 +255,8 @@
     <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z</IndexKey>
     <UnicodeScript>0</UnicodeScript>
     <UnicodeScript>1</UnicodeScript>
-    <FollowPageWord>p.</FollowPageWord>
-    <FollowPageWord>pp.</FollowPageWord>
+    <FollowPageWord>f.</FollowPageWord>
+    <FollowPageWord>ff.</FollowPageWord>
   </LC_INDEX>
   <LC_CALENDAR>
     <Calendar unoid="gregorian" default="true">
diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui b/sw/uiconfig/swriter/ui/tocindexpage.ui
index 334a39a9c668..b5a9979d3fc4 100644
--- a/sw/uiconfig/swriter/ui/tocindexpage.ui
+++ b/sw/uiconfig/swriter/ui/tocindexpage.ui
@@ -875,7 +875,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="useff">
-                            <property name="label" translatable="yes" context="tocindexpage|useff">Combine identical entries with p or _pp</property>
+                            <property name="label" translatable="yes" context="tocindexpage|useff">Combine identical entries with f. or _ff.</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>