You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2017/08/11 13:21:40 UTC
svn commit: r1804788 - in /openoffice/branches/AOO414: ./ main/
main/solenv/bin/modules/installer/download.pm
Author: jim
Date: Fri Aug 11 13:21:39 2017
New Revision: 1804788
URL: http://svn.apache.org/viewvc?rev=1804788&view=rev
Log:
Merge r1804182 from trunk:
Added more statements for nsis languages, reordered
Submitted by: mseidel
Reviewed by: r1803862
Modified:
openoffice/branches/AOO414/ (props changed)
openoffice/branches/AOO414/main/ (props changed)
openoffice/branches/AOO414/main/solenv/bin/modules/installer/download.pm
Propchange: openoffice/branches/AOO414/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 11 13:21:39 2017
@@ -2,5 +2,5 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1707659,1723875,1729921,1730154,175
5873,1760461,1761439,1763017,1763019,1765170,1766467,1766530,1766915,1780015,1784925,1784961,1785175,1793216,1797494,1800077,1800568,1802428,1803787,1803939
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1707659,1723875,1729921,1730154,175
5873,1760461,1761439,1763017,1763019,1765170,1766467,1766530,1766915,1780015,1784925,1784961,1785175,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182
/openoffice/trunk/main:1705369
Propchange: openoffice/branches/AOO414/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 11 13:21:39 2017
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main:1417739-1541842
/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,169780
7,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1755873,1760461,1761439,1763017,1763019,1765170,1766467,1766915,1780015,1784925,1784961,1785175,1793216,1797494,1800077,1800568,1802428,1803787,1803939
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,169780
7,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1755873,1760461,1761439,1763017,1763019,1765170,1766467,1766915,1780015,1784925,1784961,1785175,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182
Modified: openoffice/branches/AOO414/main/solenv/bin/modules/installer/download.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO414/main/solenv/bin/modules/installer/download.pm?rev=1804788&r1=1804787&r2=1804788&view=diff
==============================================================================
--- openoffice/branches/AOO414/main/solenv/bin/modules/installer/download.pm (original)
+++ openoffice/branches/AOO414/main/solenv/bin/modules/installer/download.pm Fri Aug 11 13:21:39 2017
@@ -1182,53 +1182,62 @@ sub nsis_language_converter
# are needed in the NSIS environment.
# Directory: <NSIS-Dir>/Contrib/Language files
if ( $language eq "en-US" ) { $nsislanguage = "English"; }
+ elsif ( $language eq "af" ) { $nsislanguage = "Afrikaans"; }
elsif ( $language eq "sq" ) { $nsislanguage = "Albanian"; }
elsif ( $language eq "ar" ) { $nsislanguage = "Arabic"; }
+ elsif ( $language eq "hy" ) { $nsislanguage = "Armenian"; }
+ elsif ( $language eq "ast" ) { $nsislanguage = "Asturian"; }
+ elsif ( $language eq "eu" ) { $nsislanguage = "Basque"; }
elsif ( $language eq "bg" ) { $nsislanguage = "Bulgarian"; }
elsif ( $language eq "ca" ) { $nsislanguage = "Catalan"; }
elsif ( $language eq "hr" ) { $nsislanguage = "Croatian"; }
elsif ( $language eq "cs" ) { $nsislanguage = "Czech"; }
elsif ( $language eq "da" ) { $nsislanguage = "Danish"; }
elsif ( $language eq "nl" ) { $nsislanguage = "Dutch"; }
- elsif ( $language eq "de" ) { $nsislanguage = "German"; }
- elsif ( $language eq "de-LU" ) { $nsislanguage = "Luxembourgish"; }
+ elsif ( $language eq "en-GB" ) { $nsislanguage = "English"; }
elsif ( $language eq "et" ) { $nsislanguage = "Estonian"; }
elsif ( $language eq "fa" ) { $nsislanguage = "Farsi"; }
- elsif ( $language eq "el" ) { $nsislanguage = "Greek"; }
elsif ( $language eq "fi" ) { $nsislanguage = "Finnish"; }
elsif ( $language eq "fr" ) { $nsislanguage = "French"; }
- elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; }
+ elsif ( $language eq "gl" ) { $nsislanguage = "Galician"; }
+ elsif ( $language eq "de" ) { $nsislanguage = "German"; }
+ elsif ( $language eq "el" ) { $nsislanguage = "Greek"; }
elsif ( $language eq "he" ) { $nsislanguage = "Hebrew"; }
+ elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; }
elsif ( $language eq "is" ) { $nsislanguage = "Icelandic"; }
elsif ( $language eq "id" ) { $nsislanguage = "Indonesian"; }
elsif ( $language eq "it" ) { $nsislanguage = "Italian"; }
+ elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
+ elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
elsif ( $language eq "lv" ) { $nsislanguage = "Latvian"; }
elsif ( $language eq "lt" ) { $nsislanguage = "Lithuanian"; }
+ elsif ( $language eq "de-LU" ) { $nsislanguage = "Luxembourgish"; }
elsif ( $language eq "mk" ) { $nsislanguage = "Macedonian"; }
elsif ( $language eq "mn" ) { $nsislanguage = "Mongolian"; }
elsif ( $language eq "nb" ) { $nsislanguage = "Norwegian"; }
elsif ( $language eq "no" ) { $nsislanguage = "Norwegian"; }
elsif ( $language eq "no-NO" ) { $nsislanguage = "Norwegian"; }
- elsif ( $language eq "es" ) { $nsislanguage = "Spanish"; }
- elsif ( $language eq "sl" ) { $nsislanguage = "Slovenian"; }
- elsif ( $language eq "sv" ) { $nsislanguage = "Swedish"; }
- elsif ( $language eq "sk" ) { $nsislanguage = "Slovak"; }
+ elsif ( $language eq "nn" ) { $nsislanguage = "NorwegianNynorsk"; }
elsif ( $language eq "pl" ) { $nsislanguage = "Polish"; }
- elsif ( $language eq "pt-BR" ) { $nsislanguage = "PortugueseBR"; }
elsif ( $language eq "pt" ) { $nsislanguage = "Portuguese"; }
+ elsif ( $language eq "pt-BR" ) { $nsislanguage = "PortugueseBR"; }
elsif ( $language eq "ro" ) { $nsislanguage = "Romanian"; }
elsif ( $language eq "ru" ) { $nsislanguage = "Russian"; }
- elsif ( $language eq "sh" ) { $nsislanguage = "SerbianLatin"; }
+ elsif ( $language eq "gd" ) { $nsislanguage = "ScotsGaelic"; }
elsif ( $language eq "sr" ) { $nsislanguage = "Serbian"; }
elsif ( $language eq "sr-SP" ) { $nsislanguage = "Serbian"; }
- elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; }
- elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
- elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
- elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
- elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
- elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
+ elsif ( $language eq "sh" ) { $nsislanguage = "SerbianLatin"; }
elsif ( $language eq "zh-CN" ) { $nsislanguage = "SimpChinese"; }
+ elsif ( $language eq "sl" ) { $nsislanguage = "Slovenian"; }
+ elsif ( $language eq "sk" ) { $nsislanguage = "Slovak"; }
+ elsif ( $language eq "es" ) { $nsislanguage = "Spanish"; }
+ elsif ( $language eq "sv" ) { $nsislanguage = "Swedish"; }
+ elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
elsif ( $language eq "zh-TW" ) { $nsislanguage = "TradChinese"; }
+ elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
+ elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; }
+ elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
+ elsif ( $language eq "cy" ) { $nsislanguage = "Welsh"; }
else
{
$installer::logger::Lang->printf("NSIS language_converter : Could not find nsis language for %s!\n", $language);