Author: markt
Date: Wed Jun 3 17:20:09 2009
New Revision: 781483
URL: http://svn.apache.org/viewvc?rev=781483&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47228
Correct French translation.
Patch provided by s...@a.o
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings_fr.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 3 17:20:09 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,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,770809,770876,776921,776924,776935,777464,777466,777576,77
7625
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,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,770809,770876,776921,776924,776935,777464,777466,777576,77
7625,778379
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=781483&r1=781482&r2=781483&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 3 17:20:09 2009
@@ -105,13 +105,6 @@
+1: rjung, fhanik, markt,funkman
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47228
- Correct French translation.
- Patch provided by s...@a.o
- http://svn.apache.org/viewvc?view=rev&revision=778379
- +1: markt, kkolinko,funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47050
Remove unnecessary filtering
http://svn.apache.org/viewvc?rev=770716&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=781483&r1=781482&r2=781483&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Wed Jun 3 17:20:09 2009
@@ -75,7 +75,7 @@
jsp.error.action.istagfile=L''action {0} ne peut \u00eatre utilis\u00e9e dans
un fichier tag
jsp.error.action.isnottagfile=L''action {0} ne peut \u00eatre utilis\u00e9e
que dans un fichier tag
jsp.error.unterminated=Tag {0} non termin\u00e9
-jsp.error.usebean.notinsamefile=le tag useBean doit commenc\u00e9 et finir
dans le m\u00eame fichier physique
+jsp.error.usebean.notinsamefile=le tag useBean doit commencer et finir dans le
m\u00eame fichier physique
jsp.error.loadclass.taghandler=Impossible de charger la classe {0}
jsp.error.unable.compile=Impossible de compiler la classe pour la JSP
jsp.error.unable.load=Impossible de charger la classe pour la JSP
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings_fr.properties?rev=781483&r1=781482&r2=781483&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings_fr.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings_fr.properties
Wed Jun 3 17:20:09 2009
@@ -16,14 +16,14 @@
fileResources.base=Le document base {0} n''existe pas ou n''est pas un
r\u00e9pertoire lisible
warResources.notWar=Doc base doit point\u00e9 vers un fichier WAR
warResources.invalidWar=Fichier WAR invalide ou illisible : {0}
-jarResources.syntax=Le document base {0} doit commenc\u00e9 par ''jar:'' et
finir avec ''!/''
+jarResources.syntax=Le document base {0} doit commencer par ''jar:'' et finir
avec ''!/''
resources.alreadyStarted=Les Ressources ont d\u00e9j\u00e0 \u00e9t\u00e9
d\u00e9marr\u00e9es
resources.connect=Impossible de se connecter au document base {0}
resources.input=Impossible de cr\u00e9er l''input stream pour la ressource {0}
resources.notStarted=Les ressources n''ont pas encore \u00e9t\u00e9
d\u00e9marr\u00e9es
resources.null=Le document base ne peut \u00eatre nul
resources.notFound=La ressource {0} est introuvable
-resources.path=Le chemin relatif de context {0} doit commenc\u00e9 par ''/''
+resources.path=Le chemin relatif de context {0} doit commencer par ''/''
resources.alreadyBound=Le nom {0} est d\u00e9j\u00e0 r\u00e9f\u00e9renc\u00e9
par ce contexte
resources.bindFailed=Le liage a \u00e9chou\u00e9: {0}
resources.unbindFailed=Le d\u00e9liage a \u00e9chou\u00e9: {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=781483&r1=781482&r2=781483&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jun 3 17:20:09 2009
@@ -59,6 +59,10 @@
<fix>
<bug>47080</bug>: Fix NPE in RealmBase when uri is null. (markt)
</fix>
+ <fix>
+ <bug>47228</bug>: Correct French translations. Patch provided by sebb.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
