[Kimchi-devel] [PATCH v2 2/2] Translations after underscore addition

Sheldon shaohef at linux.vnet.ibm.com
Wed Jul 2 15:25:40 UTC 2014


On 07/02/2014 02:31 AM, Christy Perez wrote:
> Signed-off-by: Christy Perez <christy at linux.vnet.ibm.com>
> ---
>   po/en_US.po   | 78 ++++++++++++++++++++++++++++++++---------------------------
>   po/kimchi.pot | 64 +++++++++++++++++++++++++-----------------------
>   po/pt_BR.po   | 78 ++++++++++++++++++++++++++++++++---------------------------
>   po/zh_CN.po   | 68 +++++++++++++++++++++++++++------------------------
>   4 files changed, 156 insertions(+), 132 deletions(-)
>
> diff --git a/po/en_US.po b/po/en_US.po
> index 933d4eb..56ddb64 100644
> --- a/po/en_US.po
> +++ b/po/en_US.po
> @@ -6,7 +6,7 @@ msgid ""
>   msgstr ""
>   "Project-Id-Version: kimchi 0.1\n"
>   "Report-Msgid-Bugs-To: \n"
> -"POT-Creation-Date: 2014-06-27 13:27-0300\n"
> +"POT-Creation-Date: 2014-07-01 12:51-0500\n"
>   "PO-Revision-Date: 2013-07-11 17:32-0400\n"
>   "Last-Translator: Crístian Viana <vianac at linux.vnet.ibm.com>\n"
>   "Language-Team: English\n"
> @@ -703,9 +703,11 @@ msgid "You should give a name for the debug file report."
>   msgstr "You should give a name for the debug file report."
>   
>   msgid ""
> -"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."
> +"Name should be a string. Only letters, digits, underscore ('_') and hyphen "
> +"('-') are allowed."
>   msgstr ""
> -"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."
> +"Name should be a string. Only letters, digits, underscore ('_') and hyphen "
> +"('-') are allowed."
>   
>   #, python-format
>   msgid ""
> @@ -1036,9 +1038,33 @@ msgstr "Detach"
>   msgid "Cancel"
>   msgstr "Cancel"
>   
> +msgid "Start"
> +msgstr "Start"
> +
> +msgid "Reset"
> +msgstr "Reset"
> +
> +msgid "Power Off"
> +msgstr "Power Off"
> +
> +msgid "Actions"
> +msgstr "Actions"
> +
> +msgid "Connect"
> +msgstr "Connect"
> +
>   msgid "Manage Media"
>   msgstr "Manage Media"
>   
> +msgid "Edit"
> +msgstr "Edit"
> +
> +msgid "Shut Down"
> +msgstr "Shut Down"
> +
> +msgid "Delete"
> +msgstr "Delete"
> +
>   msgid "Add a Storage Device to VM"
>   msgstr "Add a Storage Device to VM"
>   
> @@ -1082,30 +1108,6 @@ msgstr "The ISO file path in the server for CDROM."
>   msgid "Attach"
>   msgstr "Attach"
>   
> -msgid "Start"
> -msgstr "Start"
> -
> -msgid "Reset"
> -msgstr "Reset"
> -
> -msgid "Power Off"
> -msgstr "Power Off"
> -
> -msgid "Actions"
> -msgstr "Actions"
> -
> -msgid "Connect"
> -msgstr "Connect"
> -
> -msgid "Edit"
> -msgstr "Edit"
> -
> -msgid "Shut Down"
> -msgstr "Shut Down"
> -
> -msgid "Delete"
> -msgstr "Delete"
> -
>   msgid "The username or password you entered is incorrect. Please try again."
>   msgstr "The username or password you entered is incorrect. Please try again."
>   
> @@ -1317,8 +1319,12 @@ msgstr "Rename"
>   msgid "Download"
>   msgstr "Download"
>   
> -msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')."
> -msgstr "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')."
> +msgid ""
> +"Report name should contain only letters, digits, underscore ('_') and/or "
> +"hyphen ('-')."
> +msgstr ""
> +"Report name should contain only letters, digits, underscore ('_') and/or "
> +"hyphen ('-')."
>   
>   msgid "Pending..."
>   msgstr "Pending..."
> @@ -1483,8 +1489,8 @@ msgstr "Log out"
>   msgid "Version:"
>   msgstr "Version:"
>   
> -msgid "Log In"
> -msgstr "Log In"
> +msgid "Session timeout, please re-login."
> +msgstr "Session timeout, please re-login."
>   
>   msgid "User Name"
>   msgstr "User Name"
> @@ -1492,8 +1498,8 @@ msgstr "User Name"
>   msgid "Password"
>   msgstr "Password"
>   
> -msgid "Session timeout, please re-login."
> -msgstr "Session timeout, please re-login."
> +msgid "Log In"
> +msgstr "Log In"
>   
>   msgid "Generate a New Debug Report"
>   msgstr "Generate a New Debug Report"
> @@ -1503,10 +1509,12 @@ msgstr "Report Name"
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
> -"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")."
> +"based on current time. Name can contain: letters, digits, underscore (\"_\") "
> +"and hyphen (\"-\")."
>   msgstr ""
>   "The name used to identify the report. If omitted, a name will be chosen "
> -"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")."
> +"based on current time. Name can contain: letters, digits, underscore (\"_\") "
> +"and hyphen (\"-\")."
>   
>   msgid "Add a Repository"
>   msgstr "Add a Repository"
> diff --git a/po/kimchi.pot b/po/kimchi.pot
> index ec76045..3d1beed 100755
> --- a/po/kimchi.pot
> +++ b/po/kimchi.pot
> @@ -8,7 +8,7 @@ msgid ""
>   msgstr ""
>   "Project-Id-Version: PACKAGE VERSION\n"
>   "Report-Msgid-Bugs-To: \n"
> -"POT-Creation-Date: 2014-06-27 13:27-0300\n"
> +"POT-Creation-Date: 2014-07-01 12:51-0500\n"
>   "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
>   "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
>   "Language-Team: LANGUAGE <LL at li.org>\n"
> @@ -660,7 +660,8 @@ msgid "You should give a name for the debug file report."
>   msgstr ""
>   
>   msgid ""
> -"Name should be a string. Only letters, digits and hyphen ('-') are allowed."
> +"Name should be a string. Only letters, digits, underscore ('_') and hyphen "
> +"('-') are allowed."
>   msgstr ""
>   
>   #, python-format
> @@ -978,72 +979,72 @@ msgstr ""
>   msgid "Cancel"
>   msgstr ""
>   
> -msgid "Manage Media"
> +msgid "Start"
>   msgstr ""
>   
> -msgid "Add a Storage Device to VM"
> +msgid "Reset"
>   msgstr ""
>   
> -msgid "Device Name"
> +msgid "Power Off"
>   msgstr ""
>   
> -msgid ""
> -"The name used to identify the device. If omitted, a name will be chosen "
> -"automatically."
> +msgid "Actions"
>   msgstr ""
>   
> -msgid "Device Type"
> +msgid "Connect"
>   msgstr ""
>   
> -msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
> +msgid "Manage Media"
>   msgstr ""
>   
> -msgid "Device Bus"
> +msgid "Edit"
>   msgstr ""
>   
> -msgid "Storage Pool"
> +msgid "Shut Down"
>   msgstr ""
>   
> -msgid "Storage pool which volume located in"
> +msgid "Delete"
>   msgstr ""
>   
> -msgid "Storage Volume"
> +msgid "Add a Storage Device to VM"
>   msgstr ""
>   
> -msgid "Storage volume to be attached"
> +msgid "Device Name"
>   msgstr ""
>   
> -msgid "File Path"
> +msgid ""
> +"The name used to identify the device. If omitted, a name will be chosen "
> +"automatically."
>   msgstr ""
>   
> -msgid "The ISO file path in the server for CDROM."
> +msgid "Device Type"
>   msgstr ""
>   
> -msgid "Attach"
> +msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
>   msgstr ""
>   
> -msgid "Start"
> +msgid "Device Bus"
>   msgstr ""
>   
> -msgid "Reset"
> +msgid "Storage Pool"
>   msgstr ""
>   
> -msgid "Power Off"
> +msgid "Storage pool which volume located in"
>   msgstr ""
>   
> -msgid "Actions"
> +msgid "Storage Volume"
>   msgstr ""
>   
> -msgid "Connect"
> +msgid "Storage volume to be attached"
>   msgstr ""
>   
> -msgid "Edit"
> +msgid "File Path"
>   msgstr ""
>   
> -msgid "Shut Down"
> +msgid "The ISO file path in the server for CDROM."
>   msgstr ""
>   
> -msgid "Delete"
> +msgid "Attach"
>   msgstr ""
>   
>   msgid "The username or password you entered is incorrect. Please try again."
> @@ -1249,7 +1250,9 @@ msgstr ""
>   msgid "Download"
>   msgstr ""
>   
> -msgid "Report name should contain only letters, digits and/or hyphen ('-')."
> +msgid ""
> +"Report name should contain only letters, digits, underscore ('_') and/or "
> +"hyphen ('-')."
>   msgstr ""
>   
>   msgid "Pending..."
> @@ -1398,7 +1401,7 @@ msgstr ""
>   msgid "Version:"
>   msgstr ""
>   
> -msgid "Log In"
> +msgid "Session timeout, please re-login."
>   msgstr ""
>   
>   msgid "User Name"
> @@ -1407,7 +1410,7 @@ msgstr ""
>   msgid "Password"
>   msgstr ""
>   
> -msgid "Session timeout, please re-login."
> +msgid "Log In"
>   msgstr ""
>   
>   msgid "Generate a New Debug Report"
> @@ -1418,7 +1421,8 @@ msgstr ""
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
> -"based on current time. Name can contain: letters, digits and hyphen (\"-\")."
> +"based on current time. Name can contain: letters, digits, underscore (\"_\") "
> +"and hyphen (\"-\")."
>   msgstr ""
>   
>   msgid "Add a Repository"
> diff --git a/po/pt_BR.po b/po/pt_BR.po
> index adcfd11..289d098 100644
> --- a/po/pt_BR.po
> +++ b/po/pt_BR.po
> @@ -20,7 +20,7 @@ msgid ""
>   msgstr ""
>   "Project-Id-Version: kimchi 1.0\n"
>   "Report-Msgid-Bugs-To: \n"
> -"POT-Creation-Date: 2014-06-27 13:27-0300\n"
> +"POT-Creation-Date: 2014-07-01 12:51-0500\n"
>   "PO-Revision-Date: 2013-06-27 10:48+0000\n"
>   "Last-Translator: Crístian Viana <vianac at linux.vnet.ibm.com>\n"
>   "Language-Team: Aline Manera <alinefm at br.ibm.com>\n"
> @@ -748,9 +748,11 @@ msgid "You should give a name for the debug file report."
>   msgstr "Você deve dar um nome para o arquivo do relatório de debug."
>   
>   msgid ""
> -"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."
> +"Name should be a string. Only letters, digits, underscore ('_') and hyphen "
> +"('-') are allowed."
>   msgstr ""
> -"Nome deve ser uma string. Somente letras, digitos, sublinhar ('_') e hífem ('-') são permitidos."
> +"Nome deve ser uma string. Somente letras, digitos, sublinhar ('_') e hífem "
> +"('-') são permitidos."
>   
>   #, python-format
>   msgid ""
> @@ -1097,9 +1099,33 @@ msgstr "Remover"
>   msgid "Cancel"
>   msgstr "Cancelar"
>   
> +msgid "Start"
> +msgstr "Iniciar"
> +
> +msgid "Reset"
> +msgstr "Reiniciar"
> +
> +msgid "Power Off"
> +msgstr "Forçar desligamento"
> +
> +msgid "Actions"
> +msgstr "Ações"
> +
> +msgid "Connect"
> +msgstr "Conectar"
> +
>   msgid "Manage Media"
>   msgstr "Gerenciar mídia"
>   
> +msgid "Edit"
> +msgstr "Editar"
> +
> +msgid "Shut Down"
> +msgstr "Desligar"
> +
> +msgid "Delete"
> +msgstr "Remover"
> +
>   msgid "Add a Storage Device to VM"
>   msgstr "Adicionar um dispositivo de storage à VM"
>   
> @@ -1144,30 +1170,6 @@ msgstr "O caminho do arquivo ISO no servidor para o CDROM."
>   msgid "Attach"
>   msgstr "Conectar"
>   
> -msgid "Start"
> -msgstr "Iniciar"
> -
> -msgid "Reset"
> -msgstr "Reiniciar"
> -
> -msgid "Power Off"
> -msgstr "Forçar desligamento"
> -
> -msgid "Actions"
> -msgstr "Ações"
> -
> -msgid "Connect"
> -msgstr "Conectar"
> -
> -msgid "Edit"
> -msgstr "Editar"
> -
> -msgid "Shut Down"
> -msgstr "Desligar"
> -
> -msgid "Delete"
> -msgstr "Remover"
> -
>   msgid "The username or password you entered is incorrect. Please try again."
>   msgstr ""
>   "O usuário ou senha inseridos estão incorretos. Por favor, tente novamente."
> @@ -1381,8 +1383,12 @@ msgstr "Renomear"
>   msgid "Download"
>   msgstr "Baixar"
>   
> -msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')."
> -msgstr "Nome do relatório deve apenas conter letras, números, sublinhar ('_') e/ou hífen ('-')."
> +msgid ""
> +"Report name should contain only letters, digits, underscore ('_') and/or "
> +"hyphen ('-')."
> +msgstr ""
> +"Nome do relatório deve apenas conter letras, números, sublinhar ('_') e/ou "
> +"hífen ('-')."
>   
>   msgid "Pending..."
>   msgstr "Pendente..."
> @@ -1547,8 +1553,8 @@ msgstr "Sair"
>   msgid "Version:"
>   msgstr "Versão:"
>   
> -msgid "Log In"
> -msgstr "Entrar"
> +msgid "Session timeout, please re-login."
> +msgstr "Fim do limite do tempo da sessão, por favor se autentique novamente."
>   
>   msgid "User Name"
>   msgstr "Usuário"
> @@ -1556,8 +1562,8 @@ msgstr "Usuário"
>   msgid "Password"
>   msgstr "Senha"
>   
> -msgid "Session timeout, please re-login."
> -msgstr "Fim do limite do tempo da sessão, por favor se autentique novamente."
> +msgid "Log In"
> +msgstr "Entrar"
>   
>   msgid "Generate a New Debug Report"
>   msgstr "Gerar um novo relatório de depuração"
> @@ -1567,10 +1573,12 @@ msgstr "Nome do Relatório"
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
> -"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")."
> +"based on current time. Name can contain: letters, digits, underscore (\"_\") "
> +"and hyphen (\"-\")."
>   msgstr ""
>   "Se o nome do relatório for omitido, será escolhido um nome baseado no "
> -"horário atual. O nome pode conter: letras, números, sublinhar ('_') e hífen ('-')."
> +"horário atual. O nome pode conter: letras, números, sublinhar ('_') e hífen "
> +"('-')."
>   
>   msgid "Add a Repository"
>   msgstr "Adicionar um Repositório"
> diff --git a/po/zh_CN.po b/po/zh_CN.po
> index a3b5dcb..6a67e66 100644
> --- a/po/zh_CN.po
> +++ b/po/zh_CN.po
> @@ -20,7 +20,7 @@ msgid ""
>   msgstr ""
>   "Project-Id-Version: kimchi 0.1\n"
>   "Report-Msgid-Bugs-To: \n"
> -"POT-Creation-Date: 2014-06-27 13:27-0300\n"
> +"POT-Creation-Date: 2014-07-01 12:51-0500\n"
>   "PO-Revision-Date: 2013-06-27 10:48+0000\n"
>   "Last-Translator: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
>   "Language-Team: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
> @@ -680,7 +680,8 @@ msgid "You should give a name for the debug file report."
>   msgstr "应该为诊断文件报告指定一个名字。"
>   
>   msgid ""
> -"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."
> +"Name should be a string. Only letters, digits, underscore ('_') and hyphen "
> +"('-') are allowed."
>   msgstr "名字必须是一个字符串。只允许字母、下划线 ('_') 数字和连字符 ('-')。"

"名字必须是一个字符串。只允许字母、数字、下划线 ('_') 和连字符 ('-')。"

is more better.

>   
>   #, python-format
> @@ -998,9 +999,33 @@ msgstr "卸载"
>   msgid "Cancel"
>   msgstr "取消"
>   
> +msgid "Start"
> +msgstr "启用"
> +
> +msgid "Reset"
> +msgstr "重置"
> +
> +msgid "Power Off"
> +msgstr "关闭电源"
> +
> +msgid "Actions"
> +msgstr "操作"
> +
> +msgid "Connect"
> +msgstr "连接到"
> +
>   msgid "Manage Media"
>   msgstr "管理光盘介质"
>   
> +msgid "Edit"
> +msgstr "编辑"
> +
> +msgid "Shut Down"
> +msgstr "关机"
> +
> +msgid "Delete"
> +msgstr "删除"
> +
>   msgid "Add a Storage Device to VM"
>   msgstr "为虚拟机添加一个存储设备"
>   
> @@ -1042,30 +1067,6 @@ msgstr "服务器端CDROM所使用的ISO文件路径"
>   msgid "Attach"
>   msgstr "装载"
>   
> -msgid "Start"
> -msgstr "启用"
> -
> -msgid "Reset"
> -msgstr "重置"
> -
> -msgid "Power Off"
> -msgstr "关闭电源"
> -
> -msgid "Actions"
> -msgstr "操作"
> -
> -msgid "Connect"
> -msgstr "连接到"
> -
> -msgid "Edit"
> -msgstr "编辑"
> -
> -msgid "Shut Down"
> -msgstr "关机"
> -
> -msgid "Delete"
> -msgstr "删除"
> -
>   msgid "The username or password you entered is incorrect. Please try again."
>   msgstr "用户名或密码错误,请重新输入。"
>   
> @@ -1270,7 +1271,9 @@ msgstr "重命名"
>   msgid "Download"
>   msgstr "下载"
>   
> -msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')."
> +msgid ""
> +"Report name should contain only letters, digits, underscore ('_') and/or "
> +"hyphen ('-')."
>   msgstr "报告名字中只能包含字母、下划线 ('_') 数字或连字符(-)。"
>   
>   msgid "Pending..."
> @@ -1421,8 +1424,8 @@ msgstr "登出"
>   msgid "Version:"
>   msgstr "版本:"
>   
> -msgid "Log In"
> -msgstr "登录"
> +msgid "Session timeout, please re-login."
> +msgstr "登录超时,请重新登录。"
>   
>   msgid "User Name"
>   msgstr "用户名"
> @@ -1430,8 +1433,8 @@ msgstr "用户名"
>   msgid "Password"
>   msgstr "密码"
>   
> -msgid "Session timeout, please re-login."
> -msgstr "登录超时,请重新登录。"
> +msgid "Log In"
> +msgstr "登录"
>   
>   msgid "Generate a New Debug Report"
>   msgstr "产生一个新的诊断报告"
> @@ -1441,7 +1444,8 @@ msgstr "诊断报告名"
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
> -"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")."
> +"based on current time. Name can contain: letters, digits, underscore (\"_\") "
> +"and hyphen (\"-\")."
>   msgstr ""
>   "名字用来标识诊断报告。如果省略,将会基于当前时间生成一个新名字。名字中可以包"
>   "含字母、下划线 ('_') 数字和连字符(-)"


-- 
Thanks and best regards!

Sheldon Feng(冯少合)<shaohef at linux.vnet.ibm.com>
IBM Linux Technology Center




More information about the Kimchi-devel mailing list