[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - i18npool/source

Fri, 19 Jul 2013 03:32:15 -0700 

 i18npool/source/localedata/data/hr_HR.xml |  185 ++++++++++++++++--------------
 1 file changed, 101 insertions(+), 84 deletions(-)

New commits:
commit faf6e4c29463c28fd8c14f72542126139e0c9fbf
Author: Eike Rathke <er...@redhat.com>
Date:   Mon Jul 1 19:02:32 2013 +0200

    changed Croatian [hr-HR] locale data, fdo#66376
    
    Cherry-picked and squashed:
    
    sorted by formatindex for better comparability
    
    (cherry picked from commit cb44db2fe78b43424491d25f0c9e34f16aba5c24)
    
    changed Croatian [hr-HR] locale data, fdo#66376
    
    Date format codes, Collator and IndexKey data.
    
    (cherry picked from commit 38fc4d86d96c8d4c9b79299f83fd005ac3bef85c)
    
    small cleanup in [hr-HR] locale data, fdo#66376
    
    * moved new FormatElement to the end of the list
    * changed date formats 24 and 52 to use NBSP
    
    (cherry picked from commit 2cce78137bbf9810421b9fdedd45127b019b1188)
    
    Change-Id: I38f238878141b9ce7d479e66340ef3e78dc83843
    a48170c59c733f5540fc42fc7ae43df70918a0cf
    64268d29860d9c65ba27873131f00a75c19f105b
    Reviewed-on: https://gerrit.libreoffice.org/4977
    Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
    Tested-by: Fridrich Strba <fridr...@documentfoundation.org>

diff --git a/i18npool/source/localedata/data/hr_HR.xml 
b/i18npool/source/localedata/data/hr_HR.xml
index f484830..f208a1e 100644
--- a/i18npool/source/localedata/data/hr_HR.xml
+++ b/i18npool/source/localedata/data/hr_HR.xml
@@ -17,7 +17,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.3">
   <LC_INFO>
     <Language>
       <LangID>hr</LangID>
@@ -37,7 +37,7 @@
       <Time100SecSeparator>,</Time100SecSeparator>
       <ListSeparator>;</ListSeparator>
       <LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
-      <LongDateDaySeparator>, </LongDateDaySeparator>
+      <LongDateDaySeparator>. </LongDateDaySeparator>
       <LongDateMonthSeparator> </LongDateMonthSeparator>
       <LongDateYearSeparator> </LongDateYearSeparator>
     </Separators>
@@ -49,106 +49,124 @@
     </Markers>
     <TimeAM>AM</TimeAM>
     <TimePM>PM</TimePM>
-    <MeasurementSystem>Metric</MeasurementSystem>
+    <MeasurementSystem>metric</MeasurementSystem>
   </LC_CTYPE>
   <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$kn-41A]">
     <DateAcceptancePattern>D.M</DateAcceptancePattern>
     <DateAcceptancePattern>D.M.Y.</DateAcceptancePattern>
     <DateAcceptancePattern>D/M/Y</DateAcceptancePattern>
     <DateAcceptancePattern>D/M</DateAcceptancePattern>
-    <FormatElement msgid="DateFormatskey1" default="false" type="medium" 
usage="DATE" formatindex="34">
-      <FormatCode>MM.YY</FormatCode>
+    <FormatElement msgid="FixedFormatskey1" default="true" type="medium" 
usage="FIXED_NUMBER" formatindex="0">
+      <FormatCode>General</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey2" default="false" type="medium" 
usage="DATE" formatindex="35">
-      <FormatCode>MMM.DD</FormatCode>
+    <FormatElement msgid="FixedFormatskey2" default="true" type="short" 
usage="FIXED_NUMBER" formatindex="1">
+      <FormatCode>0</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey3" default="false" type="medium" 
usage="DATE" formatindex="36">
-      <FormatCode>MMMM</FormatCode>
+    <FormatElement msgid="FixedFormatskey3" default="false" type="medium" 
usage="FIXED_NUMBER" formatindex="2">
+      <FormatCode>0,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey4" default="false" type="medium" 
usage="DATE" formatindex="37">
-      <FormatCode>QQ YY</FormatCode>
+    <FormatElement msgid="FixedFormatskey4" default="false" type="short" 
usage="FIXED_NUMBER" formatindex="3">
+      <FormatCode>#.##0</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey5" default="false" type="medium" 
usage="DATE" formatindex="21">
-      <FormatCode>DD.MM.YYYY</FormatCode>
+    <FormatElement msgid="FixedFormatskey5" default="false" type="medium" 
usage="FIXED_NUMBER" formatindex="4">
+      <FormatCode>#.##0,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey6" default="true" type="medium" 
usage="DATE" formatindex="20">
-      <FormatCode>DD.MM.YY</FormatCode>
+    <FormatElement msgid="FixedFormatskey6" default="false" type="medium" 
usage="FIXED_NUMBER" formatindex="5">
+      <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey7" default="false" type="medium" 
usage="DATE" formatindex="32">
-      <FormatCode>YY-MM-DD</FormatCode>
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" 
usage="SCIENTIFIC_NUMBER" formatindex="6">
+      <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey8" default="false" type="medium" 
usage="DATE" formatindex="33">
-      <FormatCode>YYYY-MM-DD</FormatCode>
-      <DefaultName>ISO 8601</DefaultName>
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" 
usage="SCIENTIFIC_NUMBER" formatindex="7">
+      <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey9" default="false" type="medium" 
usage="DATE" formatindex="38">
-      <FormatCode>WW</FormatCode>
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" 
usage="PERCENT_NUMBER" formatindex="8">
+      <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey10" default="false" type="medium" 
usage="DATE" formatindex="27">
-      <FormatCode>NN, DD.MMM.YY</FormatCode>
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" 
usage="PERCENT_NUMBER" formatindex="9">
+      <FormatCode>0,00%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" 
usage="CURRENCY"  formatindex="12">
+      <FormatCode>#.##0 [CURRENCY];-#.##0 [CURRENCY]</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" 
usage="CURRENCY"  formatindex="13">
+      <FormatCode>#.##0,00 [CURRENCY];-#.##0,00 [CURRENCY]</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" 
usage="CURRENCY"  formatindex="14">
+      <FormatCode>#.##0 [CURRENCY];[RED]-#.##0 [CURRENCY]</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" 
usage="CURRENCY"  formatindex="15">
+      <FormatCode>#.##0,00 [CURRENCY];[RED]-#.##0,00 [CURRENCY]</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" 
usage="CURRENCY"  formatindex="16">
+      <FormatCode>#.##0,00 CCC</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" 
usage="CURRENCY"  formatindex="17">
+      <FormatCode>#.##0,-- [CURRENCY];[RED]-#.##0,-- [CURRENCY]</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey11" default="true" type="short" 
usage="DATE" formatindex="18">
       <FormatCode>D.MM.YY</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey12" default="false" type="short" 
usage="DATE" formatindex="31">
-      <FormatCode>MM.DD</FormatCode>
-    </FormatElement>
     <FormatElement msgid="DateFormatskey14" default="true" type="long" 
usage="DATE" formatindex="19">
-      <FormatCode>NNNNDD, MMMM YYYY</FormatCode>
+      <FormatCode>NNNNDD. MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey6" default="true" type="medium" 
usage="DATE" formatindex="20">
+      <FormatCode>DD.MM.YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey5" default="false" type="medium" 
usage="DATE" formatindex="21">
+      <FormatCode>DD.MM.YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey15" default="false" type="long" 
usage="DATE" formatindex="22">
-      <FormatCode>D, MMM YY</FormatCode>
+      <FormatCode>D. MMM YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey16" default="false" type="long" 
usage="DATE" formatindex="23">
-      <FormatCode>D, MMM YYYY</FormatCode>
+      <FormatCode>D. MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey21" default="false" type="medium" 
usage="DATE" formatindex="24">
+      <FormatCode>D. M. YYYY.</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey17" default="false" type="long" 
usage="DATE" formatindex="25">
-      <FormatCode>D, MMMM YYYY</FormatCode>
+      <FormatCode>D. MMMM YYYY.</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey22" default="false" type="long" 
usage="DATE" formatindex="26">
+      <FormatCode>D. MMMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey10" default="false" type="medium" 
usage="DATE" formatindex="27">
+      <FormatCode>NN, DD.MMM.YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey18" default="false" type="long" 
usage="DATE" formatindex="28">
-      <FormatCode>NN, D, MMM YY</FormatCode>
+      <FormatCode>NN, D. MMM YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey19" default="false" type="long" 
usage="DATE" formatindex="29">
-      <FormatCode>NN, D, MMMM YYYY</FormatCode>
+      <FormatCode>NN, D. MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey20" default="false" type="long" 
usage="DATE" formatindex="30">
-      <FormatCode>NNNND, MMMM YYYY</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="DateFormatskey21" default="false" type="long" 
usage="DATE" formatindex="24">
-      <FormatCode>D, MMM YYYY</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="DateFormatskey22" default="false" type="long" 
usage="DATE" formatindex="26">
-      <FormatCode>D, MMMM YY</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey1" default="true" type="medium" 
usage="FIXED_NUMBER" formatindex="0">
-      <FormatCode>General</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey2" default="true" type="short" 
usage="FIXED_NUMBER" formatindex="1">
-      <FormatCode>0</FormatCode>
+      <FormatCode>NNNND. MMMM YYYY</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey3" default="false" type="medium" 
usage="FIXED_NUMBER" formatindex="2">
-      <FormatCode>0,00</FormatCode>
+    <FormatElement msgid="DateFormatskey12" default="false" type="short" 
usage="DATE" formatindex="31">
+      <FormatCode>MM.DD</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey4" default="false" type="short" 
usage="FIXED_NUMBER" formatindex="3">
-      <FormatCode>#.##0</FormatCode>
+    <FormatElement msgid="DateFormatskey7" default="false" type="medium" 
usage="DATE" formatindex="32">
+      <FormatCode>YY-MM-DD</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey5" default="false" type="medium" 
usage="FIXED_NUMBER" formatindex="4">
-      <FormatCode>#.##0,00</FormatCode>
+    <FormatElement msgid="DateFormatskey8" default="false" type="medium" 
usage="DATE" formatindex="33">
+      <FormatCode>YYYY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey6" default="false" type="medium" 
usage="FIXED_NUMBER" formatindex="5">
-      <FormatCode>#.###,00</FormatCode>
+    <FormatElement msgid="DateFormatskey1" default="false" type="medium" 
usage="DATE" formatindex="34">
+      <FormatCode>MM.YY</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" 
usage="SCIENTIFIC_NUMBER" formatindex="6">
-      <FormatCode>0,00E+00</FormatCode>
+    <FormatElement msgid="DateFormatskey2" default="false" type="medium" 
usage="DATE" formatindex="35">
+      <FormatCode>MMM.DD</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" 
usage="SCIENTIFIC_NUMBER" formatindex="7">
-      <FormatCode>0,00E+000</FormatCode>
+    <FormatElement msgid="DateFormatskey3" default="false" type="medium" 
usage="DATE" formatindex="36">
+      <FormatCode>MMMM</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" 
usage="PERCENT_NUMBER" formatindex="8">
-      <FormatCode>0%</FormatCode>
+    <FormatElement msgid="DateFormatskey4" default="false" type="medium" 
usage="DATE" formatindex="37">
+      <FormatCode>QQ YY</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" 
usage="PERCENT_NUMBER" formatindex="9">
-      <FormatCode>0,00%</FormatCode>
+    <FormatElement msgid="DateFormatskey9" default="false" type="medium" 
usage="DATE" formatindex="38">
+      <FormatCode>WW</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey1" default="false" type="short" 
usage="TIME" formatindex="39">
       <FormatCode>HH:MM</FormatCode>
@@ -177,37 +195,36 @@
     <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" 
usage="DATE_TIME" formatindex="47">
       <FormatCode>DD.MM.YYYY HH:MM:SS AM/PM</FormatCode>
     </FormatElement>
-    <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" 
usage="CURRENCY"  formatindex="12">
-      <FormatCode>#.##0 [CURRENCY];-#.##0 [CURRENCY]</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" 
usage="CURRENCY"  formatindex="13">
-      <FormatCode>#.##0,00 [CURRENCY];-#.##0,00 [CURRENCY]</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" 
usage="CURRENCY"  formatindex="14">
-      <FormatCode>#.##0 [CURRENCY];[RED]-#.##0 [CURRENCY]</FormatCode>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="medium" 
usage="FIXED_NUMBER" formatindex="50">
+      <FormatCode>#.##0,00;[RED]-#.##0,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" 
usage="CURRENCY"  formatindex="15">
-      <FormatCode>#.##0,00 [CURRENCY];[RED]-#.##0,00 [CURRENCY]</FormatCode>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" 
usage="FIXED_NUMBER" formatindex="51">
+      <FormatCode>#.###,00;[RED]-#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" 
usage="CURRENCY"  formatindex="16">
-      <FormatCode>#.##0,00 CCC</FormatCode>
+    <FormatElement msgid="DateFormatskey24" default="false" type="medium" 
usage="DATE" formatindex="52">
+      <FormatCode>DD. MM. YYYY.</FormatCode>
     </FormatElement>
-    <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" 
usage="CURRENCY"  formatindex="17">
-      <FormatCode>#.##0,-- [CURRENCY];[RED]-#.##0,-- [CURRENCY]</FormatCode>
+    <FormatElement msgid="DateFormatskey25" default="false" type="short" 
usage="DATE" formatindex="53">
+      <FormatCode>MM/YY</FormatCode>
     </FormatElement>
   </LC_FORMAT>
-  <LC_COLLATION ref="sh_RS"/>
+  <LC_COLLATION>
+    <Collator default="true" 
unoid="alphanumeric">&amp;C&lt;č&lt;&lt;&lt;Č&lt;ć&lt;&lt;&lt;Ć&amp;D&lt;dž&lt;&lt;&lt;Dž&lt;&lt;&lt;DŽ&amp;DŽ&lt;đ&lt;&lt;&lt;Đ&amp;L&lt;lj&lt;&lt;&lt;Lj&lt;&lt;&lt;LJ&amp;N&lt;nj&lt;&lt;&lt;Nj&lt;&lt;&lt;NJ&amp;S&lt;Å¡&lt;&lt;&lt;Å
 &amp;Z&lt;ž&lt;&lt;&lt;Ž</Collator>
+    <CollationOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </CollationOptions>
+  </LC_COLLATION>
   <LC_SEARCH>
     <SearchOptions>
       <TransliterationModules>IGNORE_CASE</TransliterationModules>
     </SearchOptions>
   </LC_SEARCH>
   <LC_INDEX>
-    <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z Č Ć Š
 Đ Ž</IndexKey>
+    <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-C Č Ć D 
{DŽ} Đ E-L {LJ} M N {NJ} O P R S Š T-V Z Ž</IndexKey>
     <UnicodeScript>0</UnicodeScript>
     <UnicodeScript>1</UnicodeScript>
-    <FollowPageWord>p.</FollowPageWord>
-    <FollowPageWord>pp.</FollowPageWord>
+    <FollowPageWord>str.</FollowPageWord>
+    <FollowPageWord>str.</FollowPageWord>
   </LC_INDEX>
   <LC_CALENDAR>
     <Calendar unoid="gregorian" default="true">
@@ -375,13 +392,13 @@
       <Eras>
         <Era>
           <EraID>bc</EraID>
-          <DefaultAbbrvName>pr</DefaultAbbrvName>
-          <DefaultFullName>prije krista</DefaultFullName>
+          <DefaultAbbrvName>pr. Kr.</DefaultAbbrvName>
+          <DefaultFullName>prije Krista</DefaultFullName>
         </Era>
         <Era>
           <EraID>ad</EraID>
-          <DefaultAbbrvName>Kr</DefaultAbbrvName>
-          <DefaultFullName>poslije krista</DefaultFullName>
+          <DefaultAbbrvName>po. Kr.</DefaultAbbrvName>
+          <DefaultFullName>poslije Krista</DefaultFullName>
         </Era>
       </Eras>
       <StartDayOfWeek>

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to