svn commit: r1789485 [1/2] - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/deploy/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/ha/tcp/ java/org/apache/catal...

Thu, 30 Mar 2017 03:00:43 -0700 

Author: markt
Date: Thu Mar 30 10:00:13 2017
New Revision: 1789485

URL: http://svn.apache.org/viewvc?rev=1789485&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60932
Correctly escape single quotes when used in i18n messages.
Based on a patch by Michael Osipov.

Modified:
    tomcat/tc8.0.x/trunk/   (props changed)
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
    tomcat/tc8.0.x/trunk/java/org/apache/el/Messages.properties
    tomcat/tc8.0.x/trunk/java/org/apache/el/Messages_es.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
    tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 30 10:00:13 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,170
 
2923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,1703160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1710933,1710945,1711006,
 
1711016,1711022,1711026,1712163,1712225,1712228,1712233,1712250,1712254,1712489,1712547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,1712859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285,1713362,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715413,1715415,1715434,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,1715661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,1716894,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,1718523,1718794,1718796,1718834,1718836-1718838,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,1719446,1719488,1719909-17199
 
10,1720200,1720234,1720394,1720439,1720445,1720448,1720462,1720506,1720652,1720654-1720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,1722205,1722292,1722399,1722453,1722455,1722522,1722526,1722532,1722548,1722574,1722583,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,1722923,1722939,1722945,1722996,1723068,1723127,1723155,1723250,1723316-1723318,1723368,1723371,1723375,1723377,1723380,1723410,1723414,1723437,1723484,1723486,1723493-1723494,1723500,1723552,1723554,1723683,1723707,1723736,1724012,1724232,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-1725697,1725816,1725851,1725906-1725907,1725910,1725914,1725920,17
 
25926,1726177,1726202,1726628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-1733448,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-1734454,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,1736280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903,1737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740509,1740520,1740535,1740707
 
,1740803,1740810,1740980,1740991,1741015,1741147,1741173,1741181,1741190,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742919,1742975,1742984,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744760,1745227,1745337,1746306,1746427,1746473,1746620,1746649,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,1749328,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,1752737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755214,1755224,1755230,1755646-1755
 
647,1755650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013,1756019,1756039,1756408,1756410,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757495,1757499,1757527,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758486-1758487,1758499,1758556,1758582,1758584,1758588,1758842,1759019,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761491,1761498,1761500-1761501,1761550,1761625-1761626,1761628,1761682,1761740,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762541,1762608,1762710,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276,1763319,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763512,1763574,1763634-1763635,1763718,1
 
763786,1763798-1763799,1763810,1764083,1764659,1764682,1764897,1765299,1765358,1765439,1765571,1766276,1766514,1766822,1766834,1766840,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1768651,1768762,1768922,1769263,1770140,1770180,1770258,1770656,1770666,1770718,1770762,1771087,1771139,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771963,1772174,1772223,1772229,1772554,1772849,1772947,1773418,1773756,1773813-1773814,1774052,1774131,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1775596,1776540,1776937,1777011,1777173,1777211,1777261,1777524,1777605,1777647,1778061,1778138-1778139,1778141-1778150,1778154,1779654,1779718,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1781569,1781986,1782814,1782857,1782868,1782946,1783144,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784751,1784963,1785271,1785667,1785762,1785774,1785823,1786070,1786123-1786124,1786127,178612
 
9,1786341,1786378,1786844,1787250,1788241-1788242,1788248,1788323-1788324,1788328,1788741,1788747,1788764,1789051,1789400
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,170
 
2923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,1703160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1710933,1710945,1711006,
 
1711016,1711022,1711026,1712163,1712225,1712228,1712233,1712250,1712254,1712489,1712547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,1712859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285,1713362,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715413,1715415,1715434,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,1715661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,1716894,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,1718523,1718794,1718796,1718834,1718836-1718838,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,1719446,1719488,1719909-17199
 
10,1720200,1720234,1720394,1720439,1720445,1720448,1720462,1720506,1720652,1720654-1720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,1722205,1722292,1722399,1722453,1722455,1722522,1722526,1722532,1722548,1722574,1722583,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,1722923,1722939,1722945,1722996,1723068,1723127,1723155,1723250,1723316-1723318,1723368,1723371,1723375,1723377,1723380,1723410,1723414,1723437,1723484,1723486,1723493-1723494,1723500,1723552,1723554,1723683,1723707,1723736,1724012,1724232,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-1725697,1725816,1725851,1725906-1725907,1725910,1725914,1725920,17
 
25926,1726177,1726202,1726628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-1733448,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-1734454,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,1736280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903,1737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740509,1740520,1740535,1740707
 
,1740803,1740810,1740980,1740991,1741015,1741147,1741173,1741181,1741190,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742919,1742975,1742984,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744760,1745227,1745337,1746306,1746427,1746473,1746620,1746649,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,1749328,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,1752737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755214,1755224,1755230,1755646-1755
 
647,1755650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013,1756019,1756039,1756408,1756410,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757495,1757499,1757527,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758486-1758487,1758499,1758556,1758582,1758584,1758588,1758842,1759019,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761491,1761498,1761500-1761501,1761550,1761625-1761626,1761628,1761682,1761740,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762541,1762608,1762710,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276,1763319,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763512,1763574,1763634-1763635,1763718,1
 
763786,1763798-1763799,1763810,1764083,1764659,1764682,1764897,1765299,1765358,1765439,1765571,1766276,1766514,1766822,1766834,1766840,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1768651,1768762,1768922,1769263,1770140,1770180,1770258,1770656,1770666,1770718,1770762,1771087,1771139,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771963,1772174,1772223,1772229,1772554,1772849,1772947,1773418,1773756,1773813-1773814,1774052,1774131,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1775596,1776540,1776937,1777011,1777173,1777211,1777261,1777524,1777605,1777647,1778061,1778138-1778139,1778141-1778150,1778154,1779654,1779718,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1781569,1781986,1782814,1782857,1782868,1782946,1783144,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784751,1784963,1785271,1785667,1785762,1785774,1785823,1786070,1786123-1786124,1786127,178612
 
9,1786341,1786378,1786844,1787250,1788241-1788242,1788248,1788323-1788324,1788328,1788741,1788747,1788764,1789051,1789400,1789415,1789442

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
Thu Mar 30 10:00:13 2017
@@ -18,7 +18,7 @@ cometEvent.nullRequest=The event object
 coyoteAdapter.accesslogFail=Exception while attempting to add an entry to the 
access log
 coyoteAdapter.asyncDispatch=Exception while processing an asynchronous request
 coyoteAdapter.authenticate=Authenticated user [{0}] provided by connector
-coyoteAdapter.authorize=Authorizing user [{0}] using Tomcat's Realm
+coyoteAdapter.authorize=Authorizing user [{0}] using Tomcat''s Realm
 coyoteAdapter.checkRecycled.request=Encountered a non-recycled request and 
recycled it forcedly.
 coyoteAdapter.checkRecycled.response=Encountered a non-recycled response and 
recycled it forcedly.
 coyoteAdapter.debug=The variable [{0}] has value [{1}]

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties 
Thu Mar 30 10:00:13 2017
@@ -51,7 +51,7 @@ applicationFilterConfig.release=Failed t
 applicationFilterRegistration.nullInitParam=Unable to set initialisation 
parameter for filter due to null name and/or value. Name [{0}], Value [{1}]
 applicationFilterRegistration.nullInitParams=Unable to set initialisation 
parameters for filter due to null name and/or value. Name [{0}], Value [{1}]
 applicationServletRegistration.setServletSecurity.iae=Null constraint 
specified for servlet [{0}] deployed to context with name [{1}]
-applicationServletRegistration.setServletSecurity.ise=Security constraints 
can't be added to servlet [{0}] deployed to context with name [{1}] as the 
context has already been initialised
+applicationServletRegistration.setServletSecurity.ise=Security constraints 
can''t be added to servlet [{0}] deployed to context with name [{1}] as the 
context has already been initialised
 applicationSessionCookieConfig.ise=Property {0} can not be added to 
SessionCookieConfig for context {1} as the context has been initialised
 aprListener.aprInit=The APR based Apache Tomcat Native library which allows 
optimal performance in production environments was not found on the 
java.library.path: {0}
 aprListener.aprInitDebug=The APR based Apache Tomcat Native library could not 
be found using names [{0}] on the java.library.path [{1}]. The errors reported 
were [{2}]
@@ -129,9 +129,9 @@ standardContext.listenerFail=One or more
 standardContext.listenerStart=Exception sending context initialized event to 
listener instance of class {0}
 standardContext.listenerStop=Exception sending context destroyed event to 
listener instance of class {0}
 standardContext.loadOnStartup.loadException=Servlet [{1}] in web application 
[{0}] threw load() exception
-standardContext.loginConfig.errorPage=Form error page {0} must start with a 
''/'
+standardContext.loginConfig.errorPage=Form error page {0} must start with a 
''/''
 standardContext.loginConfig.errorWarning=WARNING: Form error page {0} must 
start with a ''/'' in Servlet 2.4
-standardContext.loginConfig.loginPage=Form login page {0} must start with a 
''/'
+standardContext.loginConfig.loginPage=Form login page {0} must start with a 
''/''
 standardContext.loginConfig.loginWarning=WARNING: Form login page {0} must 
start with a ''/'' in Servlet 2.4
 standardContext.loginConfig.required=LoginConfig cannot be null
 standardContext.manager=Configured a manager of class [{0}]
@@ -176,7 +176,7 @@ standardEngine.notHost=Child of an Engin
 standardEngine.notParent=Engine cannot have a parent Container
 standardHost.asyncStateError=An asynchronous request was received for 
processing that was neither an async dispatch nor an error to process
 standardHost.clientAbort=Remote Client Aborted Request, IOException: {0}
-standardHost.invalidErrorReportValveClass=Couldn't load specified error report 
valve class: {0}
+standardHost.invalidErrorReportValveClass=Couldn''t load specified error 
report valve class: {0}
 standardHost.noContext=No Context configured to process this request
 standardHost.notContext=Child of a Host must be a Context
 standardHost.nullName=Host name is required

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
Thu Mar 30 10:00:13 2017
@@ -88,9 +88,9 @@ standardContext.requestListener.requestI
 standardContext.isUnavailable = Esta aplicaci\u00F3n no est\u00E1 disponible 
en este momento
 standardContext.listenerStart = Excepci\u00F3n enviando evento inicializado de 
contexto a instancia de escuchador de clase {0}
 standardContext.listenerStop = Excepci\u00F3n enviando evento de contexto 
destru\u00EDdo a instancia de escuchador de clase {0}
-standardContext.loginConfig.errorPage = La P\u00E1gina de error de Formulario 
{0} debe de comenzar con ''/'
+standardContext.loginConfig.errorPage = La P\u00E1gina de error de Formulario 
{0} debe de comenzar con ''/''
 standardContext.loginConfig.errorWarning = AVISO\: La p\u00E1gina de error de 
Formulario {0} debe de comenzar con ''/'' en Servlet 2.4
-standardContext.loginConfig.loginPage = La p\u00E1gina de login de Formulario 
{0} debe de comenzar con ''/'
+standardContext.loginConfig.loginPage = La p\u00E1gina de login de Formulario 
{0} debe de comenzar con ''/''
 standardContext.loginConfig.loginWarning = AVISO\: La p\u00E1gina de login de 
Formulario {0} debe de comenzar con ''/'' en Servlet 2.4
 standardContext.loginConfig.required = LoginConfig no puede ser nula
 standardContext.manager = Configurado un gestor de la clase [{0}]

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties 
Thu Mar 30 10:00:13 2017
@@ -30,7 +30,7 @@ naming.invalidEnvEntryValue=L''entr\u00e
 naming.namingContextCreationFailed=La cr\u00e9ation du contexte de nommage 
(naming context) a \u00e9chou\u00e9 : {0}
 standardContext.applicationListener=Erreur lors de la configuration de la 
classe d''\u00e9coute de l''application (application listener) {0}
 standardContext.applicationSkipped=L''installation des \u00e9couteurs 
(listeners) de l''application a \u00e9t\u00e9 saut\u00e9e suite aux erreurs 
pr\u00e9c\u00e9dentes
-standardContext.errorPage.error=La position de la page d''erreur (ErrorPage) 
{0} doit commencer par un ''/'
+standardContext.errorPage.error=La position de la page d''erreur (ErrorPage) 
{0} doit commencer par un ''/''
 standardContext.errorPage.required=La page d''erreur (ErrorPage) ne peut 
\u00eatre nulle
 standardContext.errorPage.warning=ATTENTION: La position de la page d''erreur 
(ErrorPage) {0} doit commencer par un ''/'' dans l''API Servlet 2.4
 standardContext.filterMap.either=L''association de filtre (filter mapping) 
doit indiquer soit une <url-pattern> soit une <servlet-name>

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties 
Thu Mar 30 10:00:13 2017
@@ -20,7 +20,7 @@ farmWarDeployer.deployEnd=Deployment fro
 farmWarDeployer.fileCopyFail=Unable to copy from [{0}] to [{1}]
 farmWarDeployer.hostOnly=FarmWarDeployer can only work as host cluster 
subelement!
 farmWarDeployer.hostParentEngine=FarmWarDeployer can only work if parent of 
[{0}] is an engine!
-farmWarDeployer.mbeanNameFail=Can't construct MBean object name for engine 
[{0}] and host [{1}]
+farmWarDeployer.mbeanNameFail=Can''t construct MBean object name for engine 
[{0}] and host [{1}]
 farmWarDeployer.alreadyDeployed=webapp [{0}] are already deployed.
 farmWarDeployer.modInstall=Installing webapp [{0}] from [{1}]
 farmWarDeployer.modRemoveFail=No removal
@@ -39,7 +39,7 @@ farmWarDeployer.sendEnd=Send cluster war
 farmWarDeployer.sendFragment=Send cluster war fragment path [{0}], war [{1}] 
to [{2}]
 farmWarDeployer.sendStart=Send cluster war deployment path [{0}], war [{1}] 
started.
 farmWarDeployer.servicingDeploy=Application [{0}] is being serviced. Touch war 
file [{1}] again!
-farmWarDeployer.servicingUndeploy=Application [{0}] is being serviced and 
can't be removed from backup cluster node
+farmWarDeployer.servicingUndeploy=Application [{0}] is being serviced and 
can''t be removed from backup cluster node
 farmWarDeployer.started=Cluster FarmWarDeployer started.
 farmWarDeployer.stopped=Cluster FarmWarDeployer stopped.
 farmWarDeployer.undeployEnd=Undeployment from [{0}] finished.

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
 Thu Mar 30 10:00:13 2017
@@ -62,7 +62,7 @@ deltaRequest.ssid.null=Session Id is nul
 deltaSession.notifying=Notifying cluster of expiration primary={0} sessionId 
[{1}]
 deltaSession.readSession=readObject() loading session [{0}]
 deltaSession.writeSession=writeObject() storing session [{0}]
-jvmRoute.cannotFindSession=Can't find session [{0}]
+jvmRoute.cannotFindSession=Can''t find session [{0}]
 jvmRoute.changeSession=Changed session from [{0}] to [{1}]
 jvmRoute.failover=Detected a failover with different jvmRoute - orginal route: 
[{0}] new one: [{1}] at session id [{2}]
 jvmRoute.foundManager=Found Cluster Manager {0} at {1}
@@ -80,4 +80,4 @@ backupManager.noCluster=no cluster assoc
 backupManager.startUnable=Unable to start BackupManager: [{0}]
 backupManager.startFailed=Failed to start BackupManager: [{0}]
 backupManager.stopped=Manager [{0}] is stopping
-clusterSessionListener.noManager=Context manager doesn't exist:{0}
+clusterSessionListener.noManager=Context manager doesn''t exist:{0}

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties 
Thu Mar 30 10:00:13 2017
@@ -24,7 +24,7 @@ ReplicationValve.nocluster=No cluster co
 ReplicationValve.resetDeltaRequest=Cluster is standalone: reset Session 
Request Delta at context {0}
 ReplicationValve.send.failure=Unable to perform replication request.
 ReplicationValve.send.invalid.failure=Unable to send session [id={0}] invalid 
message over cluster.
-ReplicationValve.session.found=Context {0}: Found session {1} but it isn't a 
ClusterSession.
+ReplicationValve.session.found=Context {0}: Found session {1} but it isn''t a 
ClusterSession.
 ReplicationValve.session.indicator=Context {0}: Primarity of session {0} in 
request attribute {1} is {2}.
 ReplicationValve.session.invalid=Context {0}: Requested session {1} is 
invalid, removed or not replicated at this node.
 ReplicationValve.stats=Average request time= {0} ms for Cluster overhead 
time={1} ms for {2} requests {3} filter requests {4} send requests {5} cross 
context requests (Request={6} ms Cluster={7} ms).

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties 
Thu Mar 30 10:00:13 2017
@@ -24,8 +24,7 @@ ReplicationValve.nocluster = No cluster
 ReplicationValve.resetDeltaRequest = Cluster is standalone\: reset Session 
Request Delta at context {0}
 ReplicationValve.send.failure = Unable to perform replication request.
 ReplicationValve.send.invalid.failure = Unable to send session [id\={0}] 
invalid message over cluster.
-ReplicationValve.session.found = Context {0}\: Found session {1} but it isn't 
a ClusterSession.
+ReplicationValve.session.found = Context {0}\: Found session {1} but it isn''t 
a ClusterSession.
 ReplicationValve.session.indicator = Context {0}\: Primarity of session {0} in 
request attribute {1} is {2}.
 ReplicationValve.session.invalid = Context {0}\: Requested session {1} is 
invalid, removed or not replicated at this node.
 ReplicationValve.stats = Average request time\= {0} ms for Cluster overhead 
time\={1} ms for {2} requests {3} filter requests {4} send requests {5} cross 
context requests (Request\={6} ms Cluster\={7} ms).
-

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties 
Thu Mar 30 10:00:13 2017
@@ -29,7 +29,7 @@ jaasRealm.loginContextCreated=JAAS Login
 jaasRealm.checkPrincipal=Checking Principal "{0}" [{1}]
 jaasRealm.userPrincipalSuccess=Principal "{0}" is a valid user class. We will 
use this as the user Principal.
 jaasRealm.userPrincipalFailure=No valid user Principal found
-jaasRealm.rolePrincipalAdd=Adding role Principal "{0}" to this user 
Principal's roles
+jaasRealm.rolePrincipalAdd=Adding role Principal "{0}" to this user 
Principal''s roles
 jaasRealm.rolePrincipalFailure=No valid role Principals found.
 jaasCallback.username=Returned username "{0}"
 jdbcRealm.authenticateFailure=Username {0} NOT successfully authenticated

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
Thu Mar 30 10:00:13 2017
@@ -52,7 +52,7 @@ contextConfig.invalidSciHandlesTypes=Una
 contextConfig.jarFile=Unable to process Jar [{0}] for annotations
 contextConfig.jndiUrl=Unable to process JNDI URL [{0}] for annotations
 contextConfig.jndiUrlNotDirContextConn=The connection created for URL [{0}] 
was not a DirContextURLConnection
-contextConfig.jspFile.error=JSP file {0} must start with a ''/'
+contextConfig.jspFile.error=JSP file {0} must start with a ''/''
 contextConfig.jspFile.warning=WARNING: JSP file {0} must start with a ''/'' in 
Servlet 2.4
 contextConfig.missingRealm=No Realm has been configured to authenticate against
 contextConfig.processAnnotationsDir.debug=Scanning directory for class files 
with annotations [{0}]

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
 Thu Mar 30 10:00:13 2017
@@ -44,7 +44,7 @@ contextConfig.invalidSci = No se pudo cr
 contextConfig.invalidSciHandlesTypes = No puedo cargar la clase [{0}] para 
revisar contra la anotaci\u00F3n  @HandlesTypes de uno o m\u00E1s 
ServletContentInitializers.
 contextConfig.jndiUrl = No puedo procesar la URL JNDI [{0}] para las 
anotaciones
 contextConfig.jndiUrlNotDirContextConn = La conexi\u00F3n creada para la URL 
[{0}] no era una DirContextURLConnection
-contextConfig.jspFile.error = El archivo JSP {0} debe de comenzar con ''/'
+contextConfig.jspFile.error = El archivo JSP {0} debe de comenzar con ''/''
 contextConfig.jspFile.warning = AVISO\: El archivo JSP {0} debe de comenzar 
con ''/'' en Servlet 2.4
 contextConfig.missingRealm = Alg\u00FAn reino (realm) no ha sido configurado 
para realizar la autenticaci\u00F3n
 contextConfig.resourceJarFail = Hallado JAR fallido a los procesos en URL 
[{0}] para recursos est\u00E1ticos a ser incluidos en contexto con nombre [{0}]

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
 Thu Mar 30 10:00:13 2017
@@ -41,7 +41,7 @@ tcpFailureDetector.already.disappeared=V
 tcpFailureDetector.member.disappeared=Verification complete. Member 
disappeared[{0}]
 tcpFailureDetector.still.alive=Verification complete. Member still alive[{0}]
 tcpFailureDetector.heartbeat.failed=Unable to perform heartbeat on the 
TcpFailureDetector.
-tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we 
weren't  notified:{0}
+tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we 
weren''t notified:{0}
 tcpFailureDetector.suspectMember.dead=Suspect member, confirmed dead.[{0}]
 tcpFailureDetector.suspectMember.alive=Suspect member, confirmed alive.[{0}]
 tcpFailureDetector.failureDetection.failed=Unable to perform failure detection 
check, assuming member down.

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
 Thu Mar 30 10:00:13 2017
@@ -25,7 +25,7 @@ cache.backgroundEvictFail=The background
 cache.objectMaxSizeTooBig=The value of [{0}]kB for objectMaxSize is larger 
than the limit of maxSize/20 so has been reduced to [{1}]kB
 cache.objectMaxSizeTooBigBytes=The value specified for the maximum object size 
to cache [{0}]kB is greater than Integer.MAX_VALUE bytes which is the maximum 
size that can be cached. The limit will be set to Integer.MAX_VALUE bytes.
 
-classpathUrlStreamHandler.notFound=Unable to load the resource [{0}] using the 
thread context class loader or the current class's class loader
+classpathUrlStreamHandler.notFound=Unable to load the resource [{0}] using the 
thread context class loader or the current class''s class loader
 
 dirResourceSet.manifestFail=Failed to read manifest from [{0}]
 dirResourceSet.notDirectory=The directory specified by base and internal path 
[{0}]{1}[{2}] does not exist.

Modified: tomcat/tc8.0.x/trunk/java/org/apache/el/Messages.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/el/Messages.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/el/Messages.properties (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/el/Messages.properties Thu Mar 30 
10:00:13 2017
@@ -29,7 +29,7 @@ error.value.literal.write=ValueExpressio
 
 # ExpressionFactoryImpl
 error.null=Expression cannot be null
-error.mixed=Expression cannot contain both '#{..}' and '${..}' : {0}
+error.mixed=Expression cannot contain both '#{...}' and '${...}' : {0}
 error.method=Not a valid MethodExpression : {0}
 error.method.nullParms=Parameter types cannot be null
 error.value.expectedType=Expected type cannot be null

Modified: tomcat/tc8.0.x/trunk/java/org/apache/el/Messages_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/el/Messages_es.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/el/Messages_es.properties (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/el/Messages_es.properties Thu Mar 30 
10:00:13 2017
@@ -21,7 +21,7 @@ error.resolver.unhandled = ELResolver no
 error.resolver.unhandled.null = ELResolver no puede manejar un Objeto base 
nulo  con identificador de ''{0}''
 error.value.literal.write = ValueExpression es un literal y no un grabable\: 
{0}
 error.null = La expresi\u00F3n no puede ser nula
-error.mixed = La expresi\u00F3n no puede contenera la vez '\#{..}' y '${..}' 
\: {0}
+error.mixed = La expresi\u00F3n no puede contenera la vez ''\#{..}'' y 
''${..}'' \: {0}
 error.method = No es una MethodExpression v\u00E1lida\: {0}
 error.method.nullParms = Los tipos de par\u00E1metro no pueden ser nulo
 error.value.expectedType = El tipo esperado no puede ser nulo

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
Thu Mar 30 10:00:13 2017
@@ -26,31 +26,31 @@ jsp.message.parent_class_loader_is=Paren
 jsp.message.dont.modify.servlets=IMPORTANT: Do not modify the generated 
servlets
 jsp.error.unavailable=JSP has been marked unavailable
 jsp.error.usebean.duplicate=useBean: Duplicate bean name: {0}
-jsp.error.invalid.scope=Illegal value of \'scope\' attribute: {0} (must be one 
of \"page\", \"request\", \"session\", or \"application\")
+jsp.error.invalid.scope=Illegal value of ''scope'' attribute: {0} (must be one 
of \"page\", \"request\", \"session\", or \"application\")
 jsp.error.classname=Can't determine classname from .class file
 jsp.error.outputfolder=No output folder
 jsp.error.data.file.write=Error while writing data file
-jsp.error.page.conflict.contenttype=Page directive: illegal to have multiple 
occurrences of 'contentType' with different values (old: {0}, new: {1})
-jsp.error.page.conflict.session=Page directive: illegal to have multiple 
occurrences of 'session' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.contenttype=Page directive: illegal to have multiple 
occurrences of ''contentType'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.session=Page directive: illegal to have multiple 
occurrences of ''session'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.session=Page directive: invalid value for session
-jsp.error.page.conflict.buffer=Page directive: illegal to have multiple 
occurrences of 'buffer' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.buffer=Page directive: illegal to have multiple 
occurrences of ''buffer'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.buffer=Page directive: invalid value for buffer
-jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple 
occurrences of 'autoFlush' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple 
occurrences of ''autoFlush'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.import=Page directive: invalid value for import
-jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple 
occurrences of 'isThreadSafe' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple 
occurrences of ''isThreadSafe'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.isthreadsafe=Page directive: invalid value for 
isThreadSafe
-jsp.error.page.conflict.info=Page directive: illegal to have multiple 
occurrences of 'info' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.info=Page directive: illegal to have multiple 
occurrences of ''info'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.info=Page directive: invalid value for info
-jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple 
occurrences of 'isErrorPage' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple 
occurrences of ''isErrorPage'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.iserrorpage=Page directive: invalid value for 
isErrorPage
-jsp.error.page.conflict.errorpage=Page directive: illegal to have multiple 
occurrences of 'errorPage' with different values (old: {0}, new: {1})
-jsp.error.page.conflict.language=Page directive: illegal to have multiple 
occurrences of 'language' with different values (old: {0}, new: {1})
-jsp.error.tag.conflict.language=Tag directive: illegal to have multiple 
occurrences of 'language' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.errorpage=Page directive: illegal to have multiple 
occurrences of ''errorPage'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.language=Page directive: illegal to have multiple 
occurrences of ''language'' with different values (old: {0}, new: {1})
+jsp.error.tag.conflict.language=Tag directive: illegal to have multiple 
occurrences of ''language'' with different values (old: {0}, new: {1})
 jsp.error.page.language.nonjava=Page directive: invalid language attribute
 jsp.error.tag.language.nonjava=Tag directive: invalid language attribute
-jsp.error.page.conflict.extends=Page directive: illegal to have multiple 
occurrences of 'extends' with different values (old: {0}, new: {1})
-jsp.error.page.conflict.iselignored=Page directive: illegal to have multiple 
occurrences of 'isELIgnored' with different values (old: {0}, new: {1})
-jsp.error.tag.conflict.iselignored=Tag directive: illegal to have multiple 
occurrences of 'isELIgnored' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.extends=Page directive: illegal to have multiple 
occurrences of ''extends'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.iselignored=Page directive: illegal to have multiple 
occurrences of ''isELIgnored'' with different values (old: {0}, new: {1})
+jsp.error.tag.conflict.iselignored=Tag directive: illegal to have multiple 
occurrences of ''isELIgnored'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.iselignored=Page directive: invalid value for 
isELIgnored
 jsp.error.tag.invalid.iselignored=Tag directive: invalid value for isELIgnored
 jsp.error.page.multi.pageencoding=Page directive must not have multiple 
occurrences of pageencoding
@@ -131,7 +131,7 @@ jsp.warning.unknown.element.in.tagfile=U
 jsp.warning.unknown.element.in.attribute=Unknown element ({0}) in attribute
 jsp.warning.unknown.element.in.variable=Unknown element ({0}) in variable
 jsp.warning.unknown.element.in.validator=Unknown element ({0}) in validator
-jsp.warning.unknown.element.in.initParam=Unknown element ({0}) in validator's 
init-param
+jsp.warning.unknown.element.in.initParam=Unknown element ({0}) in validator''s 
init-param
 jsp.warning.unknown.element.in.function=Unknown element ({0}) in function
 jsp.error.teiclass.instantiation=Failed to load or instantiate TagExtraInfo 
class: {0}
 jsp.error.non_null_tei_and_var_subelems=Tag {0} has one or more variable 
subelements and a TagExtraInfo class that returns one or more VariableInfo
@@ -238,7 +238,7 @@ jsp.error.taglibDirective.both_uri_and_t
 jsp.error.invalid.tagdir=Tag file directory {0} does not start with 
\"/WEB-INF/tags\"
 #jspx.error.templateDataNotInJspCdata=Validation Error: Element &lt;{0}&gt; 
cannot have template data. Template data must be encapsulated within a 
&lt;jsp:cdata&gt; element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: 
{1}
 #Error while processing taglib jar file {0}: {1}
-jsp.error.needAlternateJavaEncoding=Default java encoding {0} is invalid on 
your java platform. An alternate can be specified via the 'javaEncoding' 
parameter of JspServlet.
+jsp.error.needAlternateJavaEncoding=Default java encoding {0} is invalid on 
your java platform. An alternate can be specified via the ''javaEncoding'' 
parameter of JspServlet.
 #Error when compiling, used for jsp line number error messages
 jsp.error.single.line.number=An error occurred at line: {0} in the jsp file: 
{1}
 jsp.error.java.line.number=An error occurred at line: [{0}] in the generated 
java file: [{1}]
@@ -249,7 +249,7 @@ jsp.error.jspbody.emptybody.only=The {0}
 jsp.error.no.scriptlets=Scripting elements ( &lt;%!, &lt;jsp:declaration, 
&lt;%=, &lt;jsp:expression, &lt;%, &lt;jsp:scriptlet ) are disallowed here.
 jsp.error.tld.fn.invalid.signature=Invalid syntax for function signature in 
TLD.  Tag Library: {0}, Function: {1}
 jsp.error.tld.fn.duplicate.name=Duplicate function name {0} in tag library {1}
-jsp.error.tld.fn.invalid.signature.parenexpected=Invalid syntax for function 
signature in TLD.  Parenthesis '(' expected.  Tag Library: {0}, Function: {1}.
+jsp.error.tld.fn.invalid.signature.parenexpected=Invalid syntax for function 
signature in TLD.  Parenthesis ''('' expected.  Tag Library: {0}, Function: {1}.
 jsp.error.tld.mandatory.element.missing=Mandatory TLD element {0} missing or 
empty in TLD {1}
 jsp.error.dynamic.attributes.not.implemented=The {0} tag declares that it 
accepts dynamic attributes but does not implement the required interface
 jsp.error.attribute.noequal=equal symbol expected
@@ -364,13 +364,13 @@ jsp.error.el.template.deferred=#{...} is
 jsp.error.el.parse={0} : {1}
 jsp.error.page.invalid.deferredsyntaxallowedasliteral=Page directive: invalid 
value for deferredSyntaxAllowedAsLiteral
 jsp.error.tag.invalid.deferredsyntaxallowedasliteral=Tag directive: invalid 
value for deferredSyntaxAllowedAsLiteral
-jsp.error.page.conflict.deferredsyntaxallowedasliteral=Page directive: illegal 
to have multiple occurrences of 'deferredSyntaxAllowedAsLiteral' with different 
values (old: {0}, new: {1})
-jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Tag directive: illegal 
to have multiple occurrences of 'deferredSyntaxAllowedAsLiteral' with different 
values (old: {0}, new: {1})
+jsp.error.page.conflict.deferredsyntaxallowedasliteral=Page directive: illegal 
to have multiple occurrences of ''deferredSyntaxAllowedAsLiteral'' with 
different values (old: {0}, new: {1})
+jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Tag directive: illegal 
to have multiple occurrences of ''deferredSyntaxAllowedAsLiteral'' with 
different values (old: {0}, new: {1})
 
 jsp.error.page.invalid.trimdirectivewhitespaces=Page directive: invalid value 
for trimDirectiveWhitespaces
 jsp.error.tag.invalid.trimdirectivewhitespaces=Tag directive: invalid value 
for trimDirectiveWhitespaces
-jsp.error.page.conflict.trimdirectivewhitespaces=Page directive: illegal to 
have multiple occurrences of 'trimDirectiveWhitespaces' with different values 
(old: {0}, new: {1})
-jsp.error.tag.conflict.trimdirectivewhitespaces=Tag directive: illegal to have 
multiple occurrences of 'trimDirectiveWhitespaces' with different values (old: 
{0}, new: {1})
+jsp.error.page.conflict.trimdirectivewhitespaces=Page directive: illegal to 
have multiple occurrences of ''trimDirectiveWhitespaces'' with different values 
(old: {0}, new: {1})
+jsp.error.tag.conflict.trimdirectivewhitespaces=Tag directive: illegal to have 
multiple occurrences of ''trimDirectiveWhitespaces'' with different values 
(old: {0}, new: {1})
 
 # JSP Servlet
 jsp.error.servlet.invalid.method=JSPs only permit GET POST or HEAD

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
 Thu Mar 30 10:00:13 2017
@@ -25,30 +25,30 @@ jsp.message.parent_class_loader_is = El
 jsp.message.dont.modify.servlets = IMPORTANTE\: No modifique los servlets 
generados
 jsp.error.unavailable = JSP ha sido marcado como no disponible
 jsp.error.usebean.duplicate = useBean\: Nombre de bean duplicado\: {0}
-jsp.error.invalid.scope = Valor ilegal de atributo 'scope'\: {0} (debe de ser 
uno de "page", "request", "session", o "application")
+jsp.error.invalid.scope = Valor ilegal de atributo ''scope''\: {0} (debe de 
ser uno de "page", "request", "session", o "application")
 jsp.error.classname = No pude determinar el nombre de clase desde el fichero 
.class
 jsp.error.outputfolder = no hay carpeta de salida
 jsp.error.data.file.write = Error mientras escrib\u00EDa el archivo de datos
-jsp.error.page.conflict.contenttype = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de 'contentType' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.page.conflict.session = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de 'session' con valores distintos (viejo\: {0}, 
nuevo\: {1})
+jsp.error.page.conflict.contenttype = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''contentType'' con valores distintos (viejo\: 
{0}, nuevo\: {1})
+jsp.error.page.conflict.session = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''session'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
 jsp.error.page.invalid.session = Directiva Page\: valor incorrecto para session
-jsp.error.page.conflict.buffer = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de 'buffer'con valores distintos (viejo\: {0}, 
nuevo\: {1})
+jsp.error.page.conflict.buffer = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''buffer'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
 jsp.error.page.invalid.buffer = Directiva Page\: valor incorrecto para 
b\u00FAfer
-jsp.error.page.conflict.autoflush = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de 'autoFlush' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.page.conflict.isthreadsafe = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de 'isThreadSafe' con valores distintos (viejo\: 
{0}, nuevo\: {1})
+jsp.error.page.conflict.autoflush = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''autoFlush'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
+jsp.error.page.conflict.isthreadsafe = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''isThreadSafe'' con valores distintos (viejo\: 
{0}, nuevo\: {1})
 jsp.error.page.invalid.isthreadsafe = \=Directiva Page\: valor incorrecto para 
isThreadSafe
-jsp.error.page.conflict.info = Directiva Page\: es ilegal tener m\u00FAltiples 
ocurrencias de 'info' con valores distintos (viejo\: {0}, nuevo\: {1})
+jsp.error.page.conflict.info = Directiva Page\: es ilegal tener m\u00FAltiples 
ocurrencias de ''info'' con valores distintos (viejo\: {0}, nuevo\: {1})
 jsp.error.page.invalid.info = \=Directiva Page\: valor incorrecto para info
-jsp.error.page.conflict.iserrorpage = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de 'isErrorPage' con valores distintos (viejo\: {0}, 
nuevo\: {1})
+jsp.error.page.conflict.iserrorpage = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''isErrorPage'' con valores distintos (viejo\: 
{0}, nuevo\: {1})
 jsp.error.page.invalid.iserrorpage = \=Directiva Page\: valor incorrecto para 
isErrorPage
-jsp.error.page.conflict.errorpage = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de 'errorPage' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.page.conflict.language = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de 'language' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.tag.conflict.language = Directiva Tag\: es ilegal tener 
m\u00FAltiples ocurrencias de 'language' con valores distintos (viejo\: {0}, 
nuevo\: {1})
+jsp.error.page.conflict.errorpage = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''errorPage'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
+jsp.error.page.conflict.language = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''language'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
+jsp.error.tag.conflict.language = Directiva Tag\: es ilegal tener 
m\u00FAltiples ocurrencias de ''language'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
 jsp.error.page.language.nonjava = Directiva Page\: atributo language incorrecto
 jsp.error.tag.language.nonjava = Directiva Tag\: atributo language incorrecto
-jsp.error.page.conflict.extends = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de 'extends' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.page.conflict.iselignored = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de 'isELIgnored' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.tag.conflict.iselignored = Directiva Tag\: es ilegal tener 
m\u00FAltiples ocurrencias de 'isELIgnored' con valores distintos (viejo\: {0}, 
nuevo\: {1})
+jsp.error.page.conflict.extends = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''extends'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
+jsp.error.page.conflict.iselignored = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''isELIgnored'' con valores distintos (viejo\: 
{0}, nuevo\: {1})
+jsp.error.tag.conflict.iselignored = Directiva Tag\: es ilegal tener 
m\u00FAltiples ocurrencias de ''isELIgnored'' con valores distintos (viejo\: 
{0}, nuevo\: {1})
 jsp.error.page.invalid.iselignored = Directiva Page\: valor inv\u00E1lido para 
isELIgnored
 jsp.error.tag.invalid.iselignored = Directiva Tag\: valor incorrecto para 
isELIgnored
 jsp.error.page.multi.pageencoding = La directiva Page no debe de tener 
m\u00FAltiples ocurrencias de pageencoding
@@ -229,7 +229,7 @@ jsp.error.taglibDirective.both_uri_and_t
 jsp.error.invalid.tagdir = El directorio de archivo Tag {0} no comienza con 
"/WEB-INF/tags"
 #jspx.error.templateDataNotInJspCdata=Validation Error: Element &lt;{0}&gt; 
cannot have template data. Template data must be encapsulated within a 
&lt;jsp:cdata&gt; element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: 
{1}
 #Error while processing taglib jar file {0}: {1}
-jsp.error.needAlternateJavaEncoding = La codificaci\u00F3n java por defecto 
{0} es incorrecta en tu plataforma java. Se puede especificar una alternativa 
v\u00EDa par\u00E1metro 'javaEncoding' de JspServlet.
+jsp.error.needAlternateJavaEncoding = La codificaci\u00F3n java por defecto 
{0} es incorrecta en tu plataforma java. Se puede especificar una alternativa 
v\u00EDa par\u00E1metro ''javaEncoding'' de JspServlet.
 #Error when compiling, used for jsp line number error messages
 jsp.error.single.line.number = Ha tenido lugar un error en la l\u00EDnea\: {0} 
en el archivo jsp\: {1}
 jsp.error.java.line.number = Ha tenido lugar un error en la l\u00EDnea\: [{0}] 
en el fichero java generado: [{1}]
@@ -240,7 +240,7 @@ jsp.error.jspbody.emptybody.only = El ta
 jsp.error.no.scriptlets = Los elementos de Scripting (&lt;%\!, 
&lt;jsp\:declaration, &lt;%\=, &lt;jsp\:expression, &lt;%, &lt;jsp\:scriptlet ) 
no est\u00E1n permitidos aqu\u00ED.
 jsp.error.tld.fn.invalid.signature = Sint\u00E1xis incorrecta para firma de 
funci\u00F3n en TLD. Biblioteca de Tag\: {0}, Funci\u00F3n\: {1}
 jsp.error.tld.fn.duplicate.name = Nombre duplicado de funci\u00F3n {0} en 
biblioteca de tag {1}
-jsp.error.tld.fn.invalid.signature.parenexpected = Sint\u00E1xis incorrecta 
para firma de funci\u00F3n en TLD. Se esperaba Par\u00E9ntesis '('. Biblioteca 
de Tag\: {0}, Funci\u00F3n\: {1}.
+jsp.error.tld.fn.invalid.signature.parenexpected = Sint\u00E1xis incorrecta 
para firma de funci\u00F3n en TLD. Se esperaba Par\u00E9ntesis ''(''. 
Biblioteca de Tag\: {0}, Funci\u00F3n\: {1}.
 jsp.error.tld.mandatory.element.missing = Falta o est\u00E1 vac\u00EDo 
elemento TLD obligatorio\: {0}
 jsp.error.dynamic.attributes.not.implemented = El tag {0} declara que acepta 
atributos din\u00E1micos pero no implementa la interfaz requerida
 jsp.error.attribute.noequal = se esperaba s\u00EDmbolo igual
@@ -349,12 +349,12 @@ jsp.error.el.template.deferred = \#{..}
 jsp.error.el.parse = {0} \: {1}
 jsp.error.page.invalid.deferredsyntaxallowedasliteral = Directiva de 
p\u00E1gina\: valor inv\u00E1lido para deferredSyntaxAllowedAsLiteral
 jsp.error.tag.invalid.deferredsyntaxallowedasliteral = Directiva de marca\: 
valor inv\u00E1lido para deferredSyntaxAllowedAsLiteral
-jsp.error.page.conflict.deferredsyntaxallowedasliteral = Directiva de 
p\u00E1gina\: es ilegal tener m\u00FAltiples ocurrencias de 
'deferredSyntaxAllowedAsLiteral' con diferentes valores (viejo\: {0}, nuevo\: 
{1})
-jsp.error.tag.conflict.deferredsyntaxallowedasliteral = Directiva de marca\: 
es ilegal tener m\u00FAltiples ocurrencias de 'deferredSyntaxAllowedAsLiteral' 
con diferentes valores (viejo\: {0}, nuevo\: {1})
+jsp.error.page.conflict.deferredsyntaxallowedasliteral = Directiva de 
p\u00E1gina\: es ilegal tener m\u00FAltiples ocurrencias de 
''deferredSyntaxAllowedAsLiteral'' con diferentes valores (viejo\: {0}, nuevo\: 
{1})
+jsp.error.tag.conflict.deferredsyntaxallowedasliteral = Directiva de marca\: 
es ilegal tener m\u00FAltiples ocurrencias de 
''deferredSyntaxAllowedAsLiteral'' con diferentes valores (viejo\: {0}, nuevo\: 
{1})
 jsp.error.page.invalid.trimdirectivewhitespaces = Directiva de p\u00E1gina\: 
valor inv\u00E1lido para trimDirectiveWhitespaces
 jsp.error.tag.invalid.trimdirectivewhitespaces = Directiva de marca\: valor 
inv\u00E1lido para trimDirectiveWhitespaces
-jsp.error.page.conflict.trimdirectivewhitespaces = Directiva de p\u00E1gina\: 
es ilegal tener m\u00FAltiples ocurrencias de 'trimDirectivewhitespaces' con 
diferentes valores (viejo\: {0}, nuevo\: {1})
-jsp.error.tag.conflict.trimdirectivewhitespaces = Directiva de marca\: es 
ilegal tener m\u00FAltiples ocurrencias de 'trimDirectivewhitespaces' con 
diferentes valores (viejo\: {0}, nuevo\: {1})
+jsp.error.page.conflict.trimdirectivewhitespaces = Directiva de p\u00E1gina\: 
es ilegal tener m\u00FAltiples ocurrencias de ''trimDirectivewhitespaces'' con 
diferentes valores (viejo\: {0}, nuevo\: {1})
+jsp.error.tag.conflict.trimdirectivewhitespaces = Directiva de marca\: es 
ilegal tener m\u00FAltiples ocurrencias de ''trimDirectivewhitespaces'' con 
diferentes valores (viejo\: {0}, nuevo\: {1})
 jsp.warning.noJarScanner = Aviso\: No se ha puesto 
org.apache.tomcat.JarScanner en ServletContext. Volviendo a la 
implementaci\u00F3n por defecto de JarScanner.
 jsp.error.bug48498 = No puedo mostrar extracto de JSP. Probablemente debido a 
un error de analizador XML (ver error 48498 de Tomcat para detalles).
 jsp.error.duplicateqname = Se ha hallado un atributo con nombre cualificado 
duplicado [{0}]. Los nombres de atributos cuallificados deben de se \u00FAnicos 
dentro de un elemento.

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
 Thu Mar 30 10:00:13 2017
@@ -151,7 +151,7 @@ jsp.error.no.more.content=Fin de contenu
 jsp.error.parse.xml=Erreur d''\u00e9valuation XML sur le fichier {0}
 jsp.error.parse.xml.line=Erreur d''\u00e9valuation XML sur le fichier  {0}: 
(ligne {1}, col {2})
 jsp.error.parse.xml.scripting.invalid.body=Le corps de l''\u00e9l\u00e9ment 
{0} ne doit contenir aucun \u00e9l\u00e9ments XML
-jsp.error.internal.tldinit=Exception lors de l'initialisation de 
TldLocationsCache: {0}
+jsp.error.internal.tldinit=Exception lors de l''initialisation de 
TldLocationsCache: {0}
 jsp.error.internal.filenotfound=Erreur interne: Fichier {0} introuvable
 jsp.error.parse.xml.invalidPublicId=PUBLIC ID invalide: {0}
 jsp.error.unsupported.encoding=Encodage non support\u00e9: {0}
@@ -161,7 +161,7 @@ jsp.error.taglibDirective.missing.locati
 jsp.error.invalid.tagdir=Le r\u00e9pertoire du fichier Tag {0} ne commence pas 
par \"/WEB-INF/tags\"
 #jspx.error.templateDataNotInJspCdata=Erreur de validation: 
l''\u00e9l\u00e9ment &lt;{0}&gt; ne peut avoir de donn\u00e9es template. Les 
donn\u00e9es Template doivent \u00eatre encapsul\u00e9es \u00e0 
l''int\u00e9rieur d''un \u00e9l\u00e9ment &lt;jsp:cdata&gt;. [JSP1.2 PFD 
section 5.1.9]\nDonn\u00e9e Template en erreur: {1}
 #Erreur lors du traitement du fichier jar de la taglib {0}: {1}
-jsp.error.needAlternateJavaEncoding=L''encodage java par d\u00e9faut {0} est 
incorrect sur votre environnement java. Une alternative peut \u00eatre 
indiqu\u00e9e via le param\u00eatre 'javaEncoding' de la JspServlet.
+jsp.error.needAlternateJavaEncoding=L''encodage java par d\u00e9faut {0} est 
incorrect sur votre environnement java. Une alternative peut \u00eatre 
indiqu\u00e9e via le param\u00eatre ''javaEncoding'' de la JspServlet.
 #Erreur lors de la compilation, utilis\u00e9 pour la ligne jsp des messages 
d''erreur
 jsp.error.single.line.number=Une erreur s''est produite \u00e0 la ligne: {0} 
dans le fichier jsp: {1}
 jsp.error.corresponding.servlet=Erreur de servlet g\u00e9n\u00e9r\u00e9e:\n
@@ -169,7 +169,7 @@ jsp.error.jspbody.required=Doit utiliser
 jsp.error.jspbody.emptybody.only=Le tag {0} ne peut avoir que jsp:attribute 
dans son corps.
 jsp.error.no.scriptlets=Les \u00e9l\u00e9ments de Scripting ( <%!, 
<jsp:declaration, <%=, <jsp:expression, <%, <jsp:scriptlet ) ne sont pas 
autoris\u00e9s ici.
 jsp.error.tld.fn.invalid.signature=Synthaxe invalide pour la signature de 
fonction dans la TLD.  Librairie de Tag : {0}, Fonction: {1}
-jsp.error.tld.fn.invalid.signature.parenexpected=Synthaxe invalide pour la 
signature de fonction dans la TLD.  Parenth\u00e8se '(' attendue.  Librairie de 
Tag: {0}, Fonction: {1}.
+jsp.error.tld.fn.invalid.signature.parenexpected=Synthaxe invalide pour la 
signature de fonction dans la TLD.  Parenth\u00e8se ''('' attendue.  Librairie 
de Tag: {0}, Fonction: {1}.
 jsp.error.dynamic.attributes.not.implemented=Le tag {0} indique qu''il accepte 
des attributs dynamics mais n''impl\u00e9mente pas l''interface requise
 jsp.error.attribute.noequal=Symbole \u00e9gal (equal) attendu
 jsp.error.attribute.noquote=Symbole guillemet (quote) attendu

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
 Thu Mar 30 10:00:13 2017
@@ -25,28 +25,28 @@ jsp.message.parent_class_loader_is=\u89a
 jsp.message.dont.modify.servlets=\u91cd\u8981: 
\u751f\u6210\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3092\u5909\u66f4\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093
 
jsp.error.unavailable=JSP\u306f\u5229\u7528\u4e0d\u53ef\u3068\u30de\u30fc\u30af\u3055\u308c\u3066\u3044\u307e\u3059
 jsp.error.usebean.duplicate=useBean: 
beanName\u5c5e\u6027\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059: {0}
-jsp.error.invalid.scope='scope'\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059:
 {0} 
(\"page\"\u3001\"request\"\u3001\"session\"\u53c8\u306f\"application\"\u306e\u3069\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093)
+jsp.error.invalid.scope=''scope''\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059:
 {0} 
(\"page\"\u3001\"request\"\u3001\"session\"\u53c8\u306f\"application\"\u306e\u3069\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093)
 
jsp.error.classname=.class\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u30af\u30e9\u30b9\u540d\u3092\u6c7a\u5b9a\u3067\u304d\u307e\u305b\u3093
 
jsp.error.data.file.write=\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304d\u8fbc\u307f\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
-jsp.error.page.conflict.contenttype=page\u6307\u793a\u5b50: 
'contentType'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
-jsp.error.page.conflict.session=page\u6307\u793a\u5b50: 
'session'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.contenttype=page\u6307\u793a\u5b50: 
''contentType''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.session=page\u6307\u793a\u5b50: 
''session''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
 jsp.error.page.invalid.session=page\u6307\u793a\u5b50: 
session\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.buffer=page\u6307\u793a\u5b50: 
'buffer'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.buffer=page\u6307\u793a\u5b50: 
''buffer''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
 jsp.error.page.invalid.buffer=page\u6307\u793a\u5b50: 
buffer\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.autoflush=page\u6307\u793a\u5b50: 
'autoFlush'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
-jsp.error.page.conflict.isthreadsafe=page\u6307\u793a\u5b50: 
'isThreadSafe'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.autoflush=page\u6307\u793a\u5b50: 
''autoFlush''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.isthreadsafe=page\u6307\u793a\u5b50: 
''isThreadSafe''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
 jsp.error.page.invalid.isthreadsafe=page\u6307\u793a\u5b50: 
isThreadSafe\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.info=page\u6307\u793a\u5b50: 
'info'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.info=page\u6307\u793a\u5b50: 
''info''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
 jsp.error.page.invalid.info=page\u6307\u793a\u5b50: 
info\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.iserrorpage=page\u6307\u793a\u5b50: 
'isErrorPage'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.iserrorpage=page\u6307\u793a\u5b50: 
''isErrorPage''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
 jsp.error.page.invalid.iserrorpage=page\u6307\u793a\u5b50: 
isErrorPage\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.errorpage=page\u6307\u793a\u5b50: 
'errorPage'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.errorpage=page\u6307\u793a\u5b50: 
''errorPage''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
 jsp.error.page.conflict.language=page\u6307\u793a\u5b50: 
'language'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
-jsp.error.tag.conflict.language=tag\u6307\u793a\u5b50: 
'language'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
+jsp.error.tag.conflict.language=tag\u6307\u793a\u5b50: 
''language''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
 jsp.error.page.language.nonjava=page\u6307\u793a\u5b50: 
\u7121\u52b9\u306alanguage\u5c5e\u6027\u3067\u3059
 jsp.error.tag.language.nonjava=tag\u6307\u793a\u5b50: 
\u7121\u52b9\u306alanguage\u5c5e\u6027\u3067\u3059
-jsp.error.page.conflict.extends=page\u6307\u793a\u5b50: 
'extends'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
-jsp.error.page.conflict.iselignored=page\u6307\u793a\u5b50: 
'isELIgnored'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.extends=page\u6307\u793a\u5b50: 
''extends''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.iselignored=page\u6307\u793a\u5b50: 
''isELIgnored''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
 jsp.error.tag.conflict.iselignored=tag\u6307\u793a\u5b50: 
'isELIgnored'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: {0}, \u65b0: {1})
 jsp.error.page.invalid.iselignored=page\u6307\u793a\u5b50: 
isELIgnored\u306b\u7121\u52b9\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
 jsp.error.tag.invalid.iselignored=tag\u6307\u793a\u5b50: 
isELIgnored\u306b\u7121\u52b9\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
@@ -205,7 +205,7 @@ jsp.error.taglibDirective.both_uri_and_t
 
jsp.error.invalid.tagdir=\u30bf\u30b0\u30d5\u30a1\u30a4\u30eb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
 {0} \u304c\"/WEB-INF/tags\"\u3067\u59cb\u307e\u308a\u307e\u305b\u3093
 #jspx.error.templateDataNotInJspCdata=Validation Error: Element &lt;{0}&gt; 
cannot have template data. Template data must be encapsulated within a 
&lt;jsp:cdata&gt; element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: 
{1}
 #Error while processing taglib jar file {0}: {1}
-jsp.error.needAlternateJavaEncoding=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eJava\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
 {0} 
\u306f\u3042\u306a\u305f\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u306f\u7121\u52b9\u3067\u3059\u3002JspServlet\u306e
 'javaEncoding' 
\u30d1\u30e9\u30e1\u30bf\u3067\u3001\u5225\u306e\u5024\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
+jsp.error.needAlternateJavaEncoding=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eJava\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
 {0} 
\u306f\u3042\u306a\u305f\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u306f\u7121\u52b9\u3067\u3059\u3002JspServlet\u306e
 ''javaEncoding'' 
\u30d1\u30e9\u30e1\u30bf\u3067\u3001\u5225\u306e\u5024\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
 #Error when compiling, used for jsp line number error messages
 jsp.error.single.line.number=JSP\u30d5\u30a1\u30a4\u30eb: {1} 
\u306e\u4e2d\u306e{0}\u884c\u76ee\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
 
jsp.error.corresponding.servlet=\u751f\u6210\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u30a8\u30e9\u30fc\u3067\u3059:\n
@@ -214,7 +214,7 @@ jsp.error.jspbody.emptybody.only={0} \u3
 
jsp.error.no.scriptlets=\u30b9\u30af\u30ea\u30d7\u30c6\u30a3\u30f3\u30b0\u8981\u7d20
 ( 
&lt;%!\u3001&lt;jsp:declaration\u3001&lt;%=\u3001&lt;jsp:expression\u3001&lt;%\u3001&lt;jsp:scriptlet
 ) \u306f\u3053\u3053\u3067\u306f\u8a31\u3055\u308c\u307e\u305b\u3093
 
jsp.error.tld.fn.invalid.signature=TLD\u306e\u4e2d\u306e\u95a2\u6570\u30b7\u30b0\u30cd\u30c1\u30e3\u306b\u5bfe\u3059\u308b\u7121\u52b9\u306a\u69cb\u6587\u3067\u3059\u3002\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea:
 {0}\u3001\u95a2\u6570: {1}
 jsp.error.tld.fn.duplicate.name=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea {1} 
\u306e\u4e2d\u306e\u95a2\u6570\u540d {0} 
\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059
-jsp.error.tld.fn.invalid.signature.parenexpected=TLD\u306e\u4e2d\u306e\u95a2\u6570\u30b7\u30b0\u30cd\u30c1\u30e3\u306b\u5bfe\u3059\u308b\u7121\u52b9\u306a\u69cb\u6587\u3067\u3059\u3002\u62ec\u5f27
 '(' 
\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea:
 {0}\u3001\u95a2\u6570: {1}\u3002
+jsp.error.tld.fn.invalid.signature.parenexpected=TLD\u306e\u4e2d\u306e\u95a2\u6570\u30b7\u30b0\u30cd\u30c1\u30e3\u306b\u5bfe\u3059\u308b\u7121\u52b9\u306a\u69cb\u6587\u3067\u3059\u3002\u62ec\u5f27
 ''('' 
\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea:
 {0}\u3001\u95a2\u6570: {1}\u3002
 
jsp.error.tld.mandatory.element.missing=\u5fc5\u9808TLD\u8981\u7d20\u304c\u306a\u3044\u3001\u53c8\u306f\u7a7a\u3067\u3059:
 {0}
 jsp.error.dynamic.attributes.not.implemented={0} 
\u30bf\u30b0\u306f\u305d\u308c\u304cdynamic\u5c5e\u6027\u3092\u53d7\u3051\u4ed8\u3051\u308b\u3068\u5ba3\u8a00\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u305d\u308c\u306b\u5fc5\u8981\u306a\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u3092\u5b9f\u88c5\u3057\u3066\u3044\u307e\u305b\u3093
 
jsp.error.attribute.noequal=\u7b49\u53f7\u8a18\u53f7\u304c\u5fc5\u8981\u3067\u3059

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
 Thu Mar 30 10:00:13 2017
@@ -55,7 +55,7 @@ webXml.mergeConflictSessionTimeout=The s
 webXml.mergeConflictSessionTrackingMode=The session tracking modes were 
defined inconsistently in multiple fragments including fragment with name [{0}] 
located at [{1}]
 webXml.mergeConflictString=The [{0}] with name [{1}] was defined 
inconsistently in multiple fragments including fragment with name [{2}] located 
at [{3}]
 webXml.multipleOther=Multiple others entries in ordering
-webXml.unrecognisedPublicId=The public ID [{0}] did not match any of the known 
public ID's for web.xml files so the version could not be identified
+webXml.unrecognisedPublicId=The public ID [{0}] did not match any of the known 
public ID''s for web.xml files so the version could not be identified
 webXml.version.unknown=Unknown version string [{0}]. Default version will be 
used.
 webXml.wrongFragmentName=Used a wrong fragment name {0} at web.xml 
absolute-ordering tag!
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to