Imported Upstream version 0.14.2+dfsg1

2016-05-24 21:53:01 +02:00 · 2016-05-24 21:53:01 +02:00 · 41a01dbf05
commit 41a01dbf05
parent fb3990e9e5
529 changed files with 25112 additions and 2336 deletions
--- a/plugins/rtmp-services/data/locale/ar-SA.ini
+++ b/plugins/rtmp-services/data/locale/ar-SA.ini
@ -3,6 +3,8 @@ CustomStreamingServer="سيرفر بث مخصص"
 Service="خدمة"
 Server="سيرفر"
 StreamKey="مفتاح البث"
+UseAuth="استخدام المصادقة"
 Username="اسم المستخدم"
 Password="كلمة السر"
+ShowAll="إظهار كافة الخدمات"

--- a/plugins/rtmp-services/data/locale/da-DK.ini
+++ b/plugins/rtmp-services/data/locale/da-DK.ini
@ -3,4 +3,8 @@ CustomStreamingServer="Brugerdefineret Streaming Server"
 Service="Service"
 Server="Server"
 StreamKey="Stream nøgle"
+UseAuth="Brug godkendelse"
+Username="Brugernavn"
+Password="Kodeord"
+ShowAll="Vis alle services"

--- a/plugins/rtmp-services/data/locale/de-DE.ini
+++ b/plugins/rtmp-services/data/locale/de-DE.ini
@ -1,8 +1,8 @@
 StreamingServices="Streaming-Plattformen"
-CustomStreamingServer="Benutzerdefinierter Streaming-Server"
+CustomStreamingServer="Benutzerdefinierter Streamingserver"
 Service="Plattform"
 Server="Server"
-StreamKey="Stream-Schlüssel"
+StreamKey="Streamschlüssel"
 UseAuth="Authentifizierung verwenden"
 Username="Benutzername"
 Password="Passwort"
--- a/plugins/rtmp-services/data/locale/el-GR.ini
+++ b/plugins/rtmp-services/data/locale/el-GR.ini
@ -3,5 +3,8 @@ CustomStreamingServer="Προσαρμοσμένος Διακομιστής Με
 Service="Υπηρεσία"
 Server="Διακομιστής"
 StreamKey="Κλειδί μετάδοσης"
+UseAuth="Χρήση πιστοποίησης"
 Username="Όνομα χρήστη"
+Password="Κωδικός"
+ShowAll="Εμφάνιση όλων των υπηρεσιών"

--- a/plugins/rtmp-services/data/locale/es-ES.ini
+++ b/plugins/rtmp-services/data/locale/es-ES.ini
@ -1,5 +1,5 @@
 StreamingServices="Servicio de retransmisión"
-CustomStreamingServer="Presonalizar el servidor de retranmisión"
+CustomStreamingServer="Personalizar el servidor de retransmisión"
 Service="Servicio"
 Server="Servidor"
 StreamKey="Clave de retransmisión"
--- a/plugins/rtmp-services/data/locale/eu-ES.ini
+++ b/plugins/rtmp-services/data/locale/eu-ES.ini
@ -1,10 +1,10 @@
-StreamingServices="Jario Zerbitzuak"
-CustomStreamingServer="Norbere Jario Zerbitzaria"
+StreamingServices="Transmisio zerbitzuak"
+CustomStreamingServer="Transmisio zerbitzari pertsonalizatua"
 Service="Zerbitzua"
 Server="Zerbitzaria"
-StreamKey="Jario giltza"
-UseAuth="Erabili egiaztapena"
+StreamKey="Transmisio giltza"
+UseAuth="Erabili autentifikazioa"
 Username="Erabiltzaile-izena"
-Password="Sarhitza"
+Password="Pasahitza"
 ShowAll="Erakutsi zerbitzu guztiak"

--- a/plugins/rtmp-services/data/locale/fr-FR.ini
+++ b/plugins/rtmp-services/data/locale/fr-FR.ini
@ -1,8 +1,8 @@
-StreamingServices="Services de Streaming"
-CustomStreamingServer="Serveur de Streaming Personnalisé"
+StreamingServices="Services de streaming"
+CustomStreamingServer="Serveur de streaming personnalisé"
 Service="Service"
 Server="Serveur"
-StreamKey="Clé de Stream"
+StreamKey="Clé de stream"
 UseAuth="Utiliser l'authentification"
 Username="Nom d'utilisateur"
 Password="Mot de passe"
--- a/plugins/rtmp-services/data/locale/he-IL.ini
+++ b/plugins/rtmp-services/data/locale/he-IL.ini
@ -0,0 +1,10 @@
+StreamingServices="שרותי הזרמת נתונים"
+CustomStreamingServer="שרת הזרמת נתונים מותאם אישית"
+Service="שירות"
+Server="שרת"
+StreamKey="מפתח הזרמת נתונים"
+UseAuth="השתמש באימות"
+Username="שם משתמש"
+Password="סיסמא"
+ShowAll="הצג את כל השירותים"
+
--- a/plugins/rtmp-services/data/locale/hu-HU.ini
+++ b/plugins/rtmp-services/data/locale/hu-HU.ini
@ -1,8 +1,8 @@
-StreamingServices="Stream Kiszolgáló"
-CustomStreamingServer="Egyéni Streamkiszolgáló"
+StreamingServices="Stream kiszolgáló"
+CustomStreamingServer="Egyéni stream szerver"
 Service="Szolgáltatás"
 Server="Szerver"
-StreamKey="Stream Kulcs"
+StreamKey="Stream kulcs"
 UseAuth="Hitelesítés használata"
 Username="Felhasználó"
 Password="Jelszó"
--- a/plugins/rtmp-services/data/locale/pt-PT.ini
+++ b/plugins/rtmp-services/data/locale/pt-PT.ini
@ -1,8 +1,8 @@
-StreamingServices="Serviço de Stream"
-CustomStreamingServer="Servidor de Stream Personalizado"
+StreamingServices="Serviço de transmissão"
+CustomStreamingServer="Servidor de transmissão personalizado"
 Service="Serviço"
 Server="Servidor"
-StreamKey="Chave de Steam"
+StreamKey="Chave da transmissão"
 UseAuth="Utilizar autenticação"
 Username="Nome de utilizador"
 Password="Palavra-passe"
--- a/plugins/rtmp-services/data/locale/ro-RO.ini
+++ b/plugins/rtmp-services/data/locale/ro-RO.ini
@ -1,10 +1,10 @@
 StreamingServices="Servicii de streaming"
-CustomStreamingServer="Server de Streaming Personalizat"
+CustomStreamingServer="Server de streaming personalizat"
 Service="Serviciu"
 Server="Server"
-StreamKey="Cheie Stream"
-UseAuth="Utilizează autentificare"
-Username="Nume utilizator"
+StreamKey="Cheie de stream"
+UseAuth="Folosește autentificare"
+Username="Nume de utilizator"
 Password="Parolă"
 ShowAll="Arată toate serviciile"

--- a/plugins/rtmp-services/data/locale/sv-SE.ini
+++ b/plugins/rtmp-services/data/locale/sv-SE.ini
@ -1,9 +1,10 @@
-StreamingServices="Streamtjänster"
+StreamingServices="Strömtjänster"
 CustomStreamingServer="Anpassad streamningsserver"
 Service="Tjänst"
 Server="Server"
 StreamKey="Streamnyckel"
 UseAuth="Använd autentisering"
-Username="Användarnanm"
+Username="Användarnamn"
 Password="Lösenord"
+ShowAll="Visa alla tjänster"

--- a/plugins/rtmp-services/data/locale/tr-TR.ini
+++ b/plugins/rtmp-services/data/locale/tr-TR.ini
@ -4,7 +4,7 @@ Service="Servis"
 Server="Sunucu"
 StreamKey="Yayın Anahtarı"
 UseAuth="Kimlik doğrulaması kullan"
-Username="Kullanıcı adı"
+Username="Kullanıcı Adı"
 Password="Şifre"
 ShowAll="Tüm hizmetleri göster"

--- a/plugins/rtmp-services/data/package.json
+++ b/plugins/rtmp-services/data/package.json
@ -1,10 +1,10 @@
 {
 	"url": "https://obsproject.com/obs2_update/rtmp-services",
-	"version": 13,
+	"version": 21,
 	"files": [
 		{
 			"name": "services.json",
-			"version": 13
+			"version": 21
 		}
 	]
 }
--- a/plugins/rtmp-services/data/services.json
+++ b/plugins/rtmp-services/data/services.json
@ -57,6 +57,10 @@
                    "name": "EU: Stockholm, SE",
                    "url": "rtmp://live-arn.twitch.tv/app"
                },
+                {
+                    "name": "EU: Warsaw, Poland",
+                    "url": "rtmp://live-waw.twitch.tv/app"
+                },
                {
                    "name": "South America: Argentina",
                    "url": "rtmp://live-eze.twitch.tv/app"
@ -110,7 +114,8 @@
                "keyint": 2,
                "profile": "main",
                "max video bitrate": 3500,
-                "max audio bitrate": 160
+                "max audio bitrate": 160,
+                "x264opts": "scenecut=0"
            }
        },
        {
@ -310,23 +315,11 @@
            ]
        },
        {
-            "name": "Restream.io",
+            "name": "mSportz",
            "servers": [
                {
-                    "name": "EU Primary",
-                    "url": "rtmp://eu.restream.io/live"
-                },
-                {
-                    "name": "EU Secondary",
-                    "url": "rtmp://eu-secondary.restream.io/live"
-                },
-                {
-                    "name": "US West",
-                    "url": "rtmp://us-west.restream.io/live"
-                },
-                {
-                    "name": "US East",
-                    "url": "rtmp://us-east.restream.io/live"
+                    "name": "Primary",
+                    "url": "rtmp://52.21.78.175/mSports"
                }
            ]
        },
@ -453,6 +446,75 @@
                    "url": "rtmp://de.live.cashplay.tv/live"
                }
            ]
+        },
+        {
+            "name": "DJlive.pl",
+            "servers": [
+                {
+                    "name": "Default",
+                    "url": "rtmp://live.djlive.pl/live"
+                }
+            ],
+            "recommended": {
+                "keyint": 1,
+                "profile": "high",
+                "max video bitrate": 1300,
+                "max audio bitrate": 320
+            }
+        },
+        {
+            "name": "Facebook Live",
+            "common": true,
+            "servers": [
+                {
+                    "name": "Default",
+                    "url": "rtmp://rtmp-api.facebook.com:80/rtmp/"
+                }
+            ],
+            "recommended": {
+                "keyint": 1,
+                "profile": "main",
+                "max video bitrate": 2000,
+                "max audio bitrate": 160
+            }
+        },
+        {
+            "name": "Restream.io",
+            "common": true,
+            "servers": [
+                {
+                    "name": "US-West (San Jose, California)",
+                    "url": "rtmp://us-west.restream.io/live"
+                },
+                {
+                    "name": "US-West (Los Angeles, California)",
+                    "url": "rtmp://us-la.restream.io/live"
+                },
+                {
+                    "name": "US-East (Washington, D.C.)",
+                    "url": "rtmp://us-east.restream.io/live"
+                },
+                {
+                    "name": "US-Central (Dallas, TX)",
+                    "url": "rtmp://us-central.restream.io/live"
+                },
+                {
+                    "name": "EU-Central (Frankfurt, Germany)",
+                    "url": "rtmp://eu.restream.io/live"
+                },
+                {
+                    "name": "EU-West (London, GB)",
+                    "url": "rtmp://eu-london.restream.io/live"
+                },
+                {
+                    "name": "Australia (Sydney)",
+                    "url": "rtmp://au-secondary.restream.io/live"
+                },
+                {
+                    "name": "South America (Sao Paulo, Brazil)",
+                    "url": "rtmp://sa.restream.io/live"
+                }
+            ]
        }
    ]
 }