tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r892531 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/manager/ java/org/apache/catalina/session/ webapps/docs/
Date Sat, 19 Dec 2009 23:38:43 GMT
Author: markt
Date: Sat Dec 19 23:38:43 2009
New Revision: 892531

URL: http://svn.apache.org/viewvc?rev=892531&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48306 & https://issues.apache.org/bugzilla/show_bug.cgi?id=48307
Correct French translations
Patches provided by Marc Paquette

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 19 23:38:43 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,885038,886019,888072,889363,890349,890417,891583
+/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,885038,886019,888072,889363,890349,890417,891583,892198

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=892531&r1=892530&r2=892531&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec 19 23:38:43 2009
@@ -315,22 +315,6 @@
   -1: 
   rjung: "memopry" -> "memory" in docs patch, "idenitfy" -> "identify" in comment
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48306 &
-  https://issues.apache.org/bugzilla/show_bug.cgi?id=48307
-  Correct French translations
-  http://people.apache.org/~markt/patches/2009-11-27-bug48295-6.patch
-  http://svn.apache.org/viewvc?rev=892198&view=rev (Konstantin's comments)
-  Patches provided by Marc Paquette
-  +1: markt, rjung
-  +1: kkolinko: Technically correct (cannot say anything about the
-   language), except the following two glitches in manager/LocalStrings_fr.properties:
-    1) 'managerServlet.deployed' is defined twice (and in the English
-    file as well). The first one looks to be more correctly translated.
-    2) 'managerServlet.undeployd' and 'managerServlet.undeployed' are
-   both defined (and in the English file as well), but only the second one is
-   used by Java code.
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47453
   Handle void return types
   This is Tim's patch

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=892531&r1=892530&r2=892531&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties Sat Dec
19 23:38:43 2009
@@ -131,7 +131,7 @@
 standardHost.removing=Retrait de l''application web pour le chemin de contexte {0}
 standardHost.removeError=Erreur lors du retrait de l''application web pour le chemin de contexte
{0}
 standardHost.start=D\u00e9marrage de l''application web application pour le chemin de contexte
{0}
-standardHost.stop=Arr\u00e9t de l''application web application pour le chemin de contexte
{0}
+standardHost.stop=Arr\u00eat de l''application web application pour le chemin de contexte
{0}
 standardHost.unfoundContext=Impossible de trouver un contexte pour l''URI {0} demand\u00e9e
 standardHost.warRequired=Une URL vers l''archive d''application web (war) est n\u00e9cessaire

 standardHost.warURL=URL vers l''archive d''application web (war) invalide: {0}

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=892531&r1=892530&r2=892531&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties Sat Dec
19 23:38:43 2009
@@ -63,7 +63,6 @@
 managerServlet.deployFailed=FAIL - Failed to deploy application at context path {0}
 managerServlet.deployedButNotStarted=FAIL - Deployed application at context path {0} but
context failed to start
 managerServlet.exception=FAIL - Encountered exception {0}
-managerServlet.deployed=OK - Deployed application at context path {0}
 managerServlet.invalidPath=FAIL - Invalid context path {0} was specified
 managerServlet.invalidWar=FAIL - Invalid application URL {0} was specified
 managerServlet.listed=OK - Listed applications for virtual host {0}
@@ -82,7 +81,6 @@
 managerServlet.noWrapper=Container has not called setWrapper() for this servlet
 managerServlet.notDeployed=FAIL - Context {0} is defined in server.xml and may not be undeployed
 managerServlet.reloaded=OK - Reloaded application at context path {0}
-managerServlet.undeployd=OK - Undeployed application at context path {0}
 managerServlet.resourcesAll=OK - Listed global resources of all types
 managerServlet.resourcesType=OK - Listed global resources of type {0}
 managerServlet.rolesList=OK - Listed security roles

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties?rev=892531&r1=892530&r2=892531&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties Sat Dec
19 23:38:43 2009
@@ -59,7 +59,6 @@
 managerServlet.configured=OK - Anwendung von Kontext-Datei {0} installiert
 managerServlet.deployed=OK - Anwendung mit Kontext Pfad {0} installiert
 managerServlet.exception=FEHLER - Ausnahme aufgetreten {0}
-managerServlet.deployed=OK - Anwendung mit Kontext Pfad {0} installiert
 managerServlet.invalidPath=FEHLER - Ung\u00fcltiger Kontext Pfad {0} angegeben
 managerServlet.invalidWar=FEHLER - Ung\u00fcltige URL {0} f\u00fcr Anwendung angegeben
 managerServlet.listed=OK - Auflistung der Webanwendungen f\u00fcr virtuellen Server {0}
@@ -76,7 +75,6 @@
 managerServlet.noSelf=FEHLER - Manager-Kommandos k\u00f6nnen nicht auf die Manager-Anwendung
selbst angewendet werden
 managerServlet.noWrapper=Container hat setWrapper() f\u00fcr dieses Servlet nicht aufgerufen
 managerServlet.reloaded=OK - Anwendung mit Kontext Pfad {0} neu geladen
-managerServlet.undeployd=OK - Anwendung mit Kontext Pfad {0} entfernt
 managerServlet.resourcesAll=OK - Auflistung globaler Ressourcen (alle Typen)
 managerServlet.resourcesType=OK - Auflistung globaler Ressourcen von Typ {0}
 managerServlet.rolesList=OK - Auflistung der Sicherheits-Rollen

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties?rev=892531&r1=892530&r2=892531&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties Sat Dec
19 23:38:43 2009
@@ -61,7 +61,6 @@
 managerServlet.deployed = OK - Desplegada aplicaci\u00F3n en trayectoria de contexto {0}
 managerServlet.deployFailed = FALLO - No pude desplegar la aplicaci\u00F3n en ruta de contexto
{0}
 managerServlet.exception = FALLO - Encontrada excepci\u00F3n {0}
-managerServlet.deployed = OK - Aplicaci\u00F3n desplegada en ruta de contexto {0}
 managerServlet.invalidPath = FALLO - Se ha especificado una trayectoria inv\u00E1lida de
contexto {0}
 managerServlet.invalidWar = FALLO - Se ha especificado una URL de aplicaci\u00F3n inv\u00E1lida
{0}
 managerServlet.listed = OK - Aplicaciones listadas para m\u00E1quinda virutal {0}
@@ -80,7 +79,6 @@
 managerServlet.noWrapper = El Contenedor no ha llamado a setWrapper() para este servlet
 managerServlet.notDeployed = FALLO - El contexto {0} est\u00E1 definido en server.xml y puede
que no est\u00E9 desplegado
 managerServlet.reloaded = OK - Recargada aplicaci\u00F3n en trayectoria de contexto {0}
-managerServlet.undeployd = OK - Replegada aplicaci\u00F3n en trayectoria de contexto {0}
 managerServlet.resourcesAll = OK - Listados recursos globales de todos los tipos
 managerServlet.resourcesType = OK - Listados recursos globales de tipo {0}
 managerServlet.rolesList = OK - Listados papeles de seguridad

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties?rev=892531&r1=892530&r2=892531&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties Sat Dec
19 23:38:43 2009
@@ -13,21 +13,40 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-htmlManagerServlet.appsAvailable=Fonctionnant
+htmlManagerServlet.appsAvailable=Fonctionnelle
 htmlManagerServlet.appsName=Nom d''affichage
 htmlManagerServlet.appsPath=Chemin
 htmlManagerServlet.appsReload=Recharger
-htmlManagerServlet.appsRemove=Retirer
+htmlManagerServlet.appsUndeploy=Retirer
+htmlManagerServlet.appsExpire=Expirer les sessions
 htmlManagerServlet.appsSessions=Sessions
 htmlManagerServlet.appsStart=D\u00e9marrer
-htmlManagerServlet.appsStop=Arr\u00e9ter
+htmlManagerServlet.appsStop=Arr\u00eater
+htmlManagerServlet.appsTasks=Commandes
 htmlManagerServlet.appsTitle=Applications
-htmlManagerServlet.installButton=Installation
-htmlManagerServlet.installConfig=URL de configuration:
-htmlManagerServlet.installPath=Chemin:
-htmlManagerServlet.installTitle=Installation
-htmlManagerServlet.installWar=URL du WAR:
+htmlManagerServlet.expire.explain=inactives depuis ≥
+htmlManagerServlet.expire.unit=minutes
+htmlManagerServlet.helpHtmlManager=Aide HTML Gestionnaire
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
+htmlManagerServlet.helpManager=Aide Gestionnaire
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
+htmlManagerServlet.deployButton=Deployer
+htmlManagerServlet.deployConfig=URL du fichier XML de configuration:
+htmlManagerServlet.deployPath=Chemin de context (requis):
+htmlManagerServlet.deployServer=Emplacement du r\u00e9pertoire ou fichier WAR de d\u00e9ploiement
sur le serveur
+htmlManagerServlet.deployTitle=Deployer
+htmlManagerServlet.deployUpload=Fichier WAR \u00e0 d\u00e9ployer
+htmlManagerServlet.deployUploadFail=ECHEC - T\u00e9l\u00e9versement pour d\u00e9ploiement
a \u00e9chou\u00e9, exception: {0}
+htmlManagerServlet.deployUploadFile=Choisir le fichier WAR \u00e0 t\u00e9l\u00e9verser
+htmlManagerServlet.deployUploadInServerXml=ECHEC - Fichier WAR \"{0}\" ne peut \u00eatre
t\u00e9l\u00e9vers\u00e9 lorsque le contexte est d\u00e9fini dans server.xml
+htmlManagerServlet.deployUploadNotWar=ECHEC - Fichier \u00e0 t\u00e9l\u00e9verser, \"{0}\",
doit \u00eatre un .war
+htmlManagerServlet.deployUploadNoFile=ECHEC - T\u00e9l\u00e9versement a \u00e9chou\u00e9,
aucun fichier
+htmlManagerServlet.deployUploadWarExists=ECHEC - Fichier War \"{0}\" d\u00e9j\u00ea existant
sur le serveur
+htmlManagerServlet.deployWar=URL vers WAR ou r\u00e9pertoire:
+htmlManagerServlet.list=Lister les applications
+htmlManagerServlet.manager=Gestionnaire
 htmlManagerServlet.messageLabel=Message:
+htmlManagerServlet.noManager=-
 htmlManagerServlet.serverJVMVendor=Fournisseur de la JVM
 htmlManagerServlet.serverJVMVersion=Version de la JVM
 htmlManagerServlet.serverOSArch=Architecture d''OS
@@ -41,8 +60,9 @@
 managerServlet.cannotInvoke=Impossible d''utiliser le gestionnaire de servlet au travers
du d\u00e9l\u00e9gu\u00e9 (invoker)
 managerServlet.configured=OK - Application configur\u00e9e depuis le fichier contexte {0}
 managerServlet.deployed=OK - Application d\u00e9ploy\u00e9e pour le chemin de contexte {0}
+managerServlet.deployFailed=ECHEC - Echec au d\u00e9ploiement de l''application pour le chemin
de contexte {0}
+managerServlet.deployedButNotStarted=ECHEC - Application d\u00e9ploy\u00e9e pour le chemin
de contexte {0} mais le d\u00e9marrage du contexte a \u00e9chou\u00e9
 managerServlet.exception=ECHEC - L''exception {0} a \u00e9t\u00e9 rencontr\u00e9e
-managerServlet.installed=OK - Application install\u00e9e pour le chemin de contexte {0}
 managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide {0} a \u00e9t\u00e9 sp\u00e9cifi\u00e9
 managerServlet.invalidWar=ECHEC - Une URL d''application invalide {0} a \u00e9t\u00e9 sp\u00e9cifi\u00e9e
 managerServlet.listed=OK - Applications list\u00e9es pour l''h\u00f4te virtuel (virtual host)
{0}
@@ -53,26 +73,29 @@
 managerServlet.noDirectory=ECHEC - La base de document n''est pas un r\u00e9pertoire pour
le chemin {0}
 managerServlet.noDocBase=ECHEC - Impossible de retirer la base de document pour le chemin
{0}
 managerServlet.noGlobal=ECHEC - Aucune ressource JNDI globale n''est disponible
+managerServlet.noManager=ECHEC - Aucun gesionnaire n''existe pour le chemin {0}
 managerServlet.noReload=ECHEC - Rechargement non support\u00e9 par le WAR d\u00e9ploy\u00e9
au chemin {0}
 managerServlet.noRename=ECHEC - Impossible de d\u00e9ployer un WAR t\u00e9l\u00e9charg\u00e9
pour le chemin {0}
 managerServlet.noRole=ECHEC - L''utilisateur ne poss\u00e8de pas le r\u00f4le {0}
 managerServlet.noSelf=ECHEC - Le gestionnaire ne peut recharger, retirer, arr\u00eater, ou
se d\u00e9ployer lui-m\u00eame
 managerServlet.noWrapper=Le conteneur n''a pas appel\u00e9 "setWrapper()" pour cette servlet
-managerServlet.reloaded=OK - Application recharg\u00e9e au chemin de contexte {0}
-managerServlet.removed=OK - Application retir\u00e9e au chemin de contexte {0}
+managerServlet.notDeployed=ECHEC - Le contexte {0} est d\u00e9fini dans server.xml et ne
peut \u00eatre retir\u00e9
+managerServlet.reloaded=OK - Application associ\u00e9 au chemin de contexte {0} a \u00e9t\u00e9
recharg\u00e9e
 managerServlet.resourcesAll=OK - Liste des ressources globales de tout type
 managerServlet.resourcesType=OK - Liste des ressources globales de type {0}
 managerServlet.rolesList=OK - Liste de r\u00f4les de securit\u00e9
 managerServlet.saveFail=ECHEC - La sauvegarde de la configuration a \u00e9chou\u00e9: {0}
+managerServlet.saved=OK - Configuration serveur sauvegard\u00e9e
+managerServlet.savedContext=OK - Configuration du contexte {0} sauvegard\u00e9e
 managerServlet.sessiondefaultmax=Interval par d\u00e9faut de maximum de session inactive
{0} minutes
 managerServlet.sessiontimeout={0} minutes:{1} sessions
 managerServlet.sessions=OK - Information de session pour l''application au chemin de contexte
{0}
 managerServlet.started=OK - Application d\u00e9marr\u00e9e pour le chemin de contexte {0}
-managerServlet.startFailed=ECHEC - L''application pour le chemin de contexte {0} n''a pas
pu\u00eatred\u00e9marr\u00e9e
-managerServlet.stopped=OK - Application arr\u00e9t\u00e9e pour le chemin de contexte {0}
-managerServlet.undeployed=OK - Application non-d\u00e9ploy\u00e9e pour le chemin de contexte
{0}
+managerServlet.startFailed=ECHEC - L''application pour le chemin de contexte {0} n''a pas
pu \u00eatre d\u00e9marr\u00e9e
+managerServlet.stopped=OK - Application arr\u00eat\u00e9e pour le chemin de contexte {0}
+managerServlet.undeployed=OK - Application associ\u00e9 au chemin de contexte {0} a \u00e9t\u00e9
retir\u00e9e
 managerServlet.unknownCommand=ECHEC - Commande inconnue {0}
-managerServlet.userDatabaseError=ECHEC - Impossible de r\u00e9soudre la base de donn\u00e9es
utilisateurs der\u00e9f\u00e9rence
+managerServlet.userDatabaseError=ECHEC - Impossible de r\u00e9soudre la base de donn\u00e9es
utilisateurs de r\u00e9f\u00e9rence
 managerServlet.userDatabaseMissing=ECHEC - Aucune base de donn\u00e9es utilisateurs n''est
disponible
 
 statusServlet.title=Etat du serveur

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties?rev=892531&r1=892530&r2=892531&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties Sat Dec
19 23:38:43 2009
@@ -56,7 +56,6 @@
 managerServlet.configured=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb
{0} \u304b\u3089\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3057\u305f
 managerServlet.deployed=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u3057\u307e\u3057\u305f
 managerServlet.exception=FAIL - \u4f8b\u5916 {0} \u304c\u767a\u751f\u3057\u307e\u3057\u305f
-managerServlet.deployed=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306b\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3057\u305f
 managerServlet.invalidPath=FAIL - \u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9
{0} \u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f
 managerServlet.invalidWar=FAIL - \u7121\u52b9\u306a\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306eURL
{0} \u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f
 managerServlet.listed=OK - \u30d0\u30fc\u30c1\u30e3\u30eb\u30db\u30b9\u30c8 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4e00\u89a7\u3067\u3059
@@ -73,7 +72,6 @@
 managerServlet.noSelf=FAIL - \u30de\u30cd\u30fc\u30b8\u30e3\u81ea\u8eab\u3092\u518d\u30ed\u30fc\u30c9\u3001\u524a\u9664\u3001\u505c\u6b62\u3001\u53c8\u306f\u914d\u5099\u89e3\u9664\u3067\u304d\u307e\u305b\u3093
 managerServlet.noWrapper=\u30b3\u30f3\u30c6\u30ca\u306f\u3053\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306b\u5bfe\u3057\u3066\u547c\u3073\u51fa\u3055\u308c\u305fsetWrapper()\u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093
 managerServlet.reloaded=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u518d\u30ed\u30fc\u30c9\u3057\u307e\u3057\u305f
-managerServlet.undeployd=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u304b\u3089\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u89e3\u9664\u3057\u307e\u3057\u305f
 managerServlet.resourcesAll=OK - \u3059\u3079\u3066\u306e\u30bf\u30a4\u30d7\u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30ea\u30bd\u30fc\u30b9\u3092\u5217\u6319\u3057\u307e\u3057\u305f
 managerServlet.resourcesType=OK - \u30bf\u30a4\u30d7 {0} \u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30ea\u30bd\u30fc\u30b9\u3092\u5217\u6319\u3057\u307e\u3057\u305f
 managerServlet.rolesList=OK - \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u3092\u5217\u6319\u3057\u307e\u3057\u305f

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties?rev=892531&r1=892530&r2=892531&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties Sat Dec
19 23:38:43 2009
@@ -27,7 +27,7 @@
 JDBCStore.removing=Retrait de la Session {0} de la base de donn\u00e9es {1}
 JDBCStore.SQLException=Erreur SQL {0}
 JDBCStore.checkConnectionDBClosed=La connexion \u00e0 la base de donn\u00e9es est nulle ou
a \u00e9t\u00e9 trouv\u00e9 ferm\u00e9. Tentative de r\u00e9ouverture.
-JDBCStore.checkConnectionDBReOpenFail=La tentative de r\u00e9ouverture re-open de la base
de donn\u00e9es a \u00e9chou\u00e9. La base de donn\u00e9es est peut \u00eatre arr\u00e9t\u00e9e.
+JDBCStore.checkConnectionDBReOpenFail=La tentative de r\u00e9ouverture re-open de la base
de donn\u00e9es a \u00e9chou\u00e9. La base de donn\u00e9es est peut \u00eatre arr\u00eat\u00e9e.
 JDBCStore.checkConnectionSQLException=Une exception SQL s''est produite {0}
 JDBCStore.checkConnectionClassNotFoundException=La classe du driver JDBC n''a pas \u00e9t\u00e9
trouv\u00e9e {0}
 managerBase.complete=L''alimentation du g\u00e9n\u00e9rateur de nombre al\u00e9atoire est
termin\u00e9

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=892531&r1=892530&r2=892531&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Dec 19 23:38:43 2009
@@ -205,6 +205,10 @@
         by Guillermo GutiƩrrez. (markt)
       </fix>
       <fix>
+        <bug>48306</bug>, <bug>48307</bug>: Correct French translations.
Patches
+        provided by Marc Paquette. (markt)
+      </fix>
+      <fix>
         <bug>48322</bug>: Single quote characters are not HTTP separators and
         should not be treated as such in the cookie handling. (markt)
       </fix>



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


Mime
View raw message