Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server
2011-03-12 12:40:04 +01:00

View File

@@ -66,7 +66,7 @@ function PMA_change_enc_order() {
* 2002/1/4 by Y.Kawada
*
* @param string the string to convert
* @param string the destinasion encoding code
* @param string the destination encoding code
* @param string set 'kana' convert to JIS-X208-kana
*
* @global string the available encoding codes list
@@ -99,7 +99,7 @@ function PMA_kanji_str_conv($str, $enc, $kana) {
* 2002/1/4 by Y.Kawada
*
* @param string the name of the file to convert
* @param string the destinasion encoding code
* @param string the destination encoding code
* @param string set 'kana' convert to JIS-X208-kana
*
* @return string the name of the converted file