7:51 p.m.
于 2014/1/7 3:22, Aline Manera 写道:
On 01/06/2014 05:04 AM, Shu Ming wrote:
> Because of the dev.ui.thml file removal, the po files should also be
> updated
>
> Signed-off-by: Shu Ming <shuming(a)linux.vnet.ibm.com>
> ---
> po/en_US.po | 97
> +++++++++++++----------------------------------------------
> po/kimchi.pot | 97
> +++++++++++++----------------------------------------------
> po/pt_BR.po | 97
> +++++++++++++----------------------------------------------
> po/zh_CN.po | 97
> +++++++++++++----------------------------------------------
> 4 files changed, 84 insertions(+), 304 deletions(-)
>
> diff --git a/po/en_US.po b/po/en_US.po
> index f2810db..c3058f3 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: 2013-12-18 16:04-0200\n"
> +"POT-Creation-Date: 2014-01-05 22:33-0500\n"
> "PO-Revision-Date: 2013-07-11 17:32-0400\n"
> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
> "Language-Team: English\n"
> @@ -17,81 +17,6 @@ msgstr ""
> "Generated-By: pygettext.py 1.5\n"
> "Plural-Forms: nplurals=2; plural=(n != 1);\n"
> -msgid "Host"
> -msgstr "Host"
> -
> -msgid "Reboot"
> -msgstr "Reboot"
> -
> -msgid "Shutdown"
> -msgstr "Shutdown"
> -
> -msgid "SOS Report"
> -msgstr "SOS Report"
> -
> -msgid "Project Kimchi"
> -msgstr "Project Kimchi"
> -
> -msgid "Language:"
> -msgstr "Language:"
> -
> -msgid "Guests"
> -msgstr "Guests"
> -
> -msgid "Storage"
> -msgstr "Storage"
> -
> -msgid "Networks"
> -msgstr "Networks"
> -
> -msgid "Statistics"
> -msgstr "Statistics"
> -
> -msgid "About"
> -msgstr "About"
> -
> -msgid "Virtual Machines"
> -msgstr "Virtual Machines"
> -
> -msgid "Display"
> -msgstr "Display"
> -
> -msgid "Power On"
> -msgstr "Power On"
> -
> -msgid "Power Off"
> -msgstr "Power Off"
> -
> -msgid "Settings"
> -msgstr "Settings"
> -
> -msgid "Delete"
> -msgstr "Delete"
> -
> -msgid "More..."
> -msgstr "More..."
> -
> -msgid "Templates"
> -msgstr "Templates"
> -
> -msgid "Create VM"
> -msgstr "Create VM"
> -
> -msgid "Custom"
> -msgstr "Custom"
> -
> -msgid "Forum"
> -msgstr "Forum"
> -
> -msgid "API"
> -msgstr "API"
> -
> -msgid "Twitter"
> -msgstr "Twitter"
> -
> -msgid "IRC"
> -msgstr "IRC"
> -
I am not sure all those messages can be removed.
At least they are used in the current UI.
Don't be worried about it. This case
has been handled correctly.
Yes. We have some messages shared by several files. For example, the
"Delete" message. Here "-" means the message is removed because of
"dev.ui.html" removal. However, you can see there is a line '+msgid
"Delete"' under because "guest.html.tmpl" still use it. So
"Delete" will
not be removed and the only thing happen to it is the position in the po
file has been changed
> msgid "ERROR CODE"
> msgstr "ERROR CODE"
> @@ -177,6 +102,9 @@ msgstr "Actions"
> msgid "Edit"
> msgstr "Edit"
> +msgid "Delete"
> +msgstr "Delete"
> +
> msgid "Failed to list the template"
> msgstr "Failed to list the template"
> @@ -369,6 +297,18 @@ msgstr "The storage pool is not active now."
> msgid "Failed to delete template."
> msgstr "Failed to delete template."
> +msgid "Guests"
> +msgstr "Guests"
> +
> +msgid "Host"
> +msgstr "Host"
> +
> +msgid "Templates"
> +msgstr "Templates"
> +
> +msgid "Storage"
> +msgstr "Storage"
> +
> msgid "unavailable"
> msgstr "unavailable"
> @@ -456,6 +396,11 @@ msgid ""
> msgstr ""
> "The path of the Storage Pool. Each Storage Pool must have a unique
> path."
> +msgid ""
> +"Kimchi will try to create the directory when it does not already
> exist in "
> +"your system."
> +msgstr ""
> +
> msgid "NFS server IP"
> msgstr "NFS server IP"
> diff --git a/po/kimchi.pot b/po/kimchi.pot
> index 762f4e4..9747fdc 100644
> --- 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: 2013-12-18 16:04-0200\n"
> +"POT-Creation-Date: 2014-01-05 22:33-0500\n"
> "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> "Language-Team: LANGUAGE <LL(a)li.org>\n"
> @@ -17,81 +17,6 @@ msgstr ""
> "Content-Type: text/plain; charset=CHARSET\n"
> "Content-Transfer-Encoding: 8bit\n"
> -msgid "Host"
> -msgstr ""
> -
> -msgid "Reboot"
> -msgstr ""
> -
> -msgid "Shutdown"
> -msgstr ""
> -
> -msgid "SOS Report"
> -msgstr ""
> -
> -msgid "Project Kimchi"
> -msgstr ""
> -
> -msgid "Language:"
> -msgstr ""
> -
> -msgid "Guests"
> -msgstr ""
> -
> -msgid "Storage"
> -msgstr ""
> -
> -msgid "Networks"
> -msgstr ""
> -
> -msgid "Statistics"
> -msgstr ""
> -
> -msgid "About"
> -msgstr ""
> -
> -msgid "Virtual Machines"
> -msgstr ""
> -
> -msgid "Display"
> -msgstr ""
> -
> -msgid "Power On"
> -msgstr ""
> -
> -msgid "Power Off"
> -msgstr ""
> -
> -msgid "Settings"
> -msgstr ""
> -
> -msgid "Delete"
> -msgstr ""
> -
> -msgid "More..."
> -msgstr ""
> -
> -msgid "Templates"
> -msgstr ""
> -
> -msgid "Create VM"
> -msgstr ""
> -
> -msgid "Custom"
> -msgstr ""
> -
> -msgid "Forum"
> -msgstr ""
> -
> -msgid "API"
> -msgstr ""
> -
> -msgid "Twitter"
> -msgstr ""
> -
> -msgid "IRC"
> -msgstr ""
> -
> msgid "ERROR CODE"
> msgstr ""
> @@ -175,6 +100,9 @@ msgstr ""
> msgid "Edit"
> msgstr ""
> +msgid "Delete"
> +msgstr ""
> +
> msgid "Failed to list the template"
> msgstr ""
> @@ -358,6 +286,18 @@ msgstr ""
> msgid "Failed to delete template."
> msgstr ""
> +msgid "Guests"
> +msgstr ""
> +
> +msgid "Host"
> +msgstr ""
> +
> +msgid "Templates"
> +msgstr ""
> +
> +msgid "Storage"
> +msgstr ""
> +
> msgid "unavailable"
> msgstr ""
> @@ -436,6 +376,11 @@ msgid ""
> "The path of the Storage Pool. Each Storage Pool must have a unique
> path."
> msgstr ""
> +msgid ""
> +"Kimchi will try to create the directory when it does not already
> exist in "
> +"your system."
> +msgstr ""
> +
> msgid "NFS server IP"
> msgstr ""
> diff --git a/po/pt_BR.po b/po/pt_BR.po
> index 7d59503..c5702ff 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: 2013-12-18 16:04-0200\n"
> +"POT-Creation-Date: 2014-01-05 22:33-0500\n"
> "PO-Revision-Date: 2013-06-27 10:48+0000\n"
> "Last-Translator: Alexandre Hirata <hirata(a)linux.vnet.ibm.com>\n"
> "Language-Team: Aline Manera <alinefm(a)br.ibm.com>\n"
> @@ -33,81 +33,6 @@ msgstr ""
> "X-Poedit-Language: Portuguese\n"
> "X-Poedit-SourceCharset: utf-8\n"
> -msgid "Host"
> -msgstr "Hospedeiro"
> -
> -msgid "Reboot"
> -msgstr "Reiniciar"
> -
> -msgid "Shutdown"
> -msgstr "Desligar"
> -
> -msgid "SOS Report"
> -msgstr "Relatório SOS"
> -
> -msgid "Project Kimchi"
> -msgstr "Projeto Kimchi"
> -
> -msgid "Language:"
> -msgstr "Idioma:"
> -
> -msgid "Guests"
> -msgstr "Máquinas Virtuais"
> -
> -msgid "Storage"
> -msgstr "Storage"
> -
> -msgid "Networks"
> -msgstr "Redes"
> -
> -msgid "Statistics"
> -msgstr "Estatísticas"
> -
> -msgid "About"
> -msgstr "Sobre"
> -
> -msgid "Virtual Machines"
> -msgstr "Máquinas Virtuais"
> -
> -msgid "Display"
> -msgstr "Visor"
> -
> -msgid "Power On"
> -msgstr "Ligar"
> -
> -msgid "Power Off"
> -msgstr "Desligar"
> -
> -msgid "Settings"
> -msgstr "Configurações"
> -
> -msgid "Delete"
> -msgstr "Remover"
> -
> -msgid "More..."
> -msgstr "Mais..."
> -
> -msgid "Templates"
> -msgstr "Modelos"
> -
> -msgid "Create VM"
> -msgstr "Criar máquina virtual"
> -
> -msgid "Custom"
> -msgstr "Personalizar"
> -
> -msgid "Forum"
> -msgstr "Fórum"
> -
> -msgid "API"
> -msgstr "API"
> -
> -msgid "Twitter"
> -msgstr "Twitter"
> -
> -msgid "IRC"
> -msgstr "IRC"
> -
> msgid "ERROR CODE"
> msgstr "CÓDIGO DE ERRO"
> @@ -193,6 +118,9 @@ msgstr "Ações"
> msgid "Edit"
> msgstr "Editar"
> +msgid "Delete"
> +msgstr "Remover"
> +
> msgid "Failed to list the template"
> msgstr "Erro ao listar os modelos"
> @@ -386,6 +314,18 @@ msgstr "O storage pool não está ativo agora."
> msgid "Failed to delete template."
> msgstr "Erro ao remover modelo."
> +msgid "Guests"
> +msgstr "Máquinas Virtuais"
> +
> +msgid "Host"
> +msgstr "Hospedeiro"
> +
> +msgid "Templates"
> +msgstr "Modelos"
> +
> +msgid "Storage"
> +msgstr "Storage"
> +
> msgid "unavailable"
> msgstr "indisponível"
> @@ -472,6 +412,11 @@ msgid ""
> msgstr ""
> "O caminho do Storage Pool. Cada Storage Pool deve ter um único
> caminho."
> +msgid ""
> +"Kimchi will try to create the directory when it does not already
> exist in "
> +"your system."
> +msgstr ""
> +
> msgid "NFS server IP"
> msgstr "Endereço IP do servidor NFS"
> diff --git a/po/zh_CN.po b/po/zh_CN.po
> index de759ef..765e4f5 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: 2013-12-18 16:04-0200\n"
> +"POT-Creation-Date: 2014-01-05 22:33-0500\n"
> "PO-Revision-Date: 2013-06-27 10:48+0000\n"
> "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n"
> "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n"
> @@ -33,81 +33,6 @@ msgstr ""
> "X-Poedit-Language: Chinese\n"
> "X-Poedit-SourceCharset: utf-8\n"
> -msgid "Host"
> -msgstr "主机"
> -
> -msgid "Reboot"
> -msgstr "重启"
> -
> -msgid "Shutdown"
> -msgstr "关机"
> -
> -msgid "SOS Report"
> -msgstr "SOS报告"
> -
> -msgid "Project Kimchi"
> -msgstr "Kimchi项目"
> -
> -msgid "Language:"
> -msgstr "语言："
> -
> -msgid "Guests"
> -msgstr "客户机"
> -
> -msgid "Storage"
> -msgstr "存储"
> -
> -msgid "Networks"
> -msgstr "网络"
> -
> -msgid "Statistics"
> -msgstr "统计"
> -
> -msgid "About"
> -msgstr "关于"
> -
> -msgid "Virtual Machines"
> -msgstr "虚拟机"
> -
> -msgid "Display"
> -msgstr "显示"
> -
> -msgid "Power On"
> -msgstr "开机"
> -
> -msgid "Power Off"
> -msgstr "关机"
> -
> -msgid "Settings"
> -msgstr "设置"
> -
> -msgid "Delete"
> -msgstr "删除"
> -
> -msgid "More..."
> -msgstr "更多"
> -
> -msgid "Templates"
> -msgstr "模板"
> -
> -msgid "Create VM"
> -msgstr "创建虚机"
> -
> -msgid "Custom"
> -msgstr "定制"
> -
> -msgid "Forum"
> -msgstr "论坛"
> -
> -msgid "API"
> -msgstr "API"
> -
> -msgid "Twitter"
> -msgstr "推特"
> -
> -msgid "IRC"
> -msgstr "IRC"
> -
> msgid "ERROR CODE"
> msgstr "错误码"
> @@ -191,6 +116,9 @@ msgstr "操作"
> msgid "Edit"
> msgstr "编辑"
> +msgid "Delete"
> +msgstr "删除"
> +
> msgid "Failed to list the template"
> msgstr "展示模板列表失败"
> @@ -374,6 +302,18 @@ msgstr "存储池没有被启用"
> msgid "Failed to delete template."
> msgstr "删除模版失败"
> +msgid "Guests"
> +msgstr "客户机"
> +
> +msgid "Host"
> +msgstr "主机"
> +
> +msgid "Templates"
> +msgstr "模板"
> +
> +msgid "Storage"
> +msgstr "存储"
> +
> msgid "unavailable"
> msgstr "无法获取"
> @@ -454,6 +394,11 @@ msgid ""
> "The path of the Storage Pool. Each Storage Pool must have a unique
> path."
> msgstr "存储池的路径.每个存储池的路径是唯一的。"
> +msgid ""
> +"Kimchi will try to create the directory when it does not already
> exist in "
> +"your system."
> +msgstr ""
> +
> msgid "NFS server IP"
> msgstr "NFS服务器IP"