officecfg/registry/data/org/openoffice/VCL.xcu | 40 ++++++------------------- 1 file changed, 10 insertions(+), 30 deletions(-)
New commits: commit 08fd53e77ac1c7d2b6fe09bcf1a7af866c5c4610 Author: Andras Timar <ati...@suse.com> Date: Tue Jan 24 19:01:44 2012 +0100 remove bn-IN node, we have bn (cherry picked from commit 9b55eeba78d4e6418750a12c3dad4b42e2dd3f03) Signed-off-by: Caolán McNamara <caol...@redhat.com> Signed-off-by: Andras Timar <ati...@suse.com> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 3f26f43..32ffec3 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -856,26 +856,6 @@ <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="bn-IN" oor:op="replace"> - <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> - <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> - </prop> - <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string"> - <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value> - </prop> - <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string"> - <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value> - </prop> - <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string"> - <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value> - </prop> - <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string"> - <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value> - </prop> - <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string"> - <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value> - </prop> - </node> <node oor:name="hi" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> commit c32b0147e04e31983af694926a4630ff557dd117 Author: Fridrich Štrba <fridrich.st...@bluewin.ch> Date: Tue Jan 24 16:22:15 2012 +0100 Fix build: dupplicate node/prop /VCL/DefaultFonts/bn (cherry picked from commit 86bf32c487852f4e466b27320e3724266cb53dba) Signed-off-by: Caolán McNamara <caol...@redhat.com> Signed-off-by: Andras Timar <ati...@suse.com> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 8b779cc..3f26f43 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -856,7 +856,7 @@ <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="bn" oor:op="replace"> + <node oor:name="bn-IN" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> </prop> commit 3fab2eda05007f73a901c6571f5451399121e1df Author: Andras Timar <ati...@suse.com> Date: Tue Jan 24 14:56:35 2012 +0100 country code 'IN' is not in use for these locales fdo#44208, fdo#45107 (cherry picked from commit 82e0266b05dd53d0ce8b12bd5c76ae25872b87a9) Signed-off-by: Caolán McNamara <caol...@redhat.com> Signed-off-by: Andras Timar <ati...@suse.com> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 9a14e02..8b779cc 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -836,7 +836,7 @@ <value>Lohit Nepali;Kalimati;Samanata;Sans</value> </prop> </node> - <node oor:name="as-IN" oor:op="replace"> + <node oor:name="as" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> </prop> @@ -856,7 +856,7 @@ <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="bn-IN" oor:op="replace"> + <node oor:name="bn" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> </prop> @@ -876,7 +876,7 @@ <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="hi-IN" oor:op="replace"> + <node oor:name="hi" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> </prop> @@ -896,7 +896,7 @@ <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="gu-IN" oor:op="replace"> + <node oor:name="gu" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> </prop> @@ -916,7 +916,7 @@ <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="kn-IN" oor:op="replace"> + <node oor:name="kn" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> </prop> @@ -936,7 +936,7 @@ <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="mai-IN" oor:op="replace"> + <node oor:name="mai" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> </prop> @@ -956,7 +956,7 @@ <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="ml-IN" oor:op="replace"> + <node oor:name="ml" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>AnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> </prop> @@ -976,7 +976,7 @@ <value>AnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="mr-IN" oor:op="replace"> + <node oor:name="mr" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> </prop> @@ -996,7 +996,7 @@ <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="or-IN" oor:op="replace"> + <node oor:name="or" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> </prop> @@ -1036,7 +1036,7 @@ <value>Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="ta-IN" oor:op="replace"> + <node oor:name="ta" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>Lohit Tamil;Latha;Sans Serif</value> </prop> @@ -1056,7 +1056,7 @@ <value>Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS</value> </prop> </node> - <node oor:name="te-IN" oor:op="replace"> + <node oor:name="te" oor:op="replace"> <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value> </prop>
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits