Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/xbmc/xbmc
Browse files Browse the repository at this point in the history
  • Loading branch information
htpc committed May 31, 2012
2 parents 24fa8b4 + 12d9d51 commit 42cda74
Show file tree
Hide file tree
Showing 354 changed files with 114,120 additions and 116,123 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Expand Up @@ -16,8 +16,6 @@ config.log
*.depend
*.pc
*.P
*.mode1v3
*.pbxuser
*.[oa]
*.l[oa]
*.so
Expand Down Expand Up @@ -50,6 +48,10 @@ config.log
.DS_Store
*.dSYM
._*
*.mode1v3
*.pbxuser
*project.xcworkspace
*xcuserdata
/tools/darwin/depends/config.site
/tools/darwin/depends/config.site.mk
/tools/darwin/depends/Makefile
Expand Down
12 changes: 4 additions & 8 deletions XBMC.xcodeproj/project.pbxproj
Expand Up @@ -873,7 +873,6 @@
F52B063B11869862004B1D66 /* Skin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F52B063A11869862004B1D66 /* Skin.cpp */; };
F52B06BA1187CE18004B1D66 /* DVDVideoCodecVDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F52B06B81187CE18004B1D66 /* DVDVideoCodecVDA.cpp */; };
F52BFFDB115D5574004B1D66 /* AddonStatusHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F52BFFDA115D5574004B1D66 /* AddonStatusHandler.cpp */; };
F52E90D51560B8E1005A58CF /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F52E90D41560B8E1005A58CF /* CoreFoundation.framework */; };
F5364D34155B3B270016D00B /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5364D33155B3B270016D00B /* CoreVideo.framework */; };
F5364D55155B3C7B0016D00B /* libm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5364D54155B3C7B0016D00B /* libm.dylib */; };
F5364E05155B3CAF0016D00B /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5364E04155B3CAF0016D00B /* IOSurface.framework */; };
Expand Down Expand Up @@ -1026,6 +1025,7 @@
1840B75213993DA0007C848B /* JSONVariantWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONVariantWriter.h; sourceTree = "<group>"; };
184C472D1296BC6E0006DB3E /* Service.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Service.cpp; sourceTree = "<group>"; };
184C472E1296BC6E0006DB3E /* Service.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Service.h; sourceTree = "<group>"; };
18576525156ED3710088C35A /* README.osx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.osx; path = docs/README.osx; sourceTree = "<group>"; };
188F751815211733009870CE /* IJSONRPCAnnouncer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSONRPCAnnouncer.h; sourceTree = "<group>"; };
188F751915211743009870CE /* JSONRPCUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONRPCUtils.h; sourceTree = "<group>"; };
188F75FC152217BC009870CE /* Mime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mime.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1618,7 +1618,6 @@
83A72B960FBC8E3B00171871 /* LockFree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LockFree.h; sourceTree = "<group>"; };
83E0B2470F7C95FF0091643F /* Atomics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Atomics.h; sourceTree = "<group>"; };
83E0B2480F7C95FF0091643F /* Atomics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Atomics.cpp; sourceTree = "<group>"; };
880DBE360DC2077000E26B71 /* README.osx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.osx; sourceTree = "<group>"; };
880DBE490DC223FF00E26B71 /* Album.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Album.h; sourceTree = "<group>"; };
880DBE4A0DC223FF00E26B71 /* Artist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Artist.h; sourceTree = "<group>"; };
880DBE4B0DC223FF00E26B71 /* MediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaSource.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2861,7 +2860,6 @@
F52B06B91187CE18004B1D66 /* DVDVideoCodecVDA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDVideoCodecVDA.h; path = xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h; sourceTree = SOURCE_ROOT; };
F52BFFD9115D5574004B1D66 /* AddonStatusHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonStatusHandler.h; sourceTree = "<group>"; };
F52BFFDA115D5574004B1D66 /* AddonStatusHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonStatusHandler.cpp; sourceTree = "<group>"; };
F52E90D41560B8E1005A58CF /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
F5364D33155B3B270016D00B /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = "<absolute>"; };
F5364D54155B3C7B0016D00B /* libm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libm.dylib; path = /usr/lib/libm.dylib; sourceTree = "<absolute>"; };
F5364E04155B3CAF0016D00B /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = /System/Library/Frameworks/IOSurface.framework; sourceTree = "<absolute>"; };
Expand Down Expand Up @@ -3135,7 +3133,6 @@
F5ED9A0C155EBDC000842059 /* CoreAudio.framework in Frameworks */,
F5364D34155B3B270016D00B /* CoreVideo.framework in Frameworks */,
E38E23960D2626E600618676 /* CoreServices.framework in Frameworks */,
F52E90D51560B8E1005A58CF /* CoreFoundation.framework in Frameworks */,
F5ED9A15155EBE0000842059 /* DiskArbitration.framework in Frameworks */,
E33466A60D2E5103005A65EC /* IOKit.framework in Frameworks */,
F5364E05155B3CAF0016D00B /* IOSurface.framework in Frameworks */,
Expand All @@ -3151,7 +3148,6 @@
08FB7794FE84155DC02AAC07 /* XBMC */ = {
isa = PBXGroup;
children = (
F52E90D41560B8E1005A58CF /* CoreFoundation.framework */,
C6859E96029091FE04C91782 /* Documentation */,
08FB7795FE84155DC02AAC07 /* Source */,
F57E1ED20E36E8FD00700C9D /* internal libs */,
Expand Down Expand Up @@ -4149,7 +4145,7 @@
C6859E96029091FE04C91782 /* Documentation */ = {
isa = PBXGroup;
children = (
880DBE360DC2077000E26B71 /* README.osx */,
18576525156ED3710088C35A /* README.osx */,
);
name = Documentation;
sourceTree = "<group>";
Expand Down Expand Up @@ -7531,7 +7527,7 @@
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx10.6;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = .;
VALID_ARCHS = "i386 x86_64";
};
Expand All @@ -7553,7 +7549,7 @@
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx10.6;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = .;
VALID_ARCHS = "i386 x86_64";
};
Expand Down
@@ -0,0 +1,30 @@
# XBMC Media Center language file
# Addon Name: Dim
# Addon id: screensaver.xbmc.builtin.dim
# Addon version: 1.0.0
# Addon Provider: Team XBMC
msgid ""
msgstr ""
"Project-Id-Version: XBMC-Addons\n"
"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
"POT-Creation-Date: 2012-05-28 15:37+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"

msgctxt "Addon Summary"
msgid "Screensaver that dims your screen"
msgstr "Скрийнсейвър, който затъмнява екрана"

msgctxt "Addon Description"
msgid "The Dim screensaver is a simple screensaver that will dim (fade out) your screen to a setable value between 20 and 100% ."
msgstr "Скрийнсейвърът Dim ще затъмни екрана ви, до стойност, която вие можете да определите предварително (между 20 и 100%)."

msgctxt "#30000"
msgid "Dim level"
msgstr "Ниво на затъмняване"

This file was deleted.

@@ -0,0 +1,30 @@
# XBMC Media Center language file
# Addon Name: Dim
# Addon id: screensaver.xbmc.builtin.dim
# Addon version: 1.0.0
# Addon Provider: Team XBMC
msgid ""
msgstr ""
"Project-Id-Version: XBMC-Addons\n"
"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
"POT-Creation-Date: 2012-05-28 15:37+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh\n"
"Plural-Forms: nplurals=1; plural=0\n"

msgctxt "Addon Summary"
msgid "Screensaver that dims your screen"
msgstr "淡出屏幕保护程序"

msgctxt "Addon Description"
msgid "The Dim screensaver is a simple screensaver that will dim (fade out) your screen to a setable value between 20 and 100% ."
msgstr "淡出屏保是一个简单的屏幕保护程序,它使你的屏幕显示内容变暗(淡出效果),暗化度可在20%至100%之间调节。"

msgctxt "#30000"
msgid "Dim level"
msgstr "变暗级别"

This file was deleted.

@@ -0,0 +1,30 @@
# XBMC Media Center language file
# Addon Name: Dim
# Addon id: screensaver.xbmc.builtin.dim
# Addon version: 1.0.0
# Addon Provider: Team XBMC
msgid ""
msgstr ""
"Project-Id-Version: XBMC-Addons\n"
"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
"POT-Creation-Date: 2012-05-28 15:37+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"

msgctxt "Addon Summary"
msgid "Screensaver that dims your screen"
msgstr "Schermbeveiliging die je scherm dimt"

msgctxt "Addon Description"
msgid "The Dim screensaver is a simple screensaver that will dim (fade out) your screen to a setable value between 20 and 100% ."
msgstr "De Dim-schermbeveiliging is een eenvoudige schermbeveiliging die uw scherm geleidelijk dimt. U kan een waarde gaande van 20 tot 100% instellen."

msgctxt "#30000"
msgid "Dim level"
msgstr "Dimveau"

This file was deleted.

@@ -0,0 +1,30 @@
# XBMC Media Center language file
# Addon Name: Dim
# Addon id: screensaver.xbmc.builtin.dim
# Addon version: 1.0.0
# Addon Provider: Team XBMC
msgid ""
msgstr ""
"Project-Id-Version: XBMC-Addons\n"
"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
"POT-Creation-Date: 2012-05-28 15:37+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"

msgctxt "Addon Summary"
msgid "Screensaver that dims your screen"
msgstr ""

msgctxt "Addon Description"
msgid "The Dim screensaver is a simple screensaver that will dim (fade out) your screen to a setable value between 20 and 100% ."
msgstr ""

msgctxt "#30000"
msgid "Dim level"
msgstr ""

This file was deleted.

@@ -0,0 +1,30 @@
# XBMC Media Center language file
# Addon Name: Dim
# Addon id: screensaver.xbmc.builtin.dim
# Addon version: 1.0.0
# Addon Provider: Team XBMC
msgid ""
msgstr ""
"Project-Id-Version: XBMC-Addons\n"
"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
"POT-Creation-Date: 2012-05-28 15:37+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"

msgctxt "Addon Summary"
msgid "Screensaver that dims your screen"
msgstr "Ruudun himmennys"

msgctxt "Addon Description"
msgid "The Dim screensaver is a simple screensaver that will dim (fade out) your screen to a setable value between 20 and 100% ."
msgstr "Dim on yksinkertainen näytönsäästäjä joka himmentää ruudun valitulle tasolle välillä 20-100%."

msgctxt "#30000"
msgid "Dim level"
msgstr "Himmennystaso"

This file was deleted.

@@ -0,0 +1,30 @@
# XBMC Media Center language file
# Addon Name: Dim
# Addon id: screensaver.xbmc.builtin.dim
# Addon version: 1.0.0
# Addon Provider: Team XBMC
msgid ""
msgstr ""
"Project-Id-Version: XBMC-Addons\n"
"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
"POT-Creation-Date: 2012-05-28 15:37+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"

msgctxt "Addon Summary"
msgid "Screensaver that dims your screen"
msgstr "Un économiseur qui assombrit votre écran"

msgctxt "Addon Description"
msgid "The Dim screensaver is a simple screensaver that will dim (fade out) your screen to a setable value between 20 and 100% ."
msgstr "L'économiseur Dim est un simple économiseur qui assombrira votre écran à un taux paramètrable compris entre 20 and 100%."

msgctxt "#30000"
msgid "Dim level"
msgstr "Niveau d'assombrissement"

This file was deleted.

@@ -0,0 +1,30 @@
# XBMC Media Center language file
# Addon Name: Dim
# Addon id: screensaver.xbmc.builtin.dim
# Addon version: 1.0.0
# Addon Provider: Team XBMC
msgid ""
msgstr ""
"Project-Id-Version: XBMC-Addons\n"
"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
"POT-Creation-Date: 2012-05-28 15:37+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"

msgctxt "Addon Summary"
msgid "Screensaver that dims your screen"
msgstr "Bildschirmschoner zum Abdunkeln des Bildschirmes"

msgctxt "Addon Description"
msgid "The Dim screensaver is a simple screensaver that will dim (fade out) your screen to a setable value between 20 and 100% ."
msgstr "Der Dimmer-Bildschirmschoner ist ein einfacher Bildschirmschoner, welcher den Bildschirm auf einen benutzerdefinierten Wert zwischen 20 und 100% abdunkelt."

msgctxt "#30000"
msgid "Dim level"
msgstr "Grad der Abdunklung"

This file was deleted.

@@ -0,0 +1,30 @@
# XBMC Media Center language file
# Addon Name: Dim
# Addon id: screensaver.xbmc.builtin.dim
# Addon version: 1.0.0
# Addon Provider: Team XBMC
msgid ""
msgstr ""
"Project-Id-Version: XBMC-Addons\n"
"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
"POT-Creation-Date: 2012-05-28 15:37+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"

msgctxt "Addon Summary"
msgid "Screensaver that dims your screen"
msgstr "Képernyővédő ami elhalványítja a képernyőt"

msgctxt "Addon Description"
msgid "The Dim screensaver is a simple screensaver that will dim (fade out) your screen to a setable value between 20 and 100% ."
msgstr "A Dim képernyővédő egyszerűen elhalványítja a képernyőt egy előre beállítható sötétségi szintre 20 és 100% között."

msgctxt "#30000"
msgid "Dim level"
msgstr "Elsötétítés szintje"

This file was deleted.

0 comments on commit 42cda74

Please sign in to comment.