Author: markt
Date: Thu Apr 20 19:04:32 2017
New Revision: 1792116
URL: http://svn.apache.org/viewvc?rev=1792116&view=rev
Log:
Replace the use of '...' to delimit values in messages with [...] because a) it
is more consistent and b) ' needs to be escaped whereas [ and ] do not.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings_es.properties
tomcat/tc8.5.x/trunk/java/org/apache/el/Messages.properties
tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings_es.properties
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 20 19:04:32 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,176
8762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150,1778154,
1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,17887
64,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,176
8762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150,1778154,
1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,17887
64,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093
Modified: tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings.properties?rev=1792116&r1=1792115&r2=1792116&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings.properties (original)
+++ tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings.properties Thu Apr 20
19:04:32 2017
@@ -16,11 +16,11 @@
# Default localized string information
# Localized for Locale en_US
-propertyNotFound=Property ''{1}'' not found on type {0}
-propertyNotReadable=Property ''{1}'' not readable on type {0}
-propertyNotWritable=Property ''{1}'' not writable on type {0}
-propertyReadError=Error reading ''{1}'' on type {0}
-propertyWriteError=Error writing ''{1}'' on type {0}
+propertyNotFound=Property [{1}] not found on type {0}
+propertyNotReadable=Property [{1}] not readable on type {0}
+propertyNotWritable=Property [{1}] not writable on type {0}
+propertyReadError=Error reading [{1}] on type {0}
+propertyWriteError=Error writing [{1}] on type {0}
objectNotAssignable=Unable to add an object of type [{0}] to an array of
objects of type [{1}]
beanNameELResolver.beanReadOnly=The bean name [{0}] is read-only
Modified: tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings_es.properties?rev=1792116&r1=1792115&r2=1792116&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings_es.properties (original)
+++ tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings_es.properties Thu Apr 20
19:04:32 2017
@@ -12,9 +12,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-propertyNotFound = Propiedad ''{1}'' no hallada en el tipo {0}
-propertyNotReadable = Propiedad ''{1}'' no legible para el tipo {0}
-propertyNotWritable = Propiedad ''{1}'' no grabable para el tipo {0}
-propertyReadError = Error reading ''{1}'' en el tipo {0}
-propertyWriteError = Error writing ''{1}'' en el tipo {0}
+propertyNotFound = Propiedad [{1}] no hallada en el tipo {0}
+propertyNotReadable = Propiedad [{1}] no legible para el tipo {0}
+propertyNotWritable = Propiedad [{1}] no grabable para el tipo {0}
+propertyReadError = Error reading [{1}] en el tipo {0}
+propertyWriteError = Error writing [{1}] en el tipo {0}
objectNotAssignable = No puedo a\u00F1adir un objeto del tipo [{0}] a un
arreglo de objetos del tipo [{1}]
Modified: tomcat/tc8.5.x/trunk/java/org/apache/el/Messages.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/el/Messages.properties?rev=1792116&r1=1792115&r2=1792116&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/el/Messages.properties (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/el/Messages.properties Thu Apr 20
19:04:32 2017
@@ -16,11 +16,11 @@
# General Errors
error.convert=Cannot convert {0} of type {1} to {2}
error.compare=Cannot compare {0} to {1}
-error.function=Problems calling function ''{0}''
-error.unreachable.base=Target Unreachable, identifier ''{0}'' resolved to null
-error.unreachable.property=Target Unreachable, ''{0}'' returned null
-error.resolver.unhandled=ELResolver did not handle type: {0} with property of
''{1}''
-error.resolver.unhandled.null=ELResolver cannot handle a null base Object with
identifier ''{0}''
+error.function=Problems calling function [{0}]
+error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
+error.unreachable.property=Target Unreachable, [{0}] returned null
+error.resolver.unhandled=ELResolver did not handle type: {0} with property of
[{1}]
+error.resolver.unhandled.null=ELResolver cannot handle a null base Object with
identifier [{0}]
error.invoke.wrongParams=The method [{0}] was called with [{1}] parameter(s)
when it expected [{2}]
error.invoke.tooFewParams=The method [{0}] was called with [{1}] parameter(s)
when it expected at least [{2}]
@@ -46,8 +46,8 @@ error.method.ambiguous=Unable to find un
# ValidatingVisitor
error.fnMapper.null=Expression uses functions, but no FunctionMapper was
provided
-error.fnMapper.method=Function ''{0}'' not found
-error.fnMapper.paramcount=Function ''{0}'' specifies {1} params, but {2} were
declared
+error.fnMapper.method=Function [{0}] not found
+error.fnMapper.paramcount=Function [{0}] specifies {1} params, but {2} were
declared
# ExpressionImpl
error.context.null=ELContext was null
Modified: tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties?rev=1792116&r1=1792115&r2=1792116&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties Thu Apr 20
19:04:32 2017
@@ -14,11 +14,11 @@
# limitations under the License.
error.convert = No puedo convertir {0} desde tipo {1} a {2}
error.compare = No puedo comparar {0} con {1}
-error.function = Problemas llamando a funci\u00F3n ''{0}''
-error.unreachable.base = Objetivo inalcanzable, identificador ''{0}'' resuelto
a nulo
-error.unreachable.property = Objetivo inalcanzable, ''{0}'' devolvi\u00F3 nulo
-error.resolver.unhandled = ELResolver no manej\u00F3 el tipo\: {0} con
propiedad de ''{1}''
-error.resolver.unhandled.null = ELResolver no puede manejar un Objeto base
nulo con identificador de ''{0}''
+error.function = Problemas llamando a funci\u00F3n [{0}]
+error.unreachable.base = Objetivo inalcanzable, identificador [{0}] resuelto a
nulo
+error.unreachable.property = Objetivo inalcanzable, [{0}] devolvi\u00F3 nulo
+error.resolver.unhandled = ELResolver no manej\u00F3 el tipo\: {0} con
propiedad de [{1}]
+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}
@@ -30,6 +30,6 @@ error.method.notfound = M\u00E9todo no h
error.method.ambiguous = No pude hallar m\u00E9todo ambiguo\: {0}.{1}({2})
error.fnMapper.null = La expresi\u00F3n usa funciones, pero no se ha
suministrado FunctionMapper
error.fnMapper.method = Funci\u00F3n "{0}" no hallada
-error.fnMapper.paramcount = La funci\u00F3n ''{0}'' especifica {1}
par\u00E9metros, pero {2} fueron declarados
+error.fnMapper.paramcount = La funci\u00F3n [{0}] especifica {1}
par\u00E9metros, pero {2} fueron declarados
error.context.null = ELContext era nulo
error.identifier.notjava = El identificador [{0}] no es un identificado Java
v\u00E1lido seg\u00FAn se requiere en la secci\u00F3n 1.9 de la
especificaci\u00F3n EL (Identificador \:\:\= identificador de lenguaje Java).
Este chequeo se puede desactivar poniendo la propiedad del sistema
org.apache.el.parser.SKIP_IDENTIFIER_CHECK a verdad (true).
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1792116&r1=1792115&r2=1792116&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Thu Apr 20 19:04:32 2017
@@ -82,10 +82,10 @@ jsp.error.file.not.registered=file {0} n
jsp.error.quotes.unterminated=Unterminated quotes
jsp.error.attr.quoted=Attribute value should be quoted
jsp.error.beans.nullbean=Attempted a bean operation on a null object.
-jsp.error.beans.nobeaninfo=No BeanInfo for the bean of type ''{0}'' could be
found, the class likely does not exist.
-jsp.error.beans.nomethod=Cannot find a method to read property ''{0}'' in a
bean of type ''{1}''
-jsp.error.beans.nomethod.setproperty=Can''t find a method to write property
''{0}'' of type ''{1}'' in a bean of type ''{2}''
-jsp.error.beans.noproperty=Cannot find any information on property ''{0}'' in
a bean of type ''{1}''
+jsp.error.beans.nobeaninfo=No BeanInfo for the bean of type [{0}] could be
found, the class likely does not exist.
+jsp.error.beans.nomethod=Cannot find a method to read property [{0}] in a bean
of type [{1}]
+jsp.error.beans.nomethod.setproperty=Can''t find a method to write property
[{0}] of type [{1}] in a bean of type [{2}]
+jsp.error.beans.noproperty=Cannot find any information on property [{0}] in a
bean of type [{1}]
jsp.error.beans.property.conversion=Unable to convert string \"{0}\" to class
\"{1}\" for attribute \"{2}\": {3}
jsp.error.beans.propertyeditor.notregistered=Property Editor not registered
with the PropertyEditorManager
jsp.error.beans.setproperty.noindexset=Cannot set indexed property
@@ -214,8 +214,8 @@ env-entry, and ejb-ref elements should f
-->\n
jspc.webinc.insertEnd=<!-- JSPC servlet mappings end -->
jspc.webinc.insertStart=<!-- JSPC servlet mappings start -->
-jspc.error.generalException=ERROR-the file ''{0}'' generated the following
general exception:
-jspc.error.fileDoesNotExist=The file argument ''{0}'' does not exist
+jspc.error.generalException=ERROR-the file [{0}] generated the following
general exception:
+jspc.error.fileDoesNotExist=The file argument [{0}] does not exist
jspc.delete.fail=Failed to delete file [{0}]
jspc.error.invalidWebXml=Aborting pre-compilation due to errors in web.xml
jspc.error.invalidFragment=Aborting pre-compilation due to errors in web
fragments
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1792116&r1=1792115&r2=1792116&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Thu Apr 20 19:04:32 2017
@@ -80,10 +80,10 @@ jsp.error.file.not.registered = Archivo
jsp.error.quotes.unterminated = Comillas no terminadas
jsp.error.attr.quoted = El valor del atributo deber\u00EDa ir entre comillas
jsp.error.beans.nullbean = Se ha intentado una operaci\u00F3n de bean en un
objeto nulo
-jsp.error.beans.nobeaninfo = No se puede encontrar BeanInfo para el bean
''{0}'' seguramente la clase no existe
-jsp.error.beans.nomethod = No puedo encontrar un m\u00E9todo para leer la
propiedad ''{0}'' en un bean del tipo ''{1}''
-jsp.error.beans.nomethod.setproperty = No puedo encontrar un m\u00E9todo para
escribir la propiedad ''{0}'' en un bean del tipo ''{2}''
-jsp.error.beans.noproperty = No puedo encontrar informaci\u00F3n de la
propiedad ''{0}'' en un bean del tipo ''{1}''
+jsp.error.beans.nobeaninfo = No se puede encontrar BeanInfo para el bean
[{0}] seguramente la clase no existe
+jsp.error.beans.nomethod = No puedo encontrar un m\u00E9todo para leer la
propiedad [{0}] en un bean del tipo [{1}]
+jsp.error.beans.nomethod.setproperty = No puedo encontrar un m\u00E9todo para
escribir la propiedad [{0}] en un bean del tipo [{2}]
+jsp.error.beans.noproperty = No puedo encontrar informaci\u00F3n de la
propiedad [{0}] en un bean del tipo [{1}]
jsp.error.beans.property.conversion = No puedo convertir cadena "{0}" a clase
"{1}" para atributo "{2}"\: {3}
jsp.error.beans.propertyeditor.notregistered = Editor de Propiedades no
registrado con el PropertyEditorManager
jsp.error.beans.setproperty.noindexset = No puedo poner la propiedad indexada
@@ -208,8 +208,8 @@ jspc.webinc.footer = \n\
-->\n
jspc.webinc.insertEnd = <\!-- Fin de mapeos de servlet JSPC -->
jspc.webinc.insertStart = <\!-- Inicio de mapeos de servlet JSPC -->
-jspc.error.generalException = ERROR-el archivo ''{0}'' ha generado la
excepci\u00F3n general siguiente\:
-jspc.error.fileDoesNotExist = El archivo ''{0}'' utilizado como argumento no
existe.
+jspc.error.generalException = ERROR-el archivo [{0}] ha generado la
excepci\u00F3n general siguiente\:
+jspc.error.fileDoesNotExist = El archivo [{0}] utilizado como argumento no
existe.
jspc.delete.fail = No pude borrar el fichero [{0}]
jsp.error.library.invalid = La p\u00E1gina JSP es incorrecta de acuerdo a la
biblioteca {0}\: {1}
jsp.error.tlvclass.instantiation = No pude cargar o instanciar clase
TagLibraryValidator\: {0}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1792116&r1=1792115&r2=1792116&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Thu Apr 20 19:04:32 2017
@@ -54,10 +54,10 @@ jsp.error.file.not.registered=Le fichier
jsp.error.quotes.unterminated=guillemets non termin\u00e9s
jsp.error.attr.quoted=La valeur de l''attribute doit \u00eatre entre guillemets
jsp.error.beans.nullbean=Tentative d''op\u00e9ration bean sur un objet nul.
-jsp.error.beans.nobeaninfo=Pas d''information bean (BeanInfo) pour le bean de
type ''{0}'' n''a pu \u00eatre trouv\u00e9e, la classe n''existe probablement
pas.
-jsp.error.beans.nomethod=Impossible de trouver une m\u00e9thode pour lire la
propri\u00e9t\u00e9 ''{0}'' dans le bean de type ''{1}''
-jsp.error.beans.nomethod.setproperty=Impossible de trouver une m\u00e9thode
pour mettre \u00e0 jour la propri\u00e9t\u00e9 ''{0}'' de type ''{1}''dans le
bean de type ''{2}''
-jsp.error.beans.noproperty==Impossible de trouver de l''information sur la
propri\u00e9t\u00e9 ''{0}'' dans le bean de type ''{1}''
+jsp.error.beans.nobeaninfo=Pas d''information bean (BeanInfo) pour le bean de
type [{0}] n''a pu \u00eatre trouv\u00e9e, la classe n''existe probablement pas.
+jsp.error.beans.nomethod=Impossible de trouver une m\u00e9thode pour lire la
propri\u00e9t\u00e9 [{0}] dans le bean de type [{1}]
+jsp.error.beans.nomethod.setproperty=Impossible de trouver une m\u00e9thode
pour mettre \u00e0 jour la propri\u00e9t\u00e9 [{0}] de type [{1}]dans le bean
de type [{2}]
+jsp.error.beans.noproperty==Impossible de trouver de l''information sur la
propri\u00e9t\u00e9 [{0}] dans le bean de type [{1}]
jsp.error.beans.setproperty.noindexset=Impossible de renseigner la
propri\u00e9t\u00e9 ind\u00e9x\u00e9e
jsp.error.include.tag=Tag jsp:include incorrect
jsp.error.attempt_to_clear_flushed_buffer=Erreur: Tentative d''effacement
d''un tampon qui a d\u00e9j\u00e0 \u00e9t\u00e9 vidang\u00e9 (flush)
@@ -141,8 +141,8 @@ All session-config, mime-mapping, welcom
resource-ref, security-constraint, login-config, security-role,\n\
env-entry, and ejb-ref elements should follow this fragment.\n\
-->\n
-jspc.error.generalException=ERREUR-le fichier ''{0}'' a g\u00e9n\u00e9r\u00e9
l''exception g\u00e9n\u00e9rale suivante:
-jspc.error.fileDoesNotExist=L''argument fichier ''{0}'' n''existe pas
+jspc.error.generalException=ERREUR-le fichier [{0}] a g\u00e9n\u00e9r\u00e9
l''exception g\u00e9n\u00e9rale suivante:
+jspc.error.fileDoesNotExist=L''argument fichier [{0}] n''existe pas
jsp.error.library.invalid=La page JSP page est incorrecte d''apr\u00e8s la
librairie {0}: {1}
jsp.error.tlvclass.instantiation=Impossible de charger ou d''instancier la
classe TagLibraryValidator: {0}
jsp.error.tlv.invalid.page=Message d''erreurs de validation provenant du
TagLibraryValidator pour {0} en {1}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1792116&r1=1792115&r2=1792116&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Thu Apr 20 19:04:32 2017
@@ -74,10 +74,10 @@ jsp.error.file.not.registered=include\u5
jsp.error.quotes.unterminated=\u5f15\u7528\u7b26\u304c\u7d42\u4e86\u3057\u3066\u3044\u307e\u305b\u3093
jsp.error.attr.quoted=\u5c5e\u6027\u5024\u306f\u5f15\u7528\u7b26\u3067\u56f2\u308f\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
jsp.error.beans.nullbean=null\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306bBean\u64cd\u4f5c\u3092\u304a\u3053\u306a\u304a\u3046\u3068\u3057\u307e\u3057\u305f
-jsp.error.beans.nobeaninfo=\u30bf\u30a4\u30d7 ''{0}''
\u306eBean\u306bBeanInfo\u304c\u306a\u3044\u306e\u3092\u691c\u51fa\u3057\u307e\u3057\u305f,
\u30af\u30e9\u30b9\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093
-jsp.error.beans.nomethod=\u30bf\u30a4\u30d7 ''{1}''
\u306eBean\u4e2d\u306e\u5c5e\u6027 ''{0}''
\u3092\u8aad\u307f\u8fbc\u3080\u30e1\u30bd\u30c3\u30c9\u3092\u767a\u898b\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
-jsp.error.beans.nomethod.setproperty=\u30bf\u30a4\u30d7''{2}''\u306eBean\u306e\u30bf\u30a4\u30d7
''{1}'' \u306e\u5c5e\u6027 ''{0}''
\u3092\u66f8\u304d\u8fbc\u3080\u30e1\u30bd\u30c3\u30c9\u3092\u767a\u898b\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
-jsp.error.beans.noproperty=\u30bf\u30a4\u30d7 ''{1}''
\u306ebean\u4e2d\u306e\u5c5e\u6027 ''{0}''
\u306e\u60c5\u5831\u3092\u767a\u898b\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+jsp.error.beans.nobeaninfo=\u30bf\u30a4\u30d7 [{0}]
\u306eBean\u306bBeanInfo\u304c\u306a\u3044\u306e\u3092\u691c\u51fa\u3057\u307e\u3057\u305f,
\u30af\u30e9\u30b9\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093
+jsp.error.beans.nomethod=\u30bf\u30a4\u30d7 [{1}]
\u306eBean\u4e2d\u306e\u5c5e\u6027 [{0}]
\u3092\u8aad\u307f\u8fbc\u3080\u30e1\u30bd\u30c3\u30c9\u3092\u767a\u898b\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+jsp.error.beans.nomethod.setproperty=\u30bf\u30a4\u30d7[{2}]\u306eBean\u306e\u30bf\u30a4\u30d7
[{1}] \u306e\u5c5e\u6027 [{0}]
\u3092\u66f8\u304d\u8fbc\u3080\u30e1\u30bd\u30c3\u30c9\u3092\u767a\u898b\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+jsp.error.beans.noproperty=\u30bf\u30a4\u30d7 [{1}]
\u306ebean\u4e2d\u306e\u5c5e\u6027 [{0}]
\u306e\u60c5\u5831\u3092\u767a\u898b\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
jsp.error.beans.setproperty.noindexset=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u4ed8\u304d\u306e\u5c5e\u6027\u3092\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.error.include.tag=\u7121\u52b9\u306ajsp:include\u30bf\u30b0\u3067\u3059
jsp.error.attempt_to_clear_flushed_buffer=\u30a8\u30e9\u30fc:
\u65e2\u306b\u30d5\u30e9\u30c3\u30b7\u30e5\u3055\u308c\u3066\u3044\u308b\u30d0\u30c3\u30d5\u30a1\u3092\u30af\u30ea\u30a2\u3057\u3088\u3046\u3068\u3057\u307e\u3057\u305f
@@ -185,8 +185,8 @@ env-entry, and ejb-ref elements should f
-->\n
jspc.webinc.insertEnd=<!-- JSPC servlet mappings end -->
jspc.webinc.insertStart=<!-- JSPC servlet mappings start -->
-jspc.error.generalException=\u30a8\u30e9\u30fc: \u30d5\u30a1\u30a4\u30eb
''{0}''
\u306f\u6b21\u306e\u4f8b\u5916\u3092\u767a\u751f\u3057\u307e\u3057\u305f:
-jspc.error.fileDoesNotExist=\u30d5\u30a1\u30a4\u30eb\u5f15\u6570 ''{0}''
\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
+jspc.error.generalException=\u30a8\u30e9\u30fc: \u30d5\u30a1\u30a4\u30eb [{0}]
\u306f\u6b21\u306e\u4f8b\u5916\u3092\u767a\u751f\u3057\u307e\u3057\u305f:
+jspc.error.fileDoesNotExist=\u30d5\u30a1\u30a4\u30eb\u5f15\u6570 [{0}]
\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
jsp.error.library.invalid=\u30e9\u30a4\u30d6\u30e9\u30ea{0}\u306b\u5f93\u3046\u3068JSP\u30da\u30fc\u30b8\u306f\u7121\u52b9\u3067\u3059:
{1}
jsp.error.tlvclass.instantiation=TagLibraryValidator\u30af\u30e9\u30b9\u306e\u30ed\u30fc\u30c9\u53c8\u306f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
{0}
jsp.error.tlv.invalid.page={0}
\u306b\u5bfe\u3059\u308bTagLibraryValidator\u306e\u691c\u8a3c\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u3067\u3059
({1})
Modified: tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings.properties?rev=1792116&r1=1792115&r2=1792116&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings.properties
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings.properties Thu Apr
20 19:04:32 2017
@@ -17,8 +17,8 @@ contextBindings.unknownContext=Unknown c
contextBindings.noContextBoundToThread=No naming context bound to this thread
contextBindings.noContextBoundToCL=No naming context bound to this class loader
selectorContext.noJavaUrl=This context must be accessed through a java: URL
-selectorContext.methodUsingName=Call to method ''{0}'' with a Name of ''{1}''
-selectorContext.methodUsingString=Call to method ''{0}'' with a String of
''{1}''
+selectorContext.methodUsingName=Call to method [{0}] with a Name of [{1}]
+selectorContext.methodUsingString=Call to method [{0}] with a String of [{1}]
namingContext.contextExpected=Name is not bound to a Context
namingContext.failResolvingReference=Unexpected exception resolving reference
namingContext.nameNotBound=Name [{0}] is not bound in this Context. Unable to
find [{1}].
Modified: tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings_es.properties?rev=1792116&r1=1792115&r2=1792116&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings_es.properties
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings_es.properties Thu
Apr 20 19:04:32 2017
@@ -19,8 +19,8 @@ contextBindings.unknownContext = Context
contextBindings.noContextBoundToThread = No hay contexto de nombres asociado a
este hilo
contextBindings.noContextBoundToCL = No hay contexto de nombres asociado a
este cargador de clase
selectorContext.noJavaUrl = Este contexto debe de ser accedido a traves de una
URL de tipo java\:
-selectorContext.methodUsingName = Llamada al m\u00E9todo ''{0}'' con un Nombre
de ''{1}''
-selectorContext.methodUsingString = Llamada al m\u00E9todo ''{0}'' con una
Cadena de ''{1}''
+selectorContext.methodUsingName = Llamada al m\u00E9todo [{0}] con un Nombre
de [{1}]
+selectorContext.methodUsingString = Llamada al m\u00E9todo [{0}] con una
Cadena de [{1}]
namingContext.contextExpected = El nombre no esta asociado a ningun Contexto
namingContext.failResolvingReference = Excepci\u00F3n inesperada resolviendo
referencia
namingContext.nameNotBound = El nombre {0} no este asociado a este contexto
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
