unicorn commit: merge

changeset:   1451:362ad0faae65
parent:      1450:124d695c358d
parent:      1449:afb7ae7dc778
user:        Jean-Guilhem Rouel <jean-gui@w3.org>
date:        Tue Aug 10 19:58:49 2010 +0200
files:       WebContent/WEB-INF/languages/fr.properties WebContent/WEB-INF/languages/l33t.properties
description:
merge


diff -r 124d695c358d -r 362ad0faae65 WebContent/WEB-INF/languages/fr.properties
--- a/WebContent/WEB-INF/languages/fr.properties	Tue Aug 10 19:29:47 2010 +0200
+++ b/WebContent/WEB-INF/languages/fr.properties	Tue Aug 10 19:58:49 2010 +0200
@@ -1,5 +1,4 @@
-#Submitted by Vivien Lacourba <vivien@w3.org>
-#Mon Jul 26 20:15:36 UTC 2010
+#Submitted by Jean-Guilhem Rouel <jean-gui@w3.org>
 anchor_message=Lien direct vers ce message
 anchor_observation=Lien direct vers ces résultats
 anchor_uri=Lien direct vers cette URI
diff -r 124d695c358d -r 362ad0faae65 WebContent/WEB-INF/languages/l33t.properties
--- a/WebContent/WEB-INF/languages/l33t.properties	Tue Aug 10 19:29:47 2010 +0200
+++ b/WebContent/WEB-INF/languages/l33t.properties	Tue Aug 10 19:58:49 2010 +0200
@@ -1,4 +1,3 @@
-#Submitted by Jean-Guilhem Rouel <jean-gui@w3.org>
 anchor_message=DIrect LInk to thi2 messAge
 anchor_observation=DIrect liNK TO ThESe reSUlt2
 anchor_uri=dIreCT liNk To THi2 uRi
@@ -34,7 +33,7 @@
 message_empty_direct_input=yoU MusT enteR A DOSpOogeENT TO cHEcK.
 message_empty_uploaded_file=The UPLoAdEd pHILE i2 emPty.
 message_empty_uri=You muSt EnTER a Uri TO CHECk.
-message_incomplete_language=Thi2 translatiON I2 InCOmPlEtE. ${mesSAGe_tRANSlatiOn}
+message_incomplete_language=Thi2 translatiON I2 InCOmPlEtE. ${message_translation}
 message_input_changed="%1" doE2 NOt suppoRt TeH %2 InpUt meTHOd. UnICOrN aUTOMaTICalLY ADAPTeD TEh rekwesT, 8UT Thi2 ChECKEr ReSulT2 MaY 8e iNaccuRATE.
 message_input_changed_long=some htTP HEadeR2 mAy hAve 8EEn LOSt OR chANgeD ANd TeH ChecKER mAY NOT 8e A8LE to pHolLOW teh LINX CoNTaINeD In JoOr doSpOogEeNt.
 message_invalid_mime_type=tHE speCIFIEd mimE-tYPe (%1) i2 InvAlID.
@@ -51,7 +50,7 @@
 message_nothing_to_validate=No dosPOoGeent Ha2 8eEn SU8MiTTed.
 message_no_uploaded_file=you MUSt uPlOAD a PHILE.
 message_observer_connect_exception="%1" i2 UNrEaCha8Le.
-message_observer_internal_error="%1" rEPoRTED A InTERNAL eRROr. <A HREF="%2">${DiREcT_LinK_La8EL}</A>.
+message_observer_internal_error="%1" rEPoRTED A InTERNAL eRROr. <A HREF="%2">${direct_link_label}</A>.
 message_observer_not_found=thE REKwEsT to "%1" resULTeD iN A <a HRef="HTtP://WwW.W3.oRg/pRoTOcOlS/rfC2616/rFC2616-sEc10.HtMl#seC10.4.5">404 (NOt phound) HTTP ErRor</A>.
 message_observer_read_timeout="%1" DID'nt RETurn a rESpoNSe in tiME.
 message_response_invalid_schema="%1" usED A UNsUpPOrteD rEspOnse PhOrm@.
@@ -59,8 +58,8 @@
 message_ssl_warning=tHE Ssl CerTIFICAte OF THI2 dOSpOoGEenT I2 noT valiD. NOTE Th@ Some vaLidAtoR2 mAy nOT supPOrT InVALID sSL CErtiFicAtE2 And WILL rePORt eRRoR2.
 message_translation=hELp u2 <a hREf="./TRansLations%2">tRaNSLatE uNICOrN</A> INTo JoOr NAtivE LAngUAGe.
 message_unauthorized_access=thE speCiFIeD urI REkWIre2 aUtHEntiCaTiON.
-message_unavailable_language=unICOrN i2 nOT avAila8LE In joOR prEFeRred LANguAGE (%1). ${MeSSaGE_TraNsLAtiOn}
-message_unavailable_requested_language=UnicOrN i2 NoT AVAILa8Le in teH Language joo REKwesTed (%1). ${MESSaGE_TRaNsLAtIoN}
+message_unavailable_language=unICOrN i2 nOT avAila8LE In joOR prEFeRred LANguAGE (%1). ${message_translation}
+message_unavailable_requested_language=UnicOrN i2 NoT AVAILa8Le in teH Language joo REKwesTed (%1). ${message_translation}
 message_unknown_host=UnkNOwN hOSt: %1.
 message_unknown_task=uNkNoWN TASk "%1". UNicorN uSED It2 dEFAUlT TAsk: "%2".
 message_unsupported_mime_type=tHe MiME-TYpe of JooR dOSPOoGeEnT (%1) i2 uNSUPpoRTed 8y thi2 TASk.

Received on Tuesday, 10 August 2010 17:59:19 UTC