From 1ffb812fc3ad8b6c45e14e8a080503dd0be7fa18d10977ff9cf01f678df42638 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Sep 2016 19:19:04 +0000 Subject: [PATCH] Accepting request 424698 from multimedia:libs - Update vlc-2.2.4-unambig-shortcuts.patch: Also make ALT-P unambiguous. - Also use ffmpeg2-devel BuildRequires on Leap 42.2 (sle_version 120200). - Add ffmpeg2-devel BuildRequires for Tumbleweed: older openSUSE versions had ffmpeg 2.x in the distribution. OBS-URL: https://build.opensuse.org/request/show/424698 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=61 --- vlc-2.2.4-unambig-shortcuts.patch | 1274 +---------------------------- vlc.changes | 16 +- vlc.spec | 2 +- 3 files changed, 50 insertions(+), 1242 deletions(-) diff --git a/vlc-2.2.4-unambig-shortcuts.patch b/vlc-2.2.4-unambig-shortcuts.patch index 07b3402..ab0070c 100644 --- a/vlc-2.2.4-unambig-shortcuts.patch +++ b/vlc-2.2.4-unambig-shortcuts.patch @@ -1,7 +1,38 @@ -Index: vlc-2.2.4/modules/gui/qt4/dialogs/open.cpp -=================================================================== ---- vlc-2.2.4.orig/modules/gui/qt4/dialogs/open.cpp -+++ vlc-2.2.4/modules/gui/qt4/dialogs/open.cpp +commit 1e7aca9289f61c8875e91898ba131516d038bb4f +Author: Dominique Leuenberger +Date: Sun Sep 4 11:00:38 2016 +0200 + + Qt: Change mnemonic for 'Play' (&Play => P&lay) + + ALT-P is bound to 'play' inside the submenu already. Using it duplicated + can result in Qt showing popover, warning about "Ambiguous shortcut overload: Alt+P" + +diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp +index d85e976..83712b9 100644 +--- a/modules/gui/qt4/dialogs/open.cpp ++++ b/modules/gui/qt4/dialogs/open.cpp +@@ -114,7 +114,7 @@ OpenDialog::OpenDialog( QWidget *parent, + QMenu * openButtonMenu = new QMenu( "Open", playButton ); + openButtonMenu->addAction( qtr( "&Enqueue" ), this, SLOT( enqueue() ), + QKeySequence( "Alt+E" ) ); +- openButtonMenu->addAction( qtr( "&Play" ), this, SLOT( play() ), ++ openButtonMenu->addAction( qtr( "P&lay" ), this, SLOT( play() ), + QKeySequence( "Alt+P" ) ); + openButtonMenu->addAction( qtr( "&Stream" ), this, SLOT( stream() ) , + QKeySequence( "Alt+S" ) ); + +commit 02f593441cf536f50071a4a8a088b56f30d53588 +Author: Dominique Leuenberger +Date: Fri Aug 5 09:29:01 2016 +0200 + + Qt: Change keyboard shortcut for 'Capture Device' + + 'D' is already used by 'Disc' in the same dialog. + +diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp +index 224cfa5..d85e976 100644 +--- a/modules/gui/qt4/dialogs/open.cpp ++++ b/modules/gui/qt4/dialogs/open.cpp @@ -93,7 +93,7 @@ OpenDialog::OpenDialog( QWidget *parent, ui.Tab->insertTab( OPEN_NETWORK_TAB, netOpenPanel, QIcon( ":/type/network" ), qtr( "&Network" ) ); @@ -11,1238 +42,3 @@ Index: vlc-2.2.4/modules/gui/qt4/dialogs/open.cpp /* Hide the Slave input widgets */ ui.slaveLabel->hide(); -Index: vlc-2.2.4/po/ach.po -=================================================================== ---- vlc-2.2.4.orig/po/ach.po -+++ vlc-2.2.4/po/ach.po -@@ -19763,7 +19763,7 @@ msgid "&Network" - msgstr "&Gi kube" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Mak &Nyonyo" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/af.po -=================================================================== ---- vlc-2.2.4.orig/po/af.po -+++ vlc-2.2.4/po/af.po -@@ -19916,7 +19916,7 @@ msgid "&Network" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/am.po -=================================================================== ---- vlc-2.2.4.orig/po/am.po -+++ vlc-2.2.4/po/am.po -@@ -20990,7 +20990,7 @@ msgid "&Network" - msgstr "&አውታረ መረብ " - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "መቅረጫ መሳሪያ " - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/an.po -=================================================================== ---- vlc-2.2.4.orig/po/an.po -+++ vlc-2.2.4/po/an.po -@@ -20903,7 +20903,7 @@ msgid "&Network" - msgstr "&Ret" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Dispositivo de &captura" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ar.po -=================================================================== ---- vlc-2.2.4.orig/po/ar.po -+++ vlc-2.2.4/po/ar.po -@@ -20312,7 +20312,7 @@ msgid "&Network" - msgstr "&شبكة" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "ج&هاز التقاط" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ast.po -=================================================================== ---- vlc-2.2.4.orig/po/ast.po -+++ vlc-2.2.4/po/ast.po -@@ -20626,7 +20626,7 @@ msgid "&Network" - msgstr "&Rede" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Preséu de &captura" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/az.po -=================================================================== ---- vlc-2.2.4.orig/po/az.po -+++ vlc-2.2.4/po/az.po -@@ -19702,7 +19702,7 @@ msgid "&Network" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/be.po -=================================================================== ---- vlc-2.2.4.orig/po/be.po -+++ vlc-2.2.4/po/be.po -@@ -21198,7 +21198,7 @@ msgid "&Network" - msgstr "&Сетка" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Прылада за&хопу" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/bg.po -=================================================================== ---- vlc-2.2.4.orig/po/bg.po -+++ vlc-2.2.4/po/bg.po -@@ -20859,7 +20859,7 @@ msgid "&Network" - msgstr "Мрежа" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Устройство за захващане" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/bn.po -=================================================================== ---- vlc-2.2.4.orig/po/bn.po -+++ vlc-2.2.4/po/bn.po -@@ -20543,7 +20543,7 @@ msgid "&Network" - msgstr "&নেটওয়ার্ক" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "ক্যাপচার &ডিভাইস" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/bn_IN.po -=================================================================== ---- vlc-2.2.4.orig/po/bn_IN.po -+++ vlc-2.2.4/po/bn_IN.po -@@ -20736,7 +20736,7 @@ msgid "&Network" - msgstr "নেটওয়ার্ক (&N)" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "ক্যাপচার ডিভাইস (&D)" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/br.po -=================================================================== ---- vlc-2.2.4.orig/po/br.po -+++ vlc-2.2.4/po/br.po -@@ -19772,7 +19772,7 @@ msgid "&Network" - msgstr "&Rouedad" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Trobarzhell enrollañ" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/bs.po -=================================================================== ---- vlc-2.2.4.orig/po/bs.po -+++ vlc-2.2.4/po/bs.po -@@ -19993,7 +19993,7 @@ msgid "&Network" - msgstr "&Mreža" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Uređaj za &Hvatanje" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ca.po -=================================================================== ---- vlc-2.2.4.orig/po/ca.po -+++ vlc-2.2.4/po/ca.po -@@ -21567,7 +21567,7 @@ msgid "&Network" - msgstr "&Xarxa" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Dispositiu de captura" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/cgg.po -=================================================================== ---- vlc-2.2.4.orig/po/cgg.po -+++ vlc-2.2.4/po/cgg.po -@@ -20877,7 +20877,7 @@ msgid "&Network" - msgstr "&Empuriziganya" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Kwata &Akoma" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ckb.po -=================================================================== ---- vlc-2.2.4.orig/po/ckb.po -+++ vlc-2.2.4/po/ckb.po -@@ -20484,7 +20484,7 @@ msgid "&Network" - msgstr "&ڕایەڵە" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/co.po -=================================================================== ---- vlc-2.2.4.orig/po/co.po -+++ vlc-2.2.4/po/co.po -@@ -19854,7 +19854,7 @@ msgid "&Network" - msgstr "&Reta" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/cs.po -=================================================================== ---- vlc-2.2.4.orig/po/cs.po -+++ vlc-2.2.4/po/cs.po -@@ -20105,7 +20105,7 @@ msgid "&Network" - msgstr "&Síť" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Zachytávací zařízení" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/cy.po -=================================================================== ---- vlc-2.2.4.orig/po/cy.po -+++ vlc-2.2.4/po/cy.po -@@ -20121,7 +20121,7 @@ msgid "&Network" - msgstr "&Rhwydwaith" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Dyfais Cipio" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/da.po -=================================================================== ---- vlc-2.2.4.orig/po/da.po -+++ vlc-2.2.4/po/da.po -@@ -21230,7 +21230,7 @@ msgid "&Network" - msgstr "&Netværk" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Optageenhed" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/de.po -=================================================================== ---- vlc-2.2.4.orig/po/de.po -+++ vlc-2.2.4/po/de.po -@@ -21413,7 +21413,7 @@ msgid "&Network" - msgstr "&Netzwerk" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Aufnahmegerät öffnen" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/el.po -=================================================================== ---- vlc-2.2.4.orig/po/el.po -+++ vlc-2.2.4/po/el.po -@@ -21687,7 +21687,7 @@ msgid "&Network" - msgstr "&Δίκτυο" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Συσκευή &σύλληψης" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/en_GB.po -=================================================================== ---- vlc-2.2.4.orig/po/en_GB.po -+++ vlc-2.2.4/po/en_GB.po -@@ -19887,7 +19887,7 @@ msgid "&Network" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/es.po -=================================================================== ---- vlc-2.2.4.orig/po/es.po -+++ vlc-2.2.4/po/es.po -@@ -21360,7 +21360,7 @@ msgid "&Network" - msgstr "&Red" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Dispositivo de &captura" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/es_MX.po -=================================================================== ---- vlc-2.2.4.orig/po/es_MX.po -+++ vlc-2.2.4/po/es_MX.po -@@ -21338,7 +21338,7 @@ msgid "&Network" - msgstr "&Red" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Dispositivo de &captura" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/et.po -=================================================================== ---- vlc-2.2.4.orig/po/et.po -+++ vlc-2.2.4/po/et.po -@@ -20599,7 +20599,7 @@ msgid "&Network" - msgstr "&Võrk" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Hõiveseade" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/eu.po -=================================================================== ---- vlc-2.2.4.orig/po/eu.po -+++ vlc-2.2.4/po/eu.po -@@ -21505,7 +21505,7 @@ msgid "&Network" - msgstr "&Sarea" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Kapturatu gailua" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/fa.po -=================================================================== ---- vlc-2.2.4.orig/po/fa.po -+++ vlc-2.2.4/po/fa.po -@@ -20008,7 +20008,7 @@ msgid "&Network" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ff.po -=================================================================== ---- vlc-2.2.4.orig/po/ff.po -+++ vlc-2.2.4/po/ff.po -@@ -19788,7 +19788,7 @@ msgid "&Network" - msgstr "&Laylaytol" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Kabirgol &Nokito" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/fi.po -=================================================================== ---- vlc-2.2.4.orig/po/fi.po -+++ vlc-2.2.4/po/fi.po -@@ -21124,7 +21124,7 @@ msgid "&Network" - msgstr "&Verkko" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Kaappauslaite" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/fr.po -=================================================================== ---- vlc-2.2.4.orig/po/fr.po -+++ vlc-2.2.4/po/fr.po -@@ -21398,7 +21398,7 @@ msgid "&Network" - msgstr "&Réseau" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Périphérique de cap&ture" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/fur.po -=================================================================== ---- vlc-2.2.4.orig/po/fur.po -+++ vlc-2.2.4/po/fur.po -@@ -21392,7 +21392,7 @@ msgstr "Rêt" - - #: modules/gui/qt4/dialogs/open.cpp:96 - #, fuzzy --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Cjapitul %d" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ga.po -=================================================================== ---- vlc-2.2.4.orig/po/ga.po -+++ vlc-2.2.4/po/ga.po -@@ -19809,7 +19809,7 @@ msgid "&Network" - msgstr "Líonra" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Gléas Gabhála" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/gd.po -=================================================================== ---- vlc-2.2.4.orig/po/gd.po -+++ vlc-2.2.4/po/gd.po -@@ -20024,7 +20024,7 @@ msgid "&Network" - msgstr "&Lìonra" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&An t-inneal glacaidh" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/gl.po -=================================================================== ---- vlc-2.2.4.orig/po/gl.po -+++ vlc-2.2.4/po/gl.po -@@ -21385,7 +21385,7 @@ msgid "&Network" - msgstr "&Rede" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Dispositivo de capturas" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/gu.po -=================================================================== ---- vlc-2.2.4.orig/po/gu.po -+++ vlc-2.2.4/po/gu.po -@@ -20800,7 +20800,7 @@ msgid "&Network" - msgstr "નેટવર્ક (&N)" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "ઉપકરણને કેદ કરો (&D)" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/he.po -=================================================================== ---- vlc-2.2.4.orig/po/he.po -+++ vlc-2.2.4/po/he.po -@@ -19973,7 +19973,7 @@ msgid "&Network" - msgstr "&רשת" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "התקן ל&כידה" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/hi.po -=================================================================== ---- vlc-2.2.4.orig/po/hi.po -+++ vlc-2.2.4/po/hi.po -@@ -19794,7 +19794,7 @@ msgid "&Network" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/hr.po -=================================================================== ---- vlc-2.2.4.orig/po/hr.po -+++ vlc-2.2.4/po/hr.po -@@ -21065,7 +21065,7 @@ msgid "&Network" - msgstr "&Mrežne veze" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Uređaj za snimanje" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/hu.po -=================================================================== ---- vlc-2.2.4.orig/po/hu.po -+++ vlc-2.2.4/po/hu.po -@@ -21304,7 +21304,7 @@ msgid "&Network" - msgstr "&Hálózat" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "F&elvevőeszköz" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/hy.po -=================================================================== ---- vlc-2.2.4.orig/po/hy.po -+++ vlc-2.2.4/po/hy.po -@@ -23197,7 +23197,7 @@ msgid "&Network" - msgstr "&Ցանց" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Նկարող &Սարք" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ia.po -=================================================================== ---- vlc-2.2.4.orig/po/ia.po -+++ vlc-2.2.4/po/ia.po -@@ -19712,7 +19712,7 @@ msgid "&Network" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/id.po -=================================================================== ---- vlc-2.2.4.orig/po/id.po -+++ vlc-2.2.4/po/id.po -@@ -20728,7 +20728,7 @@ msgid "&Network" - msgstr "Jari&ngan" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Perangkat Penangkap" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/is.po -=================================================================== ---- vlc-2.2.4.orig/po/is.po -+++ vlc-2.2.4/po/is.po -@@ -19829,7 +19829,7 @@ msgid "&Network" - msgstr "&Netkerfi" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Upptöku&tæki" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/it.po -=================================================================== ---- vlc-2.2.4.orig/po/it.po -+++ vlc-2.2.4/po/it.po -@@ -21472,7 +21472,7 @@ msgid "&Network" - msgstr "Re&te" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Dispositivo di acquisizione" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ja.po -=================================================================== ---- vlc-2.2.4.orig/po/ja.po -+++ vlc-2.2.4/po/ja.po -@@ -21106,7 +21106,7 @@ msgid "&Network" - msgstr "ネットワーク (&N)" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "キャプチャーデバイス(&D)..." - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ka.po -=================================================================== ---- vlc-2.2.4.orig/po/ka.po -+++ vlc-2.2.4/po/ka.po -@@ -21463,7 +21463,7 @@ msgstr "ქსელი" - - #: modules/gui/qt4/dialogs/open.cpp:96 - #, fuzzy --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "გახსენი ჩაწერე მოწყობილობა." - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/kk.po -=================================================================== ---- vlc-2.2.4.orig/po/kk.po -+++ vlc-2.2.4/po/kk.po -@@ -19874,7 +19874,7 @@ msgid "&Network" - msgstr "Желі" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Қармау құрылғысы" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/km.po -=================================================================== ---- vlc-2.2.4.orig/po/km.po -+++ vlc-2.2.4/po/km.po -@@ -20634,7 +20634,7 @@ msgid "&Network" - msgstr "បណ្តាញ" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "ឧបករណ៍​ចាប់យក" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/kn.po -=================================================================== ---- vlc-2.2.4.orig/po/kn.po -+++ vlc-2.2.4/po/kn.po -@@ -21072,7 +21072,7 @@ msgid "&Network" - msgstr "ಜಾಲಬಂಧ" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "ಸೆರೆಹಿಡಿಯುವ &ಸಾಧನ" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ko.po -=================================================================== ---- vlc-2.2.4.orig/po/ko.po -+++ vlc-2.2.4/po/ko.po -@@ -20854,7 +20854,7 @@ msgid "&Network" - msgstr "네트워크(&N)" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "캡처 장치(&D)" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ks_IN.po -=================================================================== ---- vlc-2.2.4.orig/po/ks_IN.po -+++ vlc-2.2.4/po/ks_IN.po -@@ -21139,7 +21139,7 @@ msgid "&Network" - msgstr "نیٹوْرک &" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "کیپچر ڈیوایِس & " - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ky.po -=================================================================== ---- vlc-2.2.4.orig/po/ky.po -+++ vlc-2.2.4/po/ky.po -@@ -19732,7 +19732,7 @@ msgid "&Network" - msgstr "&Тармак" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/lg.po -=================================================================== ---- vlc-2.2.4.orig/po/lg.po -+++ vlc-2.2.4/po/lg.po -@@ -21015,7 +21015,7 @@ msgid "&Network" - msgstr "&Omukutu" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Kwata &Kikozesidwa" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/lt.po -=================================================================== ---- vlc-2.2.4.orig/po/lt.po -+++ vlc-2.2.4/po/lt.po -@@ -20313,7 +20313,7 @@ msgid "&Network" - msgstr "&Tinklas" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Įr&ašymo įrenginys" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/lv.po -=================================================================== ---- vlc-2.2.4.orig/po/lv.po -+++ vlc-2.2.4/po/lv.po -@@ -21218,7 +21218,7 @@ msgid "&Network" - msgstr "Tīkls" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Tvert ierīci" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/mai.po -=================================================================== ---- vlc-2.2.4.orig/po/mai.po -+++ vlc-2.2.4/po/mai.po -@@ -20902,7 +20902,7 @@ msgid "&Network" - msgstr "संजाल (&N)" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "कैप्चर & डिवाइस" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/mk.po -=================================================================== ---- vlc-2.2.4.orig/po/mk.po -+++ vlc-2.2.4/po/mk.po -@@ -19702,7 +19702,7 @@ msgid "&Network" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ml.po -=================================================================== ---- vlc-2.2.4.orig/po/ml.po -+++ vlc-2.2.4/po/ml.po -@@ -21067,7 +21067,7 @@ msgid "&Network" - msgstr "നെറ്റ്വര്‍ക്ക്(_N)" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "ആഗിരണ &ഉപാധി" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/mn.po -=================================================================== ---- vlc-2.2.4.orig/po/mn.po -+++ vlc-2.2.4/po/mn.po -@@ -19777,7 +19777,7 @@ msgid "&Network" - msgstr "&Сүлжээ" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Татах төхөөрөмж" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/mr.po -=================================================================== ---- vlc-2.2.4.orig/po/mr.po -+++ vlc-2.2.4/po/mr.po -@@ -20979,7 +20979,7 @@ msgid "&Network" - msgstr "वनेटवर्क" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "ग्रहण व साधन" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ms.po -=================================================================== ---- vlc-2.2.4.orig/po/ms.po -+++ vlc-2.2.4/po/ms.po -@@ -21139,7 +21139,7 @@ msgid "&Network" - msgstr "Rangkaia&n" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Peranti Tangkapan" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/my.po -=================================================================== ---- vlc-2.2.4.orig/po/my.po -+++ vlc-2.2.4/po/my.po -@@ -19737,7 +19737,7 @@ msgid "&Network" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/nb.po -=================================================================== ---- vlc-2.2.4.orig/po/nb.po -+++ vlc-2.2.4/po/nb.po -@@ -20010,7 +20010,7 @@ msgid "&Network" - msgstr "&Nettverk" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ne.po -=================================================================== ---- vlc-2.2.4.orig/po/ne.po -+++ vlc-2.2.4/po/ne.po -@@ -20170,7 +20170,7 @@ msgid "&Network" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/nl.po -=================================================================== ---- vlc-2.2.4.orig/po/nl.po -+++ vlc-2.2.4/po/nl.po -@@ -21315,7 +21315,7 @@ msgid "&Network" - msgstr "&Netwerk" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Opnameapparaat" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/nn.po -=================================================================== ---- vlc-2.2.4.orig/po/nn.po -+++ vlc-2.2.4/po/nn.po -@@ -19996,7 +19996,7 @@ msgid "&Network" - msgstr "&Nettverksstraum" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Opptakseining" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/oc.po -=================================================================== ---- vlc-2.2.4.orig/po/oc.po -+++ vlc-2.2.4/po/oc.po -@@ -21344,7 +21344,7 @@ msgid "&Network" - msgstr "&Ret" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Periferic de cap&tura" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/or.po -=================================================================== ---- vlc-2.2.4.orig/po/or.po -+++ vlc-2.2.4/po/or.po -@@ -19732,7 +19732,7 @@ msgid "&Network" - msgstr "&ନେଟୱର୍କ" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/pa.po -=================================================================== ---- vlc-2.2.4.orig/po/pa.po -+++ vlc-2.2.4/po/pa.po -@@ -19749,7 +19749,7 @@ msgid "&Network" - msgstr "ਨੈੱਟਵਰਕ(&N)" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "ਕੈਪਚਰ ਜੰਤਰ(&D)" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/pl.po -=================================================================== ---- vlc-2.2.4.orig/po/pl.po -+++ vlc-2.2.4/po/pl.po -@@ -21205,7 +21205,7 @@ msgid "&Network" - msgstr "Sieć (&n)" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Urzą&dzenie przechwytywania" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ps.po -=================================================================== ---- vlc-2.2.4.orig/po/ps.po -+++ vlc-2.2.4/po/ps.po -@@ -20352,7 +20352,7 @@ msgid "&Network" - msgstr "ځال&" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/pt_BR.po -=================================================================== ---- vlc-2.2.4.orig/po/pt_BR.po -+++ vlc-2.2.4/po/pt_BR.po -@@ -21306,7 +21306,7 @@ msgid "&Network" - msgstr "&Rede" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Dispositivo de Captura" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/pt_PT.po -=================================================================== ---- vlc-2.2.4.orig/po/pt_PT.po -+++ vlc-2.2.4/po/pt_PT.po -@@ -21250,7 +21250,7 @@ msgid "&Network" - msgstr "Rede " - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "&Dispositivo de captura" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ro.po -=================================================================== ---- vlc-2.2.4.orig/po/ro.po -+++ vlc-2.2.4/po/ro.po -@@ -20833,7 +20833,7 @@ msgid "&Network" - msgstr "&Rețea" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Dispozitiv de &captură" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ru.po -=================================================================== ---- vlc-2.2.4.orig/po/ru.po -+++ vlc-2.2.4/po/ru.po -@@ -21190,7 +21190,7 @@ msgid "&Network" - msgstr "&Сеть" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Устройство за&хвата" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/si.po -=================================================================== ---- vlc-2.2.4.orig/po/si.po -+++ vlc-2.2.4/po/si.po -@@ -19846,7 +19846,7 @@ msgid "&Network" - msgstr "&ජාලය" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "ග්‍රහණ ආම්&පන්නය" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/sk.po -=================================================================== ---- vlc-2.2.4.orig/po/sk.po -+++ vlc-2.2.4/po/sk.po -@@ -21406,7 +21406,7 @@ msgid "&Network" - msgstr "&Sieť" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Snímacie zaria&denie" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/sl.po -=================================================================== ---- vlc-2.2.4.orig/po/sl.po -+++ vlc-2.2.4/po/sl.po -@@ -21104,7 +21104,7 @@ msgid "&Network" - msgstr "&Omrežje" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "N&aprava za zajemanje" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/sq.po -=================================================================== ---- vlc-2.2.4.orig/po/sq.po -+++ vlc-2.2.4/po/sq.po -@@ -19846,7 +19846,7 @@ msgid "&Network" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/sr.po -=================================================================== ---- vlc-2.2.4.orig/po/sr.po -+++ vlc-2.2.4/po/sr.po -@@ -20322,7 +20322,7 @@ msgid "&Network" - msgstr "&Мрежа" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Отвори &уређај за снимање..." - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/sv.po -=================================================================== ---- vlc-2.2.4.orig/po/sv.po -+++ vlc-2.2.4/po/sv.po -@@ -20656,7 +20656,7 @@ msgid "&Network" - msgstr "&Nätverk" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Fångs&tenhet" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/ta.po -=================================================================== ---- vlc-2.2.4.orig/po/ta.po -+++ vlc-2.2.4/po/ta.po -@@ -19751,7 +19751,7 @@ msgid "&Network" - msgstr "&பிணையம்" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "கைப்பற்று & சாதனம்" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/te.po -=================================================================== ---- vlc-2.2.4.orig/po/te.po -+++ vlc-2.2.4/po/te.po -@@ -19790,7 +19790,7 @@ msgid "&Network" - msgstr "నెట్‌వర్క్ (&N)" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "బంధక పరికరం (&D)" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/tet.po -=================================================================== ---- vlc-2.2.4.orig/po/tet.po -+++ vlc-2.2.4/po/tet.po -@@ -20736,7 +20736,7 @@ msgstr "_Formas" - - #: modules/gui/qt4/dialogs/open.cpp:96 - #, fuzzy --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "_Audio" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/th.po -=================================================================== ---- vlc-2.2.4.orig/po/th.po -+++ vlc-2.2.4/po/th.po -@@ -19882,7 +19882,7 @@ msgid "&Network" - msgstr "เ&ครือข่าย" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "อุปกรณ์เล่&น" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/tl.po -=================================================================== ---- vlc-2.2.4.orig/po/tl.po -+++ vlc-2.2.4/po/tl.po -@@ -20736,7 +20736,7 @@ msgstr "_Set-ap" - - #: modules/gui/qt4/dialogs/open.cpp:96 - #, fuzzy --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "M_adungan" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/tr.po -=================================================================== ---- vlc-2.2.4.orig/po/tr.po -+++ vlc-2.2.4/po/tr.po -@@ -21324,7 +21324,7 @@ msgid "&Network" - msgstr "&Ağ" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Yakalama Ay&gıtı" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/uk.po -=================================================================== ---- vlc-2.2.4.orig/po/uk.po -+++ vlc-2.2.4/po/uk.po -@@ -21248,7 +21248,7 @@ msgid "&Network" - msgstr "Мережа" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Пристрій захоплення" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/uz.po -=================================================================== ---- vlc-2.2.4.orig/po/uz.po -+++ vlc-2.2.4/po/uz.po -@@ -19788,7 +19788,7 @@ msgid "&Network" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/vi.po -=================================================================== ---- vlc-2.2.4.orig/po/vi.po -+++ vlc-2.2.4/po/vi.po -@@ -21386,7 +21386,7 @@ msgid "&Network" - msgstr "&Mạng lưới" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Ghi hình và &Thiết bị" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/wa.po -=================================================================== ---- vlc-2.2.4.orig/po/wa.po -+++ vlc-2.2.4/po/wa.po -@@ -20135,7 +20135,7 @@ msgid "&Network" - msgstr "&Rantoele" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "Éndjin d' &egaloyaedje" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/zh_CN.po -=================================================================== ---- vlc-2.2.4.orig/po/zh_CN.po -+++ vlc-2.2.4/po/zh_CN.po -@@ -20410,7 +20410,7 @@ msgid "&Network" - msgstr "网络(&N)" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "捕获设备(&D)" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/zh_TW.po -=================================================================== ---- vlc-2.2.4.orig/po/zh_TW.po -+++ vlc-2.2.4/po/zh_TW.po -@@ -19943,7 +19943,7 @@ msgid "&Network" - msgstr "網路(&N)" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "擷取裝置(&D)" - - #: modules/gui/qt4/dialogs/open.cpp:111 -Index: vlc-2.2.4/po/zu.po -=================================================================== ---- vlc-2.2.4.orig/po/zu.po -+++ vlc-2.2.4/po/zu.po -@@ -21008,7 +21008,7 @@ msgid "&Network" - msgstr "I&nethiweki" - - #: modules/gui/qt4/dialogs/open.cpp:96 --msgid "Capture &Device" -+msgid "Capture De&vice" - msgstr "I&sisetshenziswa sokuthwebula" - - #: modules/gui/qt4/dialogs/open.cpp:111 diff --git a/vlc.changes b/vlc.changes index da9da3d..f7f80fd 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,8 +1,20 @@ +------------------------------------------------------------------- +Sun Sep 4 09:23:25 UTC 2016 - dimstar@opensuse.org + +- Update vlc-2.2.4-unambig-shortcuts.patch: Also make ALT-P + unambiguous. + +------------------------------------------------------------------- +Wed Aug 31 10:54:00 UTC 2016 - dimstar@opensuse.org + +- Also use ffmpeg2-devel BuildRequires on Leap 42.2 (sle_version + 120200). + ------------------------------------------------------------------- Mon Aug 22 09:12:46 UTC 2016 - dimstar@opensuse.org -- Add ffmpeg2-BuildRequires for Tumbleweed: older openSUSE versions - had ffmpeg 2.x in the distribution. +- Add ffmpeg2-devel BuildRequires for Tumbleweed: older openSUSE + versions had ffmpeg 2.x in the distribution. ------------------------------------------------------------------- Wed Aug 10 16:30:31 UTC 2016 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 8de2301..7716ff2 100644 --- a/vlc.spec +++ b/vlc.spec @@ -199,7 +199,7 @@ BuildRequires: pkgconfig(ncursesw) BuildRequires: pkgconfig(libavcodec) >= 55.26.0 BuildRequires: pkgconfig(libavformat) >= 53.21.0 BuildRequires: pkgconfig(libavutil) >= 52.4.0 -%if 0%{?suse_version} == 1330 +%if (0%{?suse_version} == 1330) || (0%{suse_version} == 1315 && 0%{?sle_version} >= 120200) # for TW, we favor ffmpeg2-devel. Older distros have ffmpeg 2.x intree BuildRequires: ffmpeg2-devel %endif