merge sandbox to trunk for 1.4.4

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7723 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-09-28 07:24:47 +00:00
parent 200d63636c
commit b8299c8a65
683 changed files with 70982 additions and 69716 deletions

View file

@ -1,22 +1,22 @@
<?php
/**
* @file modules/krzip/lang/en.lang.php
* @author zero <zero@nzeo.com>
* @brief English language pack (Only basic contents are listed)
**/
// normal words
$lang->krzip = "Korean Zip Code";
$lang->krzip_server_hostname = "Server name for zip code checking";
$lang->krzip_server_port = "Server port for zip code checking";
$lang->krzip_server_query = "Server path for zip code checking";
// descriptions
$lang->about_krzip_server_hostname = "Please input the server's domain for checking zip codes and receiving the result list";
$lang->about_krzip_server_port = "Please input the server's port number for checking the zip code";
$lang->about_krzip_server_query = "Please input the query url that will be requested for checking the zip code";
// error messages
$lang->msg_not_exists_addr = "Target for searching doesn't exist";
$lang->msg_fail_to_socket_open = "Unabled to connect to zip code checking server";
?>
<?php
/**
* @file modules/krzip/lang/en.lang.php
* @author NHN (developers@xpressengine.com)
* @brief English language pack (Only basic contents are listed)
**/
// normal words
$lang->krzip = "Korean Zip Code";
$lang->krzip_server_hostname = "Server name for zip code checking";
$lang->krzip_server_port = "Server port for zip code checking";
$lang->krzip_server_query = "Server path for zip code checking";
// descriptions
$lang->about_krzip_server_hostname = "Please input the server's domain for checking zip codes and receiving the result list";
$lang->about_krzip_server_port = "Please input the server's port number for checking the zip code";
$lang->about_krzip_server_query = "Please input the query url that will be requested for checking the zip code";
// error messages
$lang->msg_not_exists_addr = "Target for searching doesn't exist";
$lang->msg_fail_to_socket_open = "Unabled to connect to zip code checking server";
?>