unicorn commit: merge

changeset:   1355:128f662a7d9b
tag:         tip
parent:      1354:4fae07f080ce
parent:      1353:6bebf2fa4d92
user:        Jean-Guilhem Rouel <jean-gui@w3.org>
date:        Tue Jul 27 19:39:27 2010 +0200
description:
merge


diff -r 4fae07f080ce -r 128f662a7d9b WebContent/WEB-INF/languages/tasks/th.tasklist.properties
--- a/WebContent/WEB-INF/languages/tasks/th.tasklist.properties	Tue Jul 27 19:38:12 2010 +0200
+++ b/WebContent/WEB-INF/languages/tasks/th.tasklist.properties	Tue Jul 27 19:39:27 2010 +0200
@@ -1,6 +1,4 @@
-#$Id: $
-#
-#Submitted by Alisa <babieintown@yahoo.com>
+#Submitted by Alisa <babieintown@yahoo.com>
 #Thu Jun 10 20:59:43 UTC 2010
 conformance=ตรวจความสอดคล้องทั่วไป
 conformance.description=ตรวจสอบทุกมาตรฐานเท่าที่จะทำได้
diff -r 4fae07f080ce -r 128f662a7d9b WebContent/WEB-INF/resources/templates/includes/head.vm
--- a/WebContent/WEB-INF/resources/templates/includes/head.vm	Tue Jul 27 19:38:12 2010 +0200
+++ b/WebContent/WEB-INF/resources/templates/includes/head.vm	Tue Jul 27 19:39:27 2010 +0200
@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="$lang" lang="$lang" dir="$direction">
 <head>
 	<title>$title</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<link rev="start" href="$!{baseUri}" title="Home Page" />
 #foreach( $sheet in $css )
 	<link href="$!{baseUri}style/$sheet" type="text/css" media="screen" rel="stylesheet" />
diff -r 4fae07f080ce -r 128f662a7d9b src/org/w3c/unicorn/action/LanguageAction.java
--- a/src/org/w3c/unicorn/action/LanguageAction.java	Tue Jul 27 19:38:12 2010 +0200
+++ b/src/org/w3c/unicorn/action/LanguageAction.java	Tue Jul 27 19:39:27 2010 +0200
@@ -297,7 +297,7 @@
 			}
 			
 			MessageList messages = new MessageList();
-			messages.add(new Message(Message.INFO, "Thank you for your submission."));
+			messages.add(new Message(Message.INFO, "Thank you for your submission. It has been forwarded to a moderator. You will also receive an email with your translation attached if you'd like to review it."));
 			req.setAttribute("messages", messages);
 			req.setAttribute("submitted", true);
 			doGet(req, resp);

Received on Tuesday, 27 July 2010 17:39:49 UTC