luci-0.11: merge r9353 and r9354

This commit is contained in:
Jo-Philipp Wich 2012-10-07 12:06:21 +00:00
commit fef33765a3
2 changed files with 9 additions and 8 deletions

View file

@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-10 03:41+0200\n" "POT-Creation-Date: 2009-06-10 03:41+0200\n"
"PO-Revision-Date: 2012-09-29 15:56+0200\n" "PO-Revision-Date: 2012-10-07 13:02+0200\n"
"Last-Translator: José Vicente <josevteg@gmail.com>\n" "Last-Translator: José Vicente <josevteg@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: es\n" "Language: es\n"
@ -202,7 +202,7 @@ msgid "Address"
msgstr "Dirección" msgstr "Dirección"
msgid "Address to access local relay bridge" msgid "Address to access local relay bridge"
msgstr "Dirección para acceder al puente seguro local" msgstr "Dirección para acceder al relay bridge"
msgid "Administration" msgid "Administration"
msgstr "Administración" msgstr "Administración"
@ -1947,13 +1947,13 @@ msgid "Relay"
msgstr "Relevo" msgstr "Relevo"
msgid "Relay Bridge" msgid "Relay Bridge"
msgstr "Puente con relevo" msgstr "Relay bridge"
msgid "Relay between networks" msgid "Relay between networks"
msgstr "Relevo entre redes" msgstr "Relay entre redes"
msgid "Relay bridge" msgid "Relay bridge"
msgstr "Puente de relevo" msgstr "Relay bridge"
msgid "Remote IPv4 address" msgid "Remote IPv4 address"
msgstr "Dirección IPv4 remota" msgstr "Dirección IPv4 remota"
@ -2457,7 +2457,7 @@ msgstr ""
"proteger el interfaz web y activar SSH." "proteger el interfaz web y activar SSH."
msgid "This IPv4 address of the relay" msgid "This IPv4 address of the relay"
msgstr "Dirección IPv4 del relevo" msgstr "Dirección IPv4 del relay"
msgid "" msgid ""
"This is a list of shell glob patterns for matching files and directories to " "This is a list of shell glob patterns for matching files and directories to "

View file

@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-12-21 23:08+0200\n" "POT-Creation-Date: 2009-12-21 23:08+0200\n"
"PO-Revision-Date: 2012-09-29 11:06+0200\n" "PO-Revision-Date: 2012-10-06 11:33+0200\n"
"Last-Translator: phantasm131 <phantasm131@gmail.com>\n" "Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
"Language-Team: QQ Group:75543259\n" "Language-Team: QQ Group:75543259\n"
"Language: zh_CN\n" "Language: zh_CN\n"
@ -1278,7 +1278,7 @@ msgid "Localise queries"
msgstr "本地化查询" msgstr "本地化查询"
msgid "Locked to channel %d used by %s" msgid "Locked to channel %d used by %s"
msgstr "信道已锁定为 %d 源于 %s " msgstr "信道已锁定为:%d ;源于:%s "
msgid "Log output level" msgid "Log output level"
msgstr "日志记录等级" msgstr "日志记录等级"
@ -2096,6 +2096,7 @@ msgstr "指定假设主机已丢失的最大时间(秒)"
msgid "Specify the secret encryption key here." msgid "Specify the secret encryption key here."
msgstr "在此指定密钥。" msgstr "在此指定密钥。"
# 关联了 启动项 和 接口>LAN>DHCP服务器>网址分配基址
msgid "Start" msgid "Start"
msgstr "开始" msgstr "开始"