summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-10-07 12:06:21 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-10-07 12:06:21 +0000
commitfef33765a35cdabd4c27038628d9c4705e9ef8f6 (patch)
treeaf3d8fb4935ad066bf157e8ce1704d898ac7f194
parente01533db7caab9a4961af96bf326cc32c819f356 (diff)
parent876f6c703d5be111973dc7f3e20e75f6ce502218 (diff)
luci-0.11: merge r9353 and r9354
-rw-r--r--po/es/base.po12
-rw-r--r--po/zh_CN/base.po5
2 files changed, 9 insertions, 8 deletions
diff --git a/po/es/base.po b/po/es/base.po
index 41c5ef6fdd..b5bad63cf1 100644
--- a/po/es/base.po
+++ b/po/es/base.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: es\n"
@@ -202,7 +202,7 @@ msgid "Address"
msgstr "Dirección"
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"
msgstr "Administración"
@@ -1947,13 +1947,13 @@ msgid "Relay"
msgstr "Relevo"
msgid "Relay Bridge"
-msgstr "Puente con relevo"
+msgstr "Relay bridge"
msgid "Relay between networks"
-msgstr "Relevo entre redes"
+msgstr "Relay entre redes"
msgid "Relay bridge"
-msgstr "Puente de relevo"
+msgstr "Relay bridge"
msgid "Remote IPv4 address"
msgstr "Dirección IPv4 remota"
@@ -2457,7 +2457,7 @@ msgstr ""
"proteger el interfaz web y activar SSH."
msgid "This IPv4 address of the relay"
-msgstr "Dirección IPv4 del relevo"
+msgstr "Dirección IPv4 del relay"
msgid ""
"This is a list of shell glob patterns for matching files and directories to "
diff --git a/po/zh_CN/base.po b/po/zh_CN/base.po
index 13b4e14002..4dad89eeee 100644
--- a/po/zh_CN/base.po
+++ b/po/zh_CN/base.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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"
"Language-Team: QQ Group:75543259\n"
"Language: zh_CN\n"
@@ -1278,7 +1278,7 @@ msgid "Localise queries"
msgstr "本地化查询"
msgid "Locked to channel %d used by %s"
-msgstr "信道已锁定为 %d 源于 %s "
+msgstr "信道已锁定为:%d ;源于:%s "
msgid "Log output level"
msgstr "日志记录等级"
@@ -2096,6 +2096,7 @@ msgstr "指定假设主机已丢失的最大时间(秒)"
msgid "Specify the secret encryption key here."
msgstr "在此指定密钥。"
+# 关联了 启动项 和 接口>LAN>DHCP服务器>网址分配基址
msgid "Start"
msgstr "开始"