Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/addons/service/downloadmanager/transmission/source/resources/language/Turkish/strings.xml

@@ -10,4 +10,11 @@
 	<string id="2010">Ağ Ayarları</string>
 	<string id="2021">İzin verilen IP adresleri (virgülle ayrılmış)</string>
 
+	<string id="3010">Sınırlar</string>
+	<string id="3021">Genel eş sınırı.</string>
+	<string id="3022">Torrent başına eş sınırı</string>
+
+	<string id="3110">Diğer</string>
+	<string id="3121">İndirme Dizini</string>
+
 </strings>

packages/addons/service/softcam/oscam/build

@@ -29,7 +29,7 @@ mkdir -p build && cd build
 cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DLIBUSBDIR=$SYSROOT_PREFIX/usr \
-      -DWITH_SSL=1 -DWITH_SSLv3=1 \
+      -DWITH_SSL=1 \
       -DHAVE_DVBAPI=1 -DWITH_STAPI=0 \
       -DMODULE_CAMD33=1 \
       -DWEBIF=1 \

packages/addons/service/softcam/oscam/changelog.txt

@@ -1,3 +1,6 @@
+3.0.3
+- update to oscam-7968
+
 3.0.2
 - update to pcsc-lite-1.8.6
 

packages/addons/service/softcam/oscam/meta

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="oscam"
-PKG_VERSION="7168"
+PKG_VERSION="7968"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.streamboard.tv/oscam/wiki"