Skip to content

Commit bebd266

Browse files
author
Zeljko Ametovic
committed
- new main xml, thanks ronie.
- removed all other skin specific windows, will be added if the skins are made compatible with 10.05 - check if subtitle already exists and notify the user if it does.
1 parent 10d0b39 commit bebd266

35 files changed

+445
-2167
lines changed

‎script.xbmc.subtitles/changelog.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
1.6.3
22
- enabled Sublight download wait
33
- added download delay notification for sublight service
4+
- new main xml, thanks ronie.
5+
- removed all other skin specific windows, will be added if the skins are made compatible with 10.05
6+
- check if subtitle already exists and notify the user if it does.
47

58
1.6.2
69
- changed thumbnail to icon.png

‎script.xbmc.subtitles/default.py‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,23 @@
3030
if xbmc.getCondVisibility('Player.Paused'): xbmc.Player().pause() # if Paused, un-pause
3131
else:
3232
skin = "main"
33-
skin1 = str(xbmc.getSkinDir().lower())
34-
skin1 = skin1.replace("-"," ")
35-
skin1 = skin1.replace("."," ")
36-
skin1 = skin1.replace("_"," ")
37-
if ( skin1.find( "eedia" ) > -1 ):
38-
skin = "MiniMeedia"
39-
elif ( skin1.find( "tream" ) > -1 ):
40-
skin = "MediaStream"
41-
elif ( skin1.find( "edux" ) > -1 ):
42-
skin = "MediaStream_Redux"
43-
elif ( skin1.find( "aeon" ) > -1 ):
44-
skin = "Aeon"
45-
elif ( skin1.find( "alaska" ) > -1 ):
46-
skin = "Alaska"
47-
elif ( skin1.find( "confluence" ) > -1 ):
48-
skin = "confluence"
33+
# skin1 = str(xbmc.getSkinDir().lower())
34+
# skin1 = skin1.replace("-"," ")
35+
# skin1 = skin1.replace("."," ")
36+
# skin1 = skin1.replace("_"," ")
37+
# if ( skin1.find( "eedia" ) > -1 ):
38+
# skin = "MiniMeedia"
39+
# elif ( skin1.find( "tream" ) > -1 ):
40+
# skin = "MediaStream"
41+
# elif ( skin1.find( "edux" ) > -1 ):
42+
# skin = "MediaStream_Redux"
43+
# elif ( skin1.find( "aeon" ) > -1 ):
44+
# skin = "Aeon"
45+
# elif ( skin1.find( "alaska" ) > -1 ):
46+
# skin = "Alaska"
4947

50-
print " XBMC Subtitles version [ %s ]\nSkin Folder: [ %s ]\nXBMC Subtitles skin XML: [ %s ]" % (__version__,skin1,skin,)
48+
49+
# print " XBMC Subtitles version [ %s ]\nSkin Folder: [ %s ]\nXBMC Subtitles skin XML: [ %s ]" % (__version__,skin1,skin,)
5150

5251

5352

‎script.xbmc.subtitles/description.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
<minversion>
1212
<xbmc>28764</xbmc>
1313
</minversion>
14-
<summary>XBMC Subtitles</summary>
15-
<description>Search and download subtitles from OpenSubtitles.org, Podnapisi.net and Sublight.si. Subtitle button on OSD needs to be activated and path set to XBMC Subtitles under Settings-> Skin-> Scripts</description>
14+
<summary lang="en">XBMC Subtitles</summary>
15+
<description lang="en">Search and download subtitles from OpenSubtitles.org, Podnapisi.net and Sublight.si. Subtitle button on OSD needs to be activated and path set to XBMC Subtitles under Settings-> Skin-> Scripts</description>
16+
<description lang="sr">Претражи и скини преводе са OpenSubtitles.org, Podnapisi.net and Sublight.si. Дугме за преводе на OSD треба да се активира и изабере XBMC Subtitles у Settings-> Skin-> Scripts</description>
17+
1618
<author>Amet</author>
1719
</addoninfo>

‎script.xbmc.subtitles/resources/language/English/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<string id="645">Download cancelled</string>
2020
<string id="647">by hash...</string>
2121
<string id="648">by name...</string>
22-
22+
<string id="655">Local subtitle available</string>
2323

2424
<!-- OSDB Messages -->
2525
<string id="730">OSDB server name missing</string>

‎script.xbmc.subtitles/resources/language/Serbian (Cyrilic)/strings.xml‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2+
<strings>
3+
<string id="30300">XBMC Subtitles</string>
4+
<string id="30301"></string>
5+
<string id="30302">Amet</string>
6+
7+
8+
9+
<!-- Labels -->
10+
<string id="500">Нисте изабрали језик</string>
11+
<string id="501">Изабрати посебну датотеку за преводе?</string>
12+
<string id="502">Избор Језика</string>
13+
<string id="503">Изаберите језик</string>
14+
<string id="504">Изаберите локацију</string>
15+
<string id="505">Изаберите сервис</string>
16+
<string id="506">Поништити сва подешавања?</string>
17+
18+
19+
20+
<string id="601">Преводи обележени</string>
21+
<string id="602">раде боље</string>
22+
<string id="610">Претражи </string>
23+
<string id="611">Претражи Sublight.si</string>
24+
<string id="612">Ручно унети име филма</string>
25+
<string id="630">Subtitle file downloaded and extracted as %s</string>
26+
<string id="631">Extracting %s to %s</string>
27+
<string id="632">Downloading %s from %s</string>
28+
<string id="633">Преузимање превода</string>
29+
<string id="634">Error! %s</string>
30+
<string id="635">Конектовано</string>
31+
<string id="636">Connecting anonymously...</string>
32+
<string id="637">Connecting as %s...</string>
33+
<string id="638">What do you want to run this for?</string>
34+
<string id="639">No music is playing fool!</string>
35+
<string id="640">Select a video file</string>
36+
<string id="641">%s Settings</string>
37+
<string id="642">Претрага превода %s</string>
38+
<string id="644">Extracted to %s</string>
39+
<string id="645">Download cancelled</string>
40+
<string id="646">Конектује се...</string>
41+
<string id="647">by hash...</string>
42+
<string id="648">by name...</string>
43+
<string id="649">Преузимање превода...</string>
44+
<string id="650">Extracting subtitles...</string>
45+
<string id="651">Превод отпакован</string>
46+
<string id="652">Превод отпакован</string>
47+
<string id="653">Конекција није успела.</string>
48+
<string id="654">Грешка при отпакивању</string>
49+
<!-- OSDB Messages -->
50+
<string id="730">OSDB server name missing</string>
51+
<string id="731">XMLRPC %s: %s</string>
52+
<string id="732">LogIn</string>
53+
<string id="733">LogOut</string>
54+
<string id="734">GetSubLanguages</string>
55+
<string id="735">CheckMovieHash</string>
56+
<string id="736">SearchSubtitles</string>
57+
<string id="737">Not connected to osdb server</string>
58+
<string id="738">Hashing %s not found</string>
59+
<string id="739">Hashing %s %s</string>
60+
<string id="740">File found on share, remote files not supported</string>
61+
<string id="741">Превод није пронађен</string>
62+
<string id="742"> превода</string>
63+
<string id="743">HTTP %s: %s</string>
64+
<string id="744"> превода за </string>
65+
66+
<!--
67+
* Languages
68+
-->
69+
<string id="30201">Albanian</string>
70+
<string id="30202">Arabic</string>
71+
<string id="30203">Belarusian</string>
72+
<string id="30204">Bosnian (Latin)</string>
73+
<string id="30205">Bulgarian</string>
74+
<string id="30206">Catalan</string>
75+
<string id="30207">Chinese</string>
76+
<string id="30208">Croatian</string>
77+
<string id="30209">Czech</string>
78+
<string id="30210">Danish</string>
79+
<string id="30211">Dutch</string>
80+
<string id="30212">English</string>
81+
<string id="30213">Estonian</string>
82+
<string id="30214">Finnish</string>
83+
<string id="30215">French</string>
84+
<string id="30216">German</string>
85+
<string id="30217">Greek</string>
86+
<string id="30218">Hebrew</string>
87+
<string id="30219">Hindi</string>
88+
<string id="30220">Hungarian</string>
89+
<string id="30221">Icelandic</string>
90+
<string id="30222">Indonesian</string>
91+
<string id="30224">Italian</string>
92+
<string id="30225">Japanese</string>
93+
<string id="30226">Korean</string>
94+
<string id="30227">Latvian</string>
95+
<string id="30228">Lithuanian</string>
96+
<string id="30229">Macedonian</string>
97+
<string id="30230">Norwegian</string>
98+
<string id="30232">Polish</string>
99+
<string id="30233">Portuguese</string>
100+
<string id="30234">Portuguese (Brazil)</string>
101+
<string id="30235">Romanian</string>
102+
<string id="30236">Russian</string>
103+
<string id="30237">SerbianLatin</string>
104+
<string id="30238">Slovak</string>
105+
<string id="30239">Slovenian</string>
106+
<string id="30240">Spanish</string>
107+
<string id="30242">Swedish</string>
108+
<string id="30243">Thai</string>
109+
<string id="30244">Turkish</string>
110+
<string id="30245">Ukrainian</string>
111+
<string id="30246">Vietnamese</string>
112+
113+
114+
</strings>

‎script.xbmc.subtitles/resources/language/Serbian/strings.xml‎

Lines changed: 42 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,46 @@
77

88

99
<!-- Labels -->
10-
<string id="500">Нисте изабрали језик</string>
11-
<string id="501">Изабрати посебну датотеку за преводе?</string>
12-
<string id="502">Избор Језика</string>
13-
<string id="503">Изаберите језик</string>
14-
<string id="504">Изаберите локацију</string>
15-
<string id="505">Изаберите сервис</string>
16-
<string id="506">Поништити сва подешавања?</string>
10+
<string id="500">Niste izabrali jezik</string>
11+
<string id="501">Izabrati posebnu datoteku za prevode?</string>
12+
<string id="502">Izbor jezika</string>
13+
<string id="503">Izaberite Jezik</string>
14+
<string id="504">Izaberite lokaciju</string>
15+
<string id="505">Izaberite servis</string>
16+
<string id="506">Poništiti sva podešavanja?</string>
1717

1818

1919

20-
<string id="601">Преводи обележени</string>
21-
<string id="602">раде боље</string>
22-
<string id="610">Претражи </string>
23-
<string id="611">Претражи Sublight.si</string>
24-
<string id="612">Ручно унети име филма</string>
20+
<string id="601">Prevodi obeleženi</string>
21+
<string id="602">rade bolje</string>
22+
<string id="610">Pretraži </string>
23+
<string id="611">Pretraži Sublight.si</string>
24+
<string id="612">Ručno uneti ime filma</string>
2525
<string id="630">Subtitle file downloaded and extracted as %s</string>
2626
<string id="631">Extracting %s to %s</string>
2727
<string id="632">Downloading %s from %s</string>
28-
<string id="633">Преузимање превода</string>
28+
<string id="633">Preuzimanje Prevoda</string>
2929
<string id="634">Error! %s</string>
30-
<string id="635">Конектовано</string>
30+
<string id="635">Konektovano</string>
3131
<string id="636">Connecting anonymously...</string>
3232
<string id="637">Connecting as %s...</string>
3333
<string id="638">What do you want to run this for?</string>
3434
<string id="639">No music is playing fool!</string>
3535
<string id="640">Select a video file</string>
3636
<string id="641">%s Settings</string>
37-
<string id="642">Претрага превода %s</string>
37+
<string id="642">Pretraga Prevoda %s</string>
3838
<string id="644">Extracted to %s</string>
3939
<string id="645">Download cancelled</string>
40-
<string id="646">Конектује се...</string>
40+
<string id="646">Konektovanje...</string>
4141
<string id="647">by hash...</string>
4242
<string id="648">by name...</string>
43-
<string id="649">Преузимање превода...</string>
43+
<string id="649">Preuzimanje prevoda...</string>
4444
<string id="650">Extracting subtitles...</string>
45-
<string id="651">Превод отпакован</string>
46-
<string id="652">Превод отпакован</string>
47-
<string id="653">Конекција није успела.</string>
48-
<string id="654">Грешка при отпакивању</string>
45+
<string id="651">Prevod otpakovan</string>
46+
<string id="652">Prevod otpakovan</string>
47+
<string id="653">Konekcija nije uspela.</string>
48+
<string id="654">Greška pri otpakivanju</string>
49+
4950
<!-- OSDB Messages -->
5051
<string id="730">OSDB server name missing</string>
5152
<string id="731">XMLRPC %s: %s</string>
@@ -58,57 +59,27 @@
5859
<string id="738">Hashing %s not found</string>
5960
<string id="739">Hashing %s %s</string>
6061
<string id="740">File found on share, remote files not supported</string>
61-
<string id="741">Превод није пронађен</string>
62-
<string id="742"> превода</string>
62+
<string id="741">Prevod nije pronađen</string>
63+
<string id="742"> prevoda</string>
6364
<string id="743">HTTP %s: %s</string>
64-
<string id="744"> превода за </string>
65+
<string id="744"> prevoda za </string>
66+
6567

66-
<!--
67-
* Languages
68-
-->
69-
<string id="30201">Albanian</string>
70-
<string id="30202">Arabic</string>
71-
<string id="30203">Belarusian</string>
72-
<string id="30204">Bosnian (Latin)</string>
73-
<string id="30205">Bulgarian</string>
74-
<string id="30206">Catalan</string>
75-
<string id="30207">Chinese</string>
76-
<string id="30208">Croatian</string>
77-
<string id="30209">Czech</string>
78-
<string id="30210">Danish</string>
79-
<string id="30211">Dutch</string>
80-
<string id="30212">English</string>
81-
<string id="30213">Estonian</string>
82-
<string id="30214">Finnish</string>
83-
<string id="30215">French</string>
84-
<string id="30216">German</string>
85-
<string id="30217">Greek</string>
86-
<string id="30218">Hebrew</string>
87-
<string id="30219">Hindi</string>
88-
<string id="30220">Hungarian</string>
89-
<string id="30221">Icelandic</string>
90-
<string id="30222">Indonesian</string>
91-
<string id="30224">Italian</string>
92-
<string id="30225">Japanese</string>
93-
<string id="30226">Korean</string>
94-
<string id="30227">Latvian</string>
95-
<string id="30228">Lithuanian</string>
96-
<string id="30229">Macedonian</string>
97-
<string id="30230">Norwegian</string>
98-
<string id="30232">Polish</string>
99-
<string id="30233">Portuguese</string>
100-
<string id="30234">Portuguese (Brazil)</string>
101-
<string id="30235">Romanian</string>
102-
<string id="30236">Russian</string>
103-
<string id="30237">SerbianLatin</string>
104-
<string id="30238">Slovak</string>
105-
<string id="30239">Slovenian</string>
106-
<string id="30240">Spanish</string>
107-
<string id="30242">Swedish</string>
108-
<string id="30243">Thai</string>
109-
<string id="30244">Turkish</string>
110-
<string id="30245">Ukrainian</string>
111-
<string id="30246">Vietnamese</string>
112-
68+
<!-- * Script Settings-->
69+
<string id="30100">Izbor Jezika</string>
70+
<string id="30101">- Prvi Jezik</string>
71+
<string id="30102">- Drugi Jezik</string>
72+
<string id="30103">Izbor Servisa</string>
73+
<string id="30104"> - Podnapisi.net Username</string>
74+
<string id="30105"> - Podnapisi.net Password</string>
75+
<string id="30106">Opcije</string>
76+
<string id="30107">- Subtitle Download Folder Same As Movie</string>
77+
<string id="30108"> - Set Custom Subtitle Download Path</string>
78+
<string id="30110">- Manually Enter Search String</string>
79+
<string id="30111">- Third Language</string>
80+
<string id="30112">- Select Default Service</string>
81+
<string id="30114">- Enable Scripts Debug Logging</string>
82+
<string id="30118">- Display file name in results page</string>
83+
<string id="30119">- Search Using Parent Folder</string>
11384

11485
</strings>

‎script.xbmc.subtitles/resources/language/Serbian/strings_lat.xml‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)