Author: markt
Date: Mon Dec 21 11:31:23 2009
New Revision: 892771
URL: http://svn.apache.org/viewvc?rev=892771&view=rev
Log: (empty)
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 11:31:23 2009
@@ -1,2 +1,2 @@
/tomcat:883362
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883146,883177,883362,883565,884341,885038,885991,886019,888072,889363,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,8924
15
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883146,883177,883362,883565,884341,885038,885991,886019,888072,889363,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,8924
15,892555
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=892771&r1=892770&r2=892771&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 11:31:23 2009
@@ -330,12 +330,6 @@
+1: markt, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48413
- Correct French translations
- http://svn.apache.org/viewvc?rev=892555&view=rev
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47976
Align usage message and javadoc with implementation
http://svn.apache.org/viewvc?view=revision&revision=832214
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties?rev=892771&r1=892770&r2=892771&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
Mon Dec 21 11:31:23 2009
@@ -17,11 +17,11 @@
accessLogValve.notStarted=Le traceur d''acc\u00e8s n''a pas encore
\u00e9t\u00e9 d\u00e9marr\u00e9
certificatesValve.alreadyStarted=La Valve de Certificats a d\u00e9j\u00e0
\u00e9t\u00e9 d\u00e9marr\u00e9e
certificatesValve.notStarted=La Valve de Certificats n''a pas encore
\u00e9t\u00e9 d\u00e9marr\u00e9e
-interceptorValve.alreadyStarted=La Valve d''Interception a d\u00e9j\u00e0
\u00e9t\u00e9 d\u00e9marr\u00e9
+interceptorValve.alreadyStarted=La Valve d''Interception a d\u00e9j\u00e0
\u00e9t\u00e9 d\u00e9marr\u00e9e
interceptorValve.notStarted=La Valve d''Interception n''a pas encore
\u00e9t\u00e9 d\u00e9marr\u00e9e
requestFilterValve.next=Aucune Valve ''suivante'' n''a \u00e9t\u00e9
configur\u00e9e
-requestFilterValve.syntax=Erreur de synthaxe dans le pattern de filtre de
requ\u00eate {0}
-valveBase.noNext=Erreur de configuration error: Aucune Valve ''suivante'' n''a
\u00e9t\u00e9 configur\u00e9e
+requestFilterValve.syntax=Erreur de syntaxe dans le pattern de filtre de
requ\u00eate {0}
+valveBase.noNext=Erreur de configuration: aucune Valve ''suivante'' n''a
\u00e9t\u00e9 configur\u00e9e
# Error report valve
errorReportValve.errorReport=Rapport d''erreur
@@ -38,11 +38,11 @@
# HTTP status reports
http.100=Le client peut continuer ({0}).
http.101=Le serveur change de protocoles suivant la directive "Upgrade" de
l''ent\u00eate ({0}).
-http.201=La requ\u00eate a r\u00e9ussi et une nouvelle ressource ({0}) a
\u00e9t\u00e9 cr\u00e9ee sur le serveur.
-http.202=La requ\u00eate a \u00e9t\u00e9 accept\u00e9 pour traitement, mais
n''a pas \u00e9t\u00e9 termin\u00e9e ({0}).
-http.203=L''information meta pr\u00e9sent\u00e9e par le client n''a pas pour
origine ce server ({0}).
+http.201=La requ\u00eate a r\u00e9ussi et une nouvelle ressource ({0}) a
\u00e9t\u00e9 cr\u00e9\u00e9e sur le serveur.
+http.202=La requ\u00eate a \u00e9t\u00e9 accept\u00e9e pour traitement, mais
n''a pas \u00e9t\u00e9 termin\u00e9e ({0}).
+http.203=L''information meta pr\u00e9sent\u00e9e par le client n''a pas pour
origine ce serveur ({0}).
http.204=La requ\u00eate a r\u00e9ussi mais il n''y a aucune information
\u00e0 retourner ({0}).
-http.205=Le client doit remettre \u00e0 z\u00e9ro la vue de document qui a
caus\u00e9e l''envoi de cette requ\u00eate ({0}).
+http.205=Le client doit remettre \u00e0 z\u00e9ro la vue de document qui a
caus\u00e9 l''envoi de cette requ\u00eate ({0}).
http.206=Le serveur a satisfait une requ\u00eate GET partielle pour cette
ressource ({0}).
http.207=Plusieurs valeurs d''\u00e9tats ont \u00e9t\u00e9 retourn\u00e9es
({0}).
http.300=La ressource demand\u00e9e ({0}) correspond \u00e0 plusieurs
repr\u00e9sentations, chacune avec sa propre localisation.
@@ -63,18 +63,18 @@
http.409=La requ\u00eate ne peut \u00eatre finalis\u00e9e suite \u00e0 un
conflit li\u00e9 \u00e0 l''\u00e9tat de la ressource ({0}).
http.410=La ressource demand\u00e9e ({0}) n''est pas disponible, et aucune
addresse de rebond (forwarding) n''est connue.
http.411=La requ\u00eate ne peut \u00eatre trait\u00e9e sans d\u00e9finition
d''une taille de contenu (content length) ({0}).
-http.412=Une condition pr\u00e9alable demand\u00e9e a \u00e9chou\u00e9e pour
cette requ\u00eate ({0}).
+http.412=Une condition pr\u00e9alable demand\u00e9e n''est pas satisfaite pour
cette requ\u00eate ({0}).
http.413=L''entit\u00e9 de requ\u00eate est plus importante que ce que le
serveur veut ou peut traiter.
-http.414=Le serveur a refus\u00e9 cette requ\u00eate car URI de requ\u00eate
est trop longue ({0}).
+http.414=Le serveur a refus\u00e9 cette requ\u00eate car l''URI de
requ\u00eate est trop longue ({0}).
http.415=Le serveur a refus\u00e9 cette requ\u00eate car l''entit\u00e9 de
requ\u00eate est dans un format non support\u00e9 par la ressource
demand\u00e9e avec la m\u00e9thode sp\u00e9cifi\u00e9e ({0}).
-http.416=La place d''octets (byte range) ne peut \u00eatre satisfaite ({0}).
-http.417=L''attente indiqu\u00e9 dans la directive "Expect" de l''ent\u00eate
de requ\u00eate ({0}) ne peut \u00eatre satisfaite.
-http.422=Le serveur a compris le type de contenu (content type) ainsi que la
synthaxe de la requ\u00eate mais a \u00e9t\u00e9 incapable de traiter les
instructions contenues ({0}).
-http.423=La ressource source ou destination de la m\u00e9thode est
v\u00e9rrouill\u00e9e ({0}).
+http.416=La plage d''octets demand\u00e9e (byte range) ne peut \u00eatre
satisfaite ({0}).
+http.417=L''attente indiqu\u00e9e dans la directive "Expect" de l''ent\u00eate
de requ\u00eate ({0}) ne peut \u00eatre satisfaite.
+http.422=Le serveur a compris le type de contenu (content type) ainsi que la
syntaxe de la requ\u00eate mais a \u00e9t\u00e9 incapable de traiter les
instructions contenues ({0}).
+http.423=La ressource source ou destination de la m\u00e9thode est
verrouill\u00e9e ({0}).
http.500=Le serveur a rencontr\u00e9 une erreur interne ({0}) qui l''a
emp\u00each\u00e9 de satisfaire la requ\u00eate.
http.501=Le serveur ne supporte pas la fonctionnalit\u00e9 demand\u00e9e pour
satisfaire cette requ\u00eate ({0}).
http.502=Le serveur a re\u00e7u une r\u00e9ponse invalide d''un serveur qu''il
consultait en tant que relais ou passerelle ({0}).
http.503=Le service demand\u00e9 ({0}) n''est pas disponible actuellement.
-http.504=Le serveur a re\u00e7u un d\u00e9passement de delais (timeout) d''un
serveur amont qu''il consultait en tant que relais ou passerelle ({0}).
-http.505=Le serveur ne supporte pas la version de protocole HTTP demand\u00e9
({0}).
-http.507=La ressource n''a pas assez d''espace pour enregistrer l''\u00e9tat
de la ressource apr\u00e8s ex\u00e9cution de cette m\u00e9thode ({0}).
+http.504=Le serveur a re\u00e7u un d\u00e9passement de delai (timeout) d''un
serveur amont qu''il consultait en tant que relais ou passerelle ({0}).
+http.505=Le serveur ne supporte pas la version demand\u00e9e du protocole HTTP
({0}).
+http.507=L''espace disponible est insuffisant pour enregistrer l''\u00e9tat de
la ressource apr\u00e8s ex\u00e9cution de cette m\u00e9thode ({0}).
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=892771&r1=892770&r2=892771&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Dec 21 11:31:23 2009
@@ -225,6 +225,10 @@
<bug>48322</bug>: Single quote characters are not HTTP separators and
should not be treated as such in the cookie handling. (markt)
</fix>
+ <fix>
+ <bug>48413</bug>: Correct some French translations. Patch provided by
+ André Warnier. (markt)
+ </fix>
<update>
Deprecate the <code>caseSensitive</code> option on the
<code>StandardContext</code> which will be removed in Tomcat 7 onwards.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
