From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Mon, 30 Apr 2007 12:02:37 +0000 (+0000)
Subject: * typo/better English, thanks to pfctdayelise
X-Git-Tag: 1.31.0-rc.0~53169
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=c8a1c5c1fc26626ba535a314645e8d7d3f48d830;p=lhc%2Fweb%2Fwiklou.git

* typo/better English, thanks to pfctdayelise
* typo in zh-classical
---

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 40fc283935..2d54aeb4de 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1365,10 +1365,10 @@ To include the image in a page, use a link in the form
 'largefileserver' => 'This file is bigger than the server is configured to allow.',
 'emptyfile'		      => 'The file you uploaded seems to be empty. This might be due to a typo in the file name. Please check whether you really want to upload this file.',
 'fileexists'		      => 'A file with this name exists already, please check <strong><tt>$1</tt></strong> if you are not sure if you want to change it.',
-'fileexists-extension'        => 'A file with a similiar name exists:<br />
+'fileexists-extension'        => 'A file with a similar name exists:<br />
 Name of the uploading file: <strong><tt>$1</tt></strong><br />
 Name of the existing file: <strong><tt>$2</tt></strong><br />
-The only difference is in the lower/uppercase of the extension. Please check the files for identity.',
+Please choose a different name.',
 'fileexists-thumb'             => "'''<center>Existing image</center>'''",
 'fileexists-thumbnail-yes'     => "The file seems to be an image of reduced size <i>(thumbnail)</i>. Please check the file <strong><tt>$1</tt></strong>.<br />
 If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.",
diff --git a/languages/messages/MessagesZh_classical.php b/languages/messages/MessagesZh_classical.php
index d348ac9f9b..54019fef98 100644
--- a/languages/messages/MessagesZh_classical.php
+++ b/languages/messages/MessagesZh_classical.php
@@ -44,7 +44,7 @@ $defaultDateFormat = 'zh';
 $dateFormats = array(
         'zh time' => 'H時i分',
         'zh date' => 'Y年Fj日',
-        'zh both' => 'Y年Fj日H時i',
+        'zh both' => 'Y年Fj日H時i分',
 );
 
 $linkTrail = '/^([a-z]+)(.*)$/sD';