luci-0.11: merge r9399-r9402 and r9412

diff --git a/applications/luci-ushare/luasrc/model/cbi/ushare.lua b/applications/luci-ushare/luasrc/model/cbi/ushare.lua
index 41f9612bb1e0826e55b5a4edb414e3d638189751..7032b2d5ce6b73c5a7127dd0dc6713e61c42f703 100644 (file)
--- a/applications/luci-ushare/luasrc/model/cbi/ushare.lua
+++ b/applications/luci-ushare/luasrc/model/cbi/ushare.lua
@@ -14,7 +14,7 @@ $Id$
 ]]--
 
 m = Map("ushare", translate("uShare"),
 ]]--
 
 m = Map("ushare", translate("uShare"),

-       translate("uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server component that provides UPnP media devices with information on available multimedia files."))
+       luci.util.pcdata(translate("uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server component that provides UPnP media devices with information on available multimedia files.")))

 
 s = m:section(TypedSection, "ushare", translate("Settings"))
 s.addremove = false
 
 s = m:section(TypedSection, "ushare", translate("Settings"))
 s.addremove = false

diff --git a/po/es/ddns.po b/po/es/ddns.po
index 2c6e959d8464060c0c020b112a7668b7c4f7f634..96f065c0f766ef09a1b0d60cabefaa333c0c0640 100644 (file)
--- a/po/es/ddns.po
+++ b/po/es/ddns.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-02 13:44+0100\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-02 13:44+0100\n"

-"PO-Revision-Date: 2012-08-22 17:43+0200\n"
+"PO-Revision-Date: 2012-09-15 21:46+0200\n"

 "Last-Translator: José Vicente <josevteg@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: es\n"
 "Last-Translator: José Vicente <josevteg@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: es\n"


@@ -66,7 +66,7 @@ msgid "Username"
 msgstr "Nombre de usuario"
 
 msgid "custom"
 msgstr "Nombre de usuario"
 
 msgid "custom"

-msgstr "Personalizado"
+msgstr "personalizado"

 
 # Hours
 msgid "h"
 
 # Hours
 msgid "h"

diff --git a/po/es/minidlna.po b/po/es/minidlna.po
index 8b68563caa14aa50042544121c1b7755219fcddc..e6bd925330a0bd98cc1f86d476b9551509d9ba2c 100644 (file)
--- a/po/es/minidlna.po
+++ b/po/es/minidlna.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"PO-Revision-Date: 2012-08-26 20:15+0200\n"
+"PO-Revision-Date: 2012-09-15 21:48+0200\n"

 "Last-Translator: José Vicente <josevteg@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es\n"
 "Last-Translator: José Vicente <josevteg@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es\n"


@@ -127,7 +127,7 @@ msgstr "Inotify descubrirá automáticamente nuevos ficheros."
 msgid ""
 "Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
 "supporting HMO."
 msgid ""
 "Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
 "supporting HMO."

-msgstr "Envío de ficheros .jpg y .mp3 a un TIVO usando HMO."
+msgstr "Envío de ficheros .jpg y .mp3 a un TiVo usando HMO."

 
 msgid ""
 "Set this to strictly adhere to DLNA standards. This will allow server-side "
 
 msgid ""
 "Set this to strictly adhere to DLNA standards. This will allow server-side "

diff --git a/po/es/olsr.po b/po/es/olsr.po
index eb5ebef524aadc615c6121b3345f9e72971fea47..fe311ce2f1cb3464d8bb7d7931ec4c8ffee05caf 100644 (file)
--- a/po/es/olsr.po
+++ b/po/es/olsr.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"
 "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-02 08:33+0200\n"
+"PO-Revision-Date: 2012-09-15 21:36+0200\n"

 "Last-Translator: José Vicente <josevteg@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: es\n"
 "Last-Translator: José Vicente <josevteg@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: es\n"


@@ -276,19 +276,19 @@ msgid "Known OLSR routes"
 msgstr "Rutas OLSR conocidas"
 
 msgid "LQ"
 msgstr "Rutas OLSR conocidas"
 
 msgid "LQ"

-msgstr "CE"
+msgstr "LQ"

 
 msgid "LQ aging"
 
 msgid "LQ aging"

-msgstr "Envejecimiento de CE"
+msgstr "LQ - Envejecimiento"

 
 msgid "LQ algorithm"
 
 msgid "LQ algorithm"

-msgstr "Algoritmo para CE"
+msgstr "LQ - Algoritmo"

 
 msgid "LQ fisheye"
 
 msgid "LQ fisheye"

-msgstr "Ojo de pez CE"
+msgstr "LQ - Ojo de pez"

 
 msgid "LQ level"
 
 msgid "LQ level"

-msgstr "Nivel CE"
+msgstr "LQ - Nivel"

 
 msgid "Last hop"
 msgstr "Último salto"
 
 msgid "Last hop"
 msgstr "Último salto"

diff --git a/po/pl/diag_core.po b/po/pl/diag_core.po
index 796b9f7dbd527b970fae38087706d68d33d80c72..0935fdbfa0d6fe59489c0f3f8ed689505be3560e 100644 (file)
--- a/po/pl/diag_core.po
+++ b/po/pl/diag_core.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"PO-Revision-Date: 2011-09-14 13:18+0200\n"
+"PO-Revision-Date: 2012-09-08 13:17+0200\n"

 "Last-Translator: Staszek <fistaszek@tlen.pl>\n"
 "Language-Team: none\n"
 "Language: pl\n"
 "Last-Translator: Staszek <fistaszek@tlen.pl>\n"
 "Language-Team: none\n"
 "Language: pl\n"


@@ -10,7 +10,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"

-"X-Generator: Pootle 2.0.4\n"
+"X-Generator: Pootle 2.0.6\n"

 
 msgid "Configure Diagnostics"
 msgstr "Konfiguracja diagnostyki"
 
 msgid "Configure Diagnostics"
 msgstr "Konfiguracja diagnostyki"