Skip to content
This repository has been archived by the owner on Apr 15, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into pvr-ppa
Browse files Browse the repository at this point in the history
  • Loading branch information
@opdenkamp
opdenkamp committed May 21, 2011
2 parents bd16540 + c707b8c commit 09c02fa
Show file tree
Hide file tree
Showing 1,242 changed files with 5,986 additions and 839,004 deletions.
55 changes: 55 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,21 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/lib/libapetag/config.h
/lib/libapetag/Debug
/lib/libapetag/Release
/lib/libapetag/aclocal.m4
/lib/libapetag/config.guess
/lib/libapetag/config.h.in
/lib/libapetag/config.h.in~
/lib/libapetag/config.sub
/lib/libapetag/configure
/lib/libapetag/depcomp
/lib/libapetag/INSTALL
/lib/libapetag/ltmain.sh
/lib/libapetag/m4/libtool.m4
/lib/libapetag/m4/ltoptions.m4
/lib/libapetag/m4/ltsugar.m4
/lib/libapetag/m4/ltversion.m4
/lib/libapetag/Makefile.in
/lib/libapetag/missing

# /lib/cmyth/
/lib/cmyth/Makefile.depend
Expand Down Expand Up @@ -1060,6 +1075,20 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/lib/libid3tag/libid3tag/msvc++/libid3tag.lib
/lib/libid3tag/libid3tag/msvc++/Debug
/lib/libid3tag/libid3tag/msvc++/Release
/lib/libid3tag/libid3tag/aclocal.m4
/lib/libid3tag/libid3tag/config.guess
/lib/libid3tag/libid3tag/config.h.in
/lib/libid3tag/libid3tag/config.h.in~
/lib/libid3tag/libid3tag/config.sub
/lib/libid3tag/libid3tag/depcomp
/lib/libid3tag/libid3tag/INSTALL
/lib/libid3tag/libid3tag/install-sh
/lib/libid3tag/libid3tag/ltmain.sh
/lib/libid3tag/libid3tag/Makefile.in
/lib/libid3tag/libid3tag/missing
/lib/libid3tag/libid3tag/mkinstalldirs
/lib/libid3tag/libid3tag/msvc++/Makefile.in


# /xbmc/interfaces/
/xbmc/interfaces/Makefile
Expand Down Expand Up @@ -1151,6 +1180,32 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/xbmc/screensavers/rsxs-0.9/src/plasma/rs-plasma
/xbmc/screensavers/rsxs-0.9/src/solarwinds/rs-solarwinds
/xbmc/screensavers/rsxs-0.9/stamp-h1
/xbmc/screensavers/rsxs-0.9/aclocal.m4
/xbmc/screensavers/rsxs-0.9/compile
/xbmc/screensavers/rsxs-0.9/config.guess
/xbmc/screensavers/rsxs-0.9/config.h.in
/xbmc/screensavers/rsxs-0.9/config.h.in~
/xbmc/screensavers/rsxs-0.9/config.sub
/xbmc/screensavers/rsxs-0.9/config/Makefile.in
/xbmc/screensavers/rsxs-0.9/depcomp
/xbmc/screensavers/rsxs-0.9/INSTALL
/xbmc/screensavers/rsxs-0.9/install-sh
/xbmc/screensavers/rsxs-0.9/lib/Makefile.in
/xbmc/screensavers/rsxs-0.9/libltdl/Makefile.in
/xbmc/screensavers/rsxs-0.9/Makefile.in
/xbmc/screensavers/rsxs-0.9/missing
/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in

/xbmc/visualizations/DirectXSpectrum/Debug (DirectX)
/xbmc/visualizations/DirectXSpectrum/Release (DirectX)
Expand Down
4 changes: 2 additions & 2 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,9 @@ lib/cpluff/libcpluff/.libs/libcpluff.a: force
system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a
ifeq ($(findstring osx,@ARCH@), osx)
ifeq (@ARCH@, arm-osx)
$(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -arch armv7 -o $@ $<
$(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ $<
else
$(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lexpat $(BUNDLE1_O) -o $@ $<
$(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -lexpat $(BUNDLE1_O) -o $@ $<
endif
else
cp lib/cpluff/libcpluff/.libs/libcpluff.so $@
Expand Down
6 changes: 0 additions & 6 deletions XBMC-ATV2.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,6 @@
F56C79E8131EC154000AD0F6 /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C748E131EC152000AD0F6 /* QueryParams.cpp */; };
F56C79E9131EC154000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7490131EC152000AD0F6 /* VideoDatabaseDirectory.cpp */; };
F56C79EA131EC154000AD0F6 /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7492131EC152000AD0F6 /* VirtualDirectory.cpp */; };
F56C79EB131EC154000AD0F6 /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7494131EC152000AD0F6 /* VirtualPathDirectory.cpp */; };
F56C79ED131EC154000AD0F6 /* ZeroconfDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7499131EC152000AD0F6 /* ZeroconfDirectory.cpp */; };
F56C79EE131EC154000AD0F6 /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C749B131EC152000AD0F6 /* ZipDirectory.cpp */; };
F56C79EF131EC154000AD0F6 /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C749D131EC152000AD0F6 /* ZipManager.cpp */; };
Expand Down Expand Up @@ -1769,8 +1768,6 @@
F56C7491131EC152000AD0F6 /* VideoDatabaseDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDatabaseDirectory.h; sourceTree = "<group>"; };
F56C7492131EC152000AD0F6 /* VirtualDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualDirectory.cpp; sourceTree = "<group>"; };
F56C7493131EC152000AD0F6 /* VirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualDirectory.h; sourceTree = "<group>"; };
F56C7494131EC152000AD0F6 /* VirtualPathDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualPathDirectory.cpp; sourceTree = "<group>"; };
F56C7495131EC152000AD0F6 /* VirtualPathDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualPathDirectory.h; sourceTree = "<group>"; };
F56C7498131EC152000AD0F6 /* ZeroconfDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroconfDirectory.h; sourceTree = "<group>"; };
F56C7499131EC152000AD0F6 /* ZeroconfDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZeroconfDirectory.cpp; sourceTree = "<group>"; };
F56C749A131EC152000AD0F6 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4127,8 +4124,6 @@
F56C7491131EC152000AD0F6 /* VideoDatabaseDirectory.h */,
F56C7492131EC152000AD0F6 /* VirtualDirectory.cpp */,
F56C7493131EC152000AD0F6 /* VirtualDirectory.h */,
F56C7494131EC152000AD0F6 /* VirtualPathDirectory.cpp */,
F56C7495131EC152000AD0F6 /* VirtualPathDirectory.h */,
F56C7498131EC152000AD0F6 /* ZeroconfDirectory.h */,
F56C7499131EC152000AD0F6 /* ZeroconfDirectory.cpp */,
F56C749A131EC152000AD0F6 /* zconf.h */,
Expand Down Expand Up @@ -6233,7 +6228,6 @@
F56C79E8131EC154000AD0F6 /* QueryParams.cpp in Sources */,
F56C79E9131EC154000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */,
F56C79EA131EC154000AD0F6 /* VirtualDirectory.cpp in Sources */,
F56C79EB131EC154000AD0F6 /* VirtualPathDirectory.cpp in Sources */,
F56C79ED131EC154000AD0F6 /* ZeroconfDirectory.cpp in Sources */,
F56C79EE131EC154000AD0F6 /* ZipDirectory.cpp in Sources */,
F56C79EF131EC154000AD0F6 /* ZipManager.cpp in Sources */,
Expand Down
6 changes: 0 additions & 6 deletions XBMC-IOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,6 @@
F56C89D2131F42ED000AD0F6 /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8471131F42E8000AD0F6 /* QueryParams.cpp */; };
F56C89D3131F42ED000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8473131F42E8000AD0F6 /* VideoDatabaseDirectory.cpp */; };
F56C89D4131F42ED000AD0F6 /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */; };
F56C89D5131F42ED000AD0F6 /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8477131F42E8000AD0F6 /* VirtualPathDirectory.cpp */; };
F56C89D7131F42ED000AD0F6 /* ZeroconfDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */; };
F56C89D8131F42ED000AD0F6 /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C847E131F42E9000AD0F6 /* ZipDirectory.cpp */; };
F56C89D9131F42ED000AD0F6 /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8480131F42E9000AD0F6 /* ZipManager.cpp */; };
Expand Down Expand Up @@ -1967,8 +1966,6 @@
F56C8474131F42E8000AD0F6 /* VideoDatabaseDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDatabaseDirectory.h; sourceTree = "<group>"; };
F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualDirectory.cpp; sourceTree = "<group>"; };
F56C8476131F42E8000AD0F6 /* VirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualDirectory.h; sourceTree = "<group>"; };
F56C8477131F42E8000AD0F6 /* VirtualPathDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualPathDirectory.cpp; sourceTree = "<group>"; };
F56C8478131F42E8000AD0F6 /* VirtualPathDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualPathDirectory.h; sourceTree = "<group>"; };
F56C847B131F42E9000AD0F6 /* ZeroconfDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroconfDirectory.h; sourceTree = "<group>"; };
F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZeroconfDirectory.cpp; sourceTree = "<group>"; };
F56C847D131F42E9000AD0F6 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4486,8 +4483,6 @@
F56C8474131F42E8000AD0F6 /* VideoDatabaseDirectory.h */,
F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */,
F56C8476131F42E8000AD0F6 /* VirtualDirectory.h */,
F56C8477131F42E8000AD0F6 /* VirtualPathDirectory.cpp */,
F56C8478131F42E8000AD0F6 /* VirtualPathDirectory.h */,
F56C847B131F42E9000AD0F6 /* ZeroconfDirectory.h */,
F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */,
F56C847D131F42E9000AD0F6 /* zconf.h */,
Expand Down Expand Up @@ -6340,7 +6335,6 @@
F56C89D2131F42ED000AD0F6 /* QueryParams.cpp in Sources */,
F56C89D3131F42ED000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */,
F56C89D4131F42ED000AD0F6 /* VirtualDirectory.cpp in Sources */,
F56C89D5131F42ED000AD0F6 /* VirtualPathDirectory.cpp in Sources */,
F56C89D7131F42ED000AD0F6 /* ZeroconfDirectory.cpp in Sources */,
F56C89D8131F42ED000AD0F6 /* ZipDirectory.cpp in Sources */,
F56C89D9131F42ED000AD0F6 /* ZipManager.cpp in Sources */,
Expand Down
8 changes: 0 additions & 8 deletions XBMC.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,6 @@
E38E20720D25F9FD00618676 /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17880D25F9FA00618676 /* QueryParams.cpp */; };
E38E20730D25F9FD00618676 /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178A0D25F9FA00618676 /* VideoDatabaseDirectory.cpp */; };
E38E20740D25F9FD00618676 /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */; };
E38E20750D25F9FD00618676 /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */; };
E38E20770D25F9FD00618676 /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17930D25F9FA00618676 /* ZipDirectory.cpp */; };
E38E20780D25F9FD00618676 /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17950D25F9FA00618676 /* ZipManager.cpp */; };
E38E207B0D25F9FD00618676 /* GUIDialogBoxBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E179C0D25F9FA00618676 /* GUIDialogBoxBase.cpp */; };
Expand Down Expand Up @@ -1434,7 +1433,6 @@
F5A1C9A10F6B06CF00A96ABD /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17880D25F9FA00618676 /* QueryParams.cpp */; };
F5A1C9A20F6B06CF00A96ABD /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178A0D25F9FA00618676 /* VideoDatabaseDirectory.cpp */; };
F5A1C9A30F6B06CF00A96ABD /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */; };
F5A1C9A40F6B06CF00A96ABD /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */; };
F5A1C9A50F6B06CF00A96ABD /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17930D25F9FA00618676 /* ZipDirectory.cpp */; };
F5A1C9A60F6B06CF00A96ABD /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17950D25F9FA00618676 /* ZipManager.cpp */; };
F5A1C9A90F6B06CF00A96ABD /* GUIDialogBoxBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E179C0D25F9FA00618676 /* GUIDialogBoxBase.cpp */; };
Expand Down Expand Up @@ -3114,8 +3112,6 @@
E38E178B0D25F9FA00618676 /* VideoDatabaseDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDatabaseDirectory.h; sourceTree = "<group>"; };
E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualDirectory.cpp; sourceTree = "<group>"; };
E38E178D0D25F9FA00618676 /* VirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualDirectory.h; sourceTree = "<group>"; };
E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualPathDirectory.cpp; sourceTree = "<group>"; };
E38E178F0D25F9FA00618676 /* VirtualPathDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualPathDirectory.h; sourceTree = "<group>"; };
E38E17920D25F9FA00618676 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
E38E17930D25F9FA00618676 /* ZipDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZipDirectory.cpp; sourceTree = "<group>"; };
E38E17940D25F9FA00618676 /* ZipDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipDirectory.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5986,8 +5982,6 @@
E38E178B0D25F9FA00618676 /* VideoDatabaseDirectory.h */,
E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */,
E38E178D0D25F9FA00618676 /* VirtualDirectory.h */,
E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */,
E38E178F0D25F9FA00618676 /* VirtualPathDirectory.h */,
E49ACD8A100745C400A86ECD /* ZeroconfDirectory.h */,
E49ACD8B100745C400A86ECD /* ZeroconfDirectory.cpp */,
E38E17920D25F9FA00618676 /* zconf.h */,
Expand Down Expand Up @@ -7676,7 +7670,6 @@
E38E20720D25F9FD00618676 /* QueryParams.cpp in Sources */,
E38E20730D25F9FD00618676 /* VideoDatabaseDirectory.cpp in Sources */,
E38E20740D25F9FD00618676 /* VirtualDirectory.cpp in Sources */,
E38E20750D25F9FD00618676 /* VirtualPathDirectory.cpp in Sources */,
E38E20770D25F9FD00618676 /* ZipDirectory.cpp in Sources */,
E38E20780D25F9FD00618676 /* ZipManager.cpp in Sources */,
E38E207B0D25F9FD00618676 /* GUIDialogBoxBase.cpp in Sources */,
Expand Down Expand Up @@ -8616,7 +8609,6 @@
F5A1C9A10F6B06CF00A96ABD /* QueryParams.cpp in Sources */,
F5A1C9A20F6B06CF00A96ABD /* VideoDatabaseDirectory.cpp in Sources */,
F5A1C9A30F6B06CF00A96ABD /* VirtualDirectory.cpp in Sources */,
F5A1C9A40F6B06CF00A96ABD /* VirtualPathDirectory.cpp in Sources */,
F5A1C9A50F6B06CF00A96ABD /* ZipDirectory.cpp in Sources */,
F5A1C9A60F6B06CF00A96ABD /* ZipManager.cpp in Sources */,
F5A1C9A90F6B06CF00A96ABD /* GUIDialogBoxBase.cpp in Sources */,
Expand Down
4 changes: 4 additions & 0 deletions addons/pvr.hts/resources/language/Dutch/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@
<string id="30006">Verbinding timeout in seconden</string>
<string id="30007">Antwoord timeout in seconden</string>
<string id="30008">Toon een melding bij timer updates</string>

<!-- notifications -->
<string id="30500">Verbinding met '%s' verbroken</string>
<string id="30501">Verbinding met '%s' hersteld</string>
</strings>
4 changes: 4 additions & 0 deletions addons/pvr.hts/resources/language/English/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@
<string id="30006">Connect timeout in seconds</string>
<string id="30007">Response timeout in seconds</string>
<string id="30008">Display a notification on timer updates</string>

<!-- notifications -->
<string id="30500">Disconnected from '%s'</string>
<string id="30501">Reconnected to '%s'</string>
</strings>
9 changes: 9 additions & 0 deletions addons/pvr.hts/resources/language/German/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,13 @@
<string id="30002">HTSP Port</string>
<string id="30003">Benutzername</string>
<string id="30004">Passwort</string>

<string id="30006">Verbindungszeit Überschreitung in Sekunden</string>
<string id="30007">Antwortzeit Überschreitung in Sekunden</string>
<string id="30008">Zeige eine Benachrichtigung bei Timer Aktualisierungen</string>


<!-- notifications -->
<string id="30500">Getrennt von '%s'</string>
<string id="30501">Wiederverbunden mit '%s'</string>
</strings>
3 changes: 3 additions & 0 deletions addons/pvr.vdr.vnsi/resources/language/English/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,7 @@
<string id="30041">Finished</string>
<string id="30042">Channel search - Canceled</string>
<string id="30043">Channel search - Error</string>
<string id="30044">Lost connection to VDR Server</string>
<string id="30045">Connection to VDR Server restored</string>
<string id="30046">Create channel groups automatically on the server</string>
</strings>
2 changes: 2 additions & 0 deletions addons/pvr.vdr.vnsi/resources/language/Finnish/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@
<string id="30041">Valmis</string>
<string id="30042">Kanavahaku peruutettu</string>
<string id="30043">Kanavahaku virhe</string>
<string id="30044">Yhteys VDR-palvelimeen menetetty</string>
<string id="30045">Yhteys VDR-palvelimeen palautettu</string>
</strings>
3 changes: 3 additions & 0 deletions addons/pvr.vdr.vnsi/resources/language/German/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,7 @@
<string id="30041">Fertig</string>
<string id="30042">Kanalsuche - Abgebrochen</string>
<string id="30043">Kanalsuche - Fehler</string>
<string id="30044">Verbindung zum VDR Server unterbrochen</string>
<string id="30045">Verbindung zum VDR Server wiederhergestellt</string>
<string id="30046">Kanalgruppen automatisch am Server erzeugen</string>
</strings>
1 change: 1 addition & 0 deletions addons/pvr.vdr.vnsi/resources/settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
<setting id="convertchar" type="bool" label="30003" default="true" />
<setting id="timeout" type="enum" label="30004" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15" default="3"/>
<setting id="handlemessages" type="bool" label="30005" default="true" />
<setting id="autochannelgroups" type="bool" label="30046" default="false" />
</settings>
Loading

0 comments on commit 09c02fa

Please sign in to comment.