The branch, eden-pre has been updated
via 58824665a73d2ef030047531cc7704649ff0a306 (commit)
from 54a66cadc88b93fd02fee66ffe5ba6637046f965 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=58824665a73d2ef030047531cc7704649ff0a306
commit 58824665a73d2ef030047531cc7704649ff0a306
Author: amet <[email protected]>
Date: Sat Jun 4 20:47:39 2011 +0400
[script.xbmc.subtitles] -v 2.9.10
- added: extra regex for "sXXepXX"
- added: New Service Legendas-Zone.org, thx HiGhLaNdR
diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 657071a..a4d40f9 100644
--- a/script.xbmc.subtitles/addon.xml
+++ b/script.xbmc.subtitles/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.xbmc.subtitles"
name="XBMC Subtitles"
- version="2.9.9"
+ version="2.9.10"
provider-name="Amet, mr_blobby">
<requires>
<import addon="xbmc.python" version="2.0"/>
@@ -17,13 +17,13 @@
<summary lang="nl">XBMC Ondertitels</summary>
<summary lang="bg">XBMC СÑбÑиÑÑи</summary>
<summary lang="pt">Legendas XBMC</summary>
- <description lang="en">Search and download subtitles from 19
websites:Bierdopje.com, Italiansubs.net, LegendasDivx.com, Legendas.tv,
Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net,
PT-SUBS.NET, theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Swesub.nu,
Subscenter.org, Titlovi.com, Titulky.com and Undertexter.se.Subtitle button on
OSD needs to be activated and path set to XBMC Subtitles under System-> Skin->
Addon Scripts</description>
- <description lang="es">Busca y descarga subtÃtulos de:Bierdopje.com,
Italiansubs.net, LegendasDivx.com, Legendas.tv, Napiprojekt.pl, OmniSubs.net,
Ondertitel.com, OpenSubtitles.org, Podnapisi.net, PT-SUBS.NET, theSubDB.com,
Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, Subscenter.org, Titlovi.com,
Titulky.com y Undertexter.se.El botón de subtitulos en el OSD debe ser
añadido, y la ruta al addon debe ponerse en Sistema-> Skin-> Addons de
Scripts</description>
+ <description lang="en">Search and download subtitles from 20
websites:Bierdopje.com, Italiansubs.net, Legendas-Zone.org, LegendasDivx.com,
Legendas.tv, Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org,
Podnapisi.net, PT-SUBS.NET, theSubDB.com, Subdivx.com, Sublight.si,
Subscene.com, Swesub.nu, Subscenter.org, Titlovi.com, Titulky.com and
Undertexter.se.Subtitle button on OSD needs to be activated and path set to
XBMC Subtitles under System-> Skin-> Addon Scripts</description>
+ <description lang="es">Busca y descarga subtÃtulos de:Bierdopje.com,
Italiansubs.net, Legendas-Zone.org, LegendasDivx.com, Legendas.tv,
Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net,
PT-SUBS.NET, theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Swesub.nu,
Subscenter.org, Titlovi.com, Titulky.com y Undertexter.se.El botón de
subtitulos en el OSD debe ser añadido, y la ruta al addon debe ponerse en
Sistema-> Skin-> Addons de Scripts</description>
<description lang="hu">Film feliratok keresése letöltése
az:Bierdopje.com, Italiansubs.net, Legendas.tv, Napiprojekt.pl, OmniSubs.net,
Ondertitel.com, OpenSubtitles.org, Podnapisi.net, theSubDB.com, Subdivx.com,
Sublight.si, Subscene.com, Swesub.nu, Subscenter.org, Titlovi.com, Titulky.com
és Undertexter.se webhelyekról.A dalszöveg OSD gombot aktiválni kell az
elérési út megadásával a BeállÃtások -> Skin -> Szkriptek
alatt.</description>
<description lang="sr">ÐÑеÑÑажи и Ñкини пÑеводе Ñа
19 веб ÑÑÑаниÑа:Bierdopje.com, Italiansubs.net, Legendas.tv,
Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net,
theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Subscenter.org,
Swesub.nu, Titlovi.com, Titulky.com и Undertexter.se.ÐÑгме за
пÑеводе на OSD ÑÑеба да Ñе акÑивиÑа и изабеÑе
XBMC Subtitles Ñ Ð¡Ð¸ÑÑем-> ÐаÑка-> СкÑипÑ
додаÑи</description>
<description lang="nl">Zoek en download ondertitels van 19
websites:Bierdopje.com, Italiansubs.net, Legendas.tv, Napiprojekt.pl,
OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, theSubDB.com,
Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, Subscenter.org, Titlovi.com,
Titulky.com en Undertexter.se.De ondertitel knop in het OSD scherm moet zijn
geactiveerd met het pad naar XBMC Subtitles via Systeem-> Skin-> Addon
Scripts.</description>
<description lang="bg"> ТÑÑÑи и ÑвалÑй ÑÑбÑиÑÑи оÑ
19 ÑебÑайÑа: Bierdopje.com, Italiansubs.net, Legendas.tv,
Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net,
theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Swesub.nu,
Subscenter.org, Titlovi.com, Titulky.com и Undertexter.se. ÐÑÑонÑÑ Ð·Ð°
ÑÑбÑиÑÑи в OSD менÑÑо над Ñилма ÑÑÑбва да
бÑде акÑивиÑан и пÑÑÑ ÐºÑм пÑиложениеÑо
ÑÑÑбва да бÑде Ñказан, каÑо и за двеÑе
оÑиваÑе в менÑÑо на СиÑÑема(System)-> Ðожа(Skin)->
Ðобавка(Addon Scripts)</description> <platform>all</platform>
- <description lang="pt">Procura e download de legendas em 19 websites:
Bierdopje.com, Italiansubs.net, LegendasDivx.com, Legendas.tv, Napiprojekt.pl,
OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, PT-SUBS.NET,
theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Swesub.nu,
Subscenter.org, Titlovi.com, Titulky.com e Undertexter.se. O botão das
legendas deve ser adicionado no OSD e o caminho põe-se em Sistema-> Skin->
Addons de Scripts</description>
+ <description lang="pt">Procura e download de legendas em 20 websites:
Bierdopje.com, Italiansubs.net, Legendas-Zone.org, LegendasDivx.com,
Legendas.tv, Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org,
Podnapisi.net, PT-SUBS.NET, theSubDB.com, Subdivx.com, Sublight.si,
Subscene.com, Swesub.nu, Subscenter.org, Titlovi.com, Titulky.com e
Undertexter.se. O botão das legendas deve ser adicionado no OSD e o caminho
põe-se em Sistema-> Skin-> Addons de Scripts</description>
<platform>all</platform>
</extension>
</addon>
diff --git a/script.xbmc.subtitles/changelog.txt
b/script.xbmc.subtitles/changelog.txt
index a66354c..e3cbb9f 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,7 @@
+2.9.10
+- added: extra regex for "sXXepXX"
+- added: New Service Legendas-Zone.org, thx HiGhLaNdR
+
2.9.9
- fixed: typo that was crashing on streamed videos, thx Araluccl0 for making
me look at this :)
- added: set sub_stream folder as subtitle download location for streamed
content
diff --git a/script.xbmc.subtitles/resources/language/English/strings.xml
b/script.xbmc.subtitles/resources/language/English/strings.xml
index 3035d1f..8901541 100644
--- a/script.xbmc.subtitles/resources/language/English/strings.xml
+++ b/script.xbmc.subtitles/resources/language/English/strings.xml
@@ -63,6 +63,8 @@
<string id="30135">- PTSubs Password</string>
<string id="30136">- OmniSubs Username</string>
<string id="30137">- OmniSubs Password</string>
+ <string id="30138">- LegendasZone Username</string>
+ <string id="30139">- LegendasZone Password</string>
<!-- Languages -->
diff --git a/script.xbmc.subtitles/resources/language/Portuguese
(Brazil)/strings.xml b/script.xbmc.subtitles/resources/language/Portuguese
(Brazil)/strings.xml
index fc4eaa6..5bf8e45 100644
--- a/script.xbmc.subtitles/resources/language/Portuguese (Brazil)/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Portuguese (Brazil)/strings.xml
@@ -60,6 +60,8 @@
<string id="30135">- PTSubs Senha</string>
<string id="30136">- OmniSubs Usuário</string>
<string id="30137">- OmniSubs Senha</string>
+ <string id="30138">- LegendasZone Usuário</string>
+ <string id="30139">- LegendasZone Senha</string>
<!-- Languages -->
diff --git a/script.xbmc.subtitles/resources/language/Portuguese/strings.xml
b/script.xbmc.subtitles/resources/language/Portuguese/strings.xml
index b66bcd0..fe62b6c 100644
--- a/script.xbmc.subtitles/resources/language/Portuguese/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Portuguese/strings.xml
@@ -60,6 +60,8 @@
<string id="30135">- PTSubs Password</string>
<string id="30136">- OmniSubs Utilizador</string>
<string id="30137">- OmniSubs Password</string>
+ <string id="30138">- LegendasZone Username</string>
+ <string id="30139">- LegendasZone Password</string>
<!-- Languages -->
diff --git a/script.xbmc.subtitles/resources/language/Spanish/strings.xml
b/script.xbmc.subtitles/resources/language/Spanish/strings.xml
index e3d5554..84c31c3 100644
--- a/script.xbmc.subtitles/resources/language/Spanish/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Spanish/strings.xml
@@ -60,6 +60,8 @@
<string id="30135">- PTSubs Password</string>
<string id="30136">- OmniSubs Username</string>
<string id="30137">- OmniSubs Password</string>
+ <string id="30138">- LegendasZone Username</string>
+ <string id="30139">- LegendasZone Password</string>
<!-- Languages -->
diff --git a/script.xbmc.subtitles/resources/lib/utilities.py
b/script.xbmc.subtitles/resources/lib/utilities.py
index f177ab7..2de1f56 100644
--- a/script.xbmc.subtitles/resources/lib/utilities.py
+++ b/script.xbmc.subtitles/resources/lib/utilities.py
@@ -93,6 +93,7 @@ def regex_tvshow(compare, file, sub = ""):
'[\\\\/\\._ -][0]*([0-9]+)x[0]*([0-9]+)[^\\/]*',
'[[Ss]([0-9]+)\]_\[[Ee]([0-9]+)([^\\/]*)',
#foo_[s01]_[e01]
'[\._ \-][Ss]([0-9]+)[\.\-]?[Ee]([0-9]+)([^\\/]*)',
#foo, s01e01, foo.s01.e01, foo.s01-e01
+ 's([0-9]+)ep([0-9]+)[^\\/]*',
#foo - s01ep03, foo - s1ep03
'[Ss]([0-9]+)[][ ._-]*[Ee]([0-9]+)([^\\\\/]*)$',
'[\\\\/\\._ \\[\\(-]([0-9]+)x([0-9]+)([^\\\\/]*)$'
]
diff --git a/script.xbmc.subtitles/resources/settings.xml
b/script.xbmc.subtitles/resources/settings.xml
index dba9e21..5878aec 100644
--- a/script.xbmc.subtitles/resources/settings.xml
+++ b/script.xbmc.subtitles/resources/settings.xml
@@ -43,6 +43,9 @@
<setting id="Subscenter" type="bool" label="Subscenter.org"
default="false"/>
<setting id="AsiaTeam" type="bool" label="Asia-Team.net"
default="false"/>
<setting id="Sratim" type="bool" label="Sratim.co.il" default="false"/>
+ <setting id="LegendasZone" type="bool" label="Legendas-Zone.org"
default="false"/>
+ <setting id="LZuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30138" default=""/>
+ <setting id="LZpass" type="text" option = "hidden" visible=
"eq(-2,true)" enable="eq(-2,true)" label="30139" default=""/> </category>
</category>
<category label="30106">
<setting id="defmovieservice" type="fileenum" mask="/" label="30113"
default="OpenSubtitles" values="/resources/lib/services" />
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.subtitles/addon.xml | 8 +-
script.xbmc.subtitles/changelog.txt | 4 +
.../resources/language/English/strings.xml | 2 +
.../language/Portuguese (Brazil)/strings.xml | 2 +
.../resources/language/Portuguese/strings.xml | 2 +
.../resources/language/Spanish/strings.xml | 2 +
.../{Argenteam => LegendasZone}/__init__.py | 0
.../resources/lib/services/LegendasZone/logo.png | Bin 0 -> 14311 bytes
.../resources/lib/services/LegendasZone/service.py | 557 ++++++++++++++++++++
script.xbmc.subtitles/resources/lib/utilities.py | 1 +
script.xbmc.subtitles/resources/settings.xml | 3 +
11 files changed, 577 insertions(+), 4 deletions(-)
copy script.xbmc.subtitles/resources/lib/services/{Argenteam =>
LegendasZone}/__init__.py (100%)
create mode 100644
script.xbmc.subtitles/resources/lib/services/LegendasZone/logo.png
create mode 100644
script.xbmc.subtitles/resources/lib/services/LegendasZone/service.py
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Discover what all the cheering's about.
Get your free trial download today.
http://p.sf.net/sfu/quest-dev2dev2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons