Add Is8OrLater() and use that in the places we checked for Windows 8.

Fixes ticket #3411.

55 files changed, 32 insertions, 31 deletions

diff --git a/src/DSUtil/SysVersion.h b/src/DSUtil/SysVersion.h
index 700457d49..0f6a90e2f 100644
--- a/src/DSUtil/SysVersion.h
+++ b/src/DSUtil/SysVersion.h
@@ -45,6 +45,7 @@ public:
     static bool Is7() { return (version == 0x0601); }

     static bool Is7OrLater() { return (version >= 0x0601); }

     static bool Is8() { return (version == 0x0602); }

+    static bool Is8OrLater() { return (version >= 0x0602); }

 

     static bool Is64Bit() { return is64Bit; }

 };

diff --git a/src/mpc-hc/FileAssoc.cpp b/src/mpc-hc/FileAssoc.cpp
index 0026dece1..5846cd066 100644
--- a/src/mpc-hc/FileAssoc.cpp
+++ b/src/mpc-hc/FileAssoc.cpp
@@ -190,7 +190,7 @@ bool CFileAssoc::Register(CString ext, CString strLabel, bool bRegister, bool bR
 

     if (!bRegister) {

         // On Windows 8, an app can't set itself as the default handler for a format

-        if (!SysVersion::Is8() && bRegister != IsRegistered(ext)) {

+        if (!SysVersion::Is8OrLater() && bRegister != IsRegistered(ext)) {

             SetFileAssociation(ext, strProgID, bRegister);

         }

 

@@ -279,7 +279,7 @@ bool CFileAssoc::Register(CString ext, CString strLabel, bool bRegister, bool bR
         }

 

         // On Windows 8, an app can't set itself as the default handler for a format

-        if (!SysVersion::Is8() && bRegister != IsRegistered(ext)) {

+        if (!SysVersion::Is8OrLater() && bRegister != IsRegistered(ext)) {

             SetFileAssociation(ext, strProgID, bRegister);

         }

 

@@ -420,7 +420,7 @@ bool CFileAssoc::IsRegistered(CString ext)
         m_pAAR = CFileAssoc::CreateRegistrationManager();

     }

 

-    if (SysVersion::Is8()) {

+    if (SysVersion::Is8OrLater()) {

         // The Eight way

         bIsDefault = TRUE; // Check only if MPC-HC is registered as able to handle that format, not if it's the default.

     } else if (m_pAAR) {

diff --git a/src/mpc-hc/PPageFormats.cpp b/src/mpc-hc/PPageFormats.cpp
index c4d70ad6d..b60841661 100644
--- a/src/mpc-hc/PPageFormats.cpp
+++ b/src/mpc-hc/PPageFormats.cpp
@@ -232,7 +232,7 @@ BOOL CPPageFormats::OnInitDialog()
         GetDlgItem(IDC_BUTTON5)->ShowWindow(SW_HIDE);

     }

 

-    if (SysVersion::Is8()) {

+    if (SysVersion::Is8OrLater()) {

         CRect r;

         GetDlgItem(IDC_STATIC2)->GetWindowRect(r);

         ScreenToClient(r);

diff --git a/src/mpc-hc/mpcresources/mplayerc.br.rc b/src/mpc-hc/mpcresources/mplayerc.br.rc
index acea8d808..fe6457032 100644
--- a/src/mpc-hc/mpcresources/mplayerc.br.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.br.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.by.rc b/src/mpc-hc/mpcresources/mplayerc.by.rc
index 1ee77481d..2d8f730ed 100644
--- a/src/mpc-hc/mpcresources/mplayerc.by.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.by.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.ca.rc b/src/mpc-hc/mpcresources/mplayerc.ca.rc
index 92866a6a0..cbedcb354 100644
--- a/src/mpc-hc/mpcresources/mplayerc.ca.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.ca.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.cz.rc b/src/mpc-hc/mpcresources/mplayerc.cz.rc
index 5b4a37bf0..534d62885 100644
--- a/src/mpc-hc/mpcresources/mplayerc.cz.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.cz.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.de.rc b/src/mpc-hc/mpcresources/mplayerc.de.rc
index fa8d66563..707b68bbf 100644
--- a/src/mpc-hc/mpcresources/mplayerc.de.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.de.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.el.rc b/src/mpc-hc/mpcresources/mplayerc.el.rc
index 31bf7b4e4..e33fcc5aa 100644
--- a/src/mpc-hc/mpcresources/mplayerc.el.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.el.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.es.rc b/src/mpc-hc/mpcresources/mplayerc.es.rc
index 2a6b62943..ffe8d0ec7 100644
--- a/src/mpc-hc/mpcresources/mplayerc.es.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.es.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.eu.rc b/src/mpc-hc/mpcresources/mplayerc.eu.rc
index ad503a240..7baa05f69 100644
--- a/src/mpc-hc/mpcresources/mplayerc.eu.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.eu.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.fr.rc b/src/mpc-hc/mpcresources/mplayerc.fr.rc
index 9dd6b6f65..3d19c9d44 100644
--- a/src/mpc-hc/mpcresources/mplayerc.fr.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.fr.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.he.rc b/src/mpc-hc/mpcresources/mplayerc.he.rc
index f89d4f46c..a1e185674 100644
--- a/src/mpc-hc/mpcresources/mplayerc.he.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.he.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.hu.rc b/src/mpc-hc/mpcresources/mplayerc.hu.rc
index 96b95ad85..cb8badcbe 100644
--- a/src/mpc-hc/mpcresources/mplayerc.hu.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.hu.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.hy.rc b/src/mpc-hc/mpcresources/mplayerc.hy.rc
index 83c6c9a43..17b022df8 100644
--- a/src/mpc-hc/mpcresources/mplayerc.hy.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.hy.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.it.rc b/src/mpc-hc/mpcresources/mplayerc.it.rc
index e4f5dcb30..c895a9747 100644
--- a/src/mpc-hc/mpcresources/mplayerc.it.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.it.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.ja.rc b/src/mpc-hc/mpcresources/mplayerc.ja.rc
index 29a1bade5..05170da7d 100644
--- a/src/mpc-hc/mpcresources/mplayerc.ja.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.ja.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.kr.rc b/src/mpc-hc/mpcresources/mplayerc.kr.rc
index 90fc91837..f28e028e0 100644
--- a/src/mpc-hc/mpcresources/mplayerc.kr.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.kr.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.nl.rc b/src/mpc-hc/mpcresources/mplayerc.nl.rc
index c9909b403..1781055d6 100644
--- a/src/mpc-hc/mpcresources/mplayerc.nl.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.nl.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.pl.rc b/src/mpc-hc/mpcresources/mplayerc.pl.rc
index 1bdae3929..36b36aae8 100644
--- a/src/mpc-hc/mpcresources/mplayerc.pl.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.pl.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.ro.rc b/src/mpc-hc/mpcresources/mplayerc.ro.rc
index 7cc93bf09..a4e92a3e8 100644
--- a/src/mpc-hc/mpcresources/mplayerc.ro.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.ro.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.ru.rc b/src/mpc-hc/mpcresources/mplayerc.ru.rc
index 9b1d7bf85..ebc5a8987 100644
--- a/src/mpc-hc/mpcresources/mplayerc.ru.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.ru.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.sc.rc b/src/mpc-hc/mpcresources/mplayerc.sc.rc
index c1bd1c72c..357e76363 100644
--- a/src/mpc-hc/mpcresources/mplayerc.sc.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.sc.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.sk.rc b/src/mpc-hc/mpcresources/mplayerc.sk.rc
index 3186b189b..6deed67b5 100644
--- a/src/mpc-hc/mpcresources/mplayerc.sk.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.sk.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.sv.rc b/src/mpc-hc/mpcresources/mplayerc.sv.rc
index bfaeb28d4..03a747941 100644
--- a/src/mpc-hc/mpcresources/mplayerc.sv.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.sv.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.tc.rc b/src/mpc-hc/mpcresources/mplayerc.tc.rc
index 3266d5799..5976a2bdb 100644
--- a/src/mpc-hc/mpcresources/mplayerc.tc.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.tc.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.tr.rc b/src/mpc-hc/mpcresources/mplayerc.tr.rc
index 1de0330f7..cb6ddca29 100644
--- a/src/mpc-hc/mpcresources/mplayerc.tr.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.tr.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.ua.rc b/src/mpc-hc/mpcresources/mplayerc.ua.rc
index 8e6c0c033..028103cab 100644
--- a/src/mpc-hc/mpcresources/mplayerc.ua.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.ua.rc
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt
index 38629121a..ec485fda8 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Extensões de arquivo"

 8		"Padrão"

 9		"Gravar"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Set default programs"

 12		"Associação"

 13		"&Vídeo"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt
index c0ff5dff8..6ab1142a0 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Пашырэнні файлаў"

 8		"Стандартна"

 9		"Усталяваць"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Set default programs"

 12		"Асацыяцыі"

 13		"&Відэа"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt
index 66a6d4ce9..63b5ec4af 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Extensions d'arxiu"

 8		"Per defecte"

 9		"Fixar"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Establir programes predeterminats"

 12		"Associació"

 13		"&Vídeo"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt
index 5975751ce..e82923588 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Přípony souborů"

 8		"Standardní"

 9		"Nastavit"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Nastavení výchozích programů"

 12		"Asociace"

 13		"&Video"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt
index a3ae16248..e536dfc71 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Dateierweiterungen"

 8		"&Standard"

 9		"&Übernehmen"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"Standard-Programme festlegen"

 12		"Dateiverknüpfungen"

 13		"&Video"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt
index 75b95f667..5a3f54d4c 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Επεκτάσεις αρχείων"
 8		"Προεπιλογή"
 9		"Ρύθμιση"
-10		"Windows 8"
+10		"Windows 8 or later"
 11		"&Ορισμός προεπιλ/νων προγραμμάτων"
 12		"Συσχέτιση"
 13		"&Βίντεο"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt
index 83e222bbc..68b367d6f 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Extensiones de archivo"

 8		"Original"

 9		"Fijar"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Set default programs"

 12		"Asociación"

 13		"&Video"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.eu.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.eu.rc.txt
index f76094ea3..18cc78974 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.eu.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.eu.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Agiri hedapenak"

 8		"Berez"

 9		"Ezarri"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Ezarri berezko programak"

 12		"Elkarketa"

 13		"&Bideoa"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt
index 4e1a84fbb..7724cc753 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Extensions de fichiers"

 8		"Par défaut"

 9		"Définir"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Choisir les programmes par défaut"

 12		"Association"

 13		"&Vidéo"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt
index efc63ad68..d9b0104ba 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"סיומות קבצים"

 8		"ברירת מחדל"

 9		"קבע"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Set default programs"

 12		"שיוך קבצים"

 13		"&ודיאו"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt
index 2756abd79..6153ca69f 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Fájlkiterjesztések"

 8		"Alapértelmezés"

 9		"Beállítás"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Set default programs"

 12		"Társítás"

 13		"&Videó"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt
index 150f4b3ad..02691101a 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Ֆայլերի տեսակները"

 8		"Ըստ ծրագրայինի"

 9		"Տեղակայել"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Նշել հիմնական ծրագրերը"

 12		"Ասոցիացումներ"

 13		"&Տեսանյութ"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt
index 929aebf76..508d6ea35 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Estensioni dei file"

 8		"Predefiniti"

 9		"Imposta"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Set default programs"

 12		"Associazione file"

 13		"&Video"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt
index 9afbb9a69..21db915c4 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"拡張子"

 8		"デフォルト"

 9		"設定"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"デフォルト プログラムを設定する(&S)"

 12		"関連付け"

 13		"動画(&V)"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt
index 8a2e7167b..a5d81cbe0 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"파일 형식"

 8		"기본값"

 9		"설정"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Set default programs"

 12		"연결"

 13		"비디오(&V)"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt
index bb7fde6a2..f9cca70d3 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Bestandsextensies"

 8		"Standaard"

 9		"Toepassen"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Set default programs"

 12		"Koppeling"

 13		"&Video"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt
index 90cd054ed..39dc0a378 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Rozszerzenia plików"

 8		"Domyślne"

 9		"Ustaw"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Ustaw domyślne programy"

 12		"Powiązania"

 13		"&Wideo"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.rc.txt
index 6ce70f2d8..3c5992762 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"File extensions"

 8		"Default"

 9		"Set"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Set default programs"

 12		"Association"

 13		"&Video"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt
index b9aa454b7..852d7b1a3 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Extensii fișiere"
 8		"Implicit"
 9		"Definește"
-10		"Windows 8"
+10		"Windows 8 or later"
 11		"&Setează programele implicite"
 12		"Asociere"
 13		"&Video"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt
index 463c6c736..bdbb42944 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Расширения файлов"

 8		"По умолчанию"

 9		"Установить"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Установка программ по умолчанию"

 12		"Ассоциации"

 13		"&Видео"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt
index df3e303e8..ca171f247 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"文件扩展名"

 8		"默认"

 9		"设置"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"设置为默认程序(&S)"

 12		"关联"

 13		"视频(&V)"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt
index c74bcf6db..592112a17 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Koncovky súborov"

 8		"Predvol."

 9		"Nastaviť"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Nastaviť predvolený program"

 12		"Asociácia"

 13		"&Video"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt
index 6ec469b96..e97446861 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Filnamnstillägg"

 8		"Standard"

 9		"Ange"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Ange standardprogram"

 12		"Associering"

 13		"&Video"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt
index 2e6f6a184..872b3cec8 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"副檔名"

 8		"預設值"

 9		"設定"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"設定預設程式(&S)"

 12		"檔案關聯"

 13		"視訊(&V)"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt
index 115770ff4..f40c3cbf0 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Dosya uzantıları"

 8		"Varsayılan"

 9		"Ayarla"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Varsayılan uygulamaları seç"

 12		"İlişkilendirme"

 13		"&Video"

diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt
index d3f9ea3bb..06e6f8ee8 100644
--- a/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt
+++ b/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt
@@ -202,7 +202,7 @@ BEGIN DIALOGEX IDD_PPAGEFORMATS LINES 31
 5		"Розширення файлів"

 8		"Типово"

 9		"Встановити"

-10		"Windows 8"

+10		"Windows 8 or later"

 11		"&Задати програми типов. викор."

 12		"Ассоціації"

 13		"&Відео"

diff --git a/src/mpc-hc/mplayerc.rc b/src/mpc-hc/mplayerc.rc
index 154a6d5e7..aed6b780d 100644
--- a/src/mpc-hc/mplayerc.rc
+++ b/src/mpc-hc/mplayerc.rc
@@ -362,7 +362,7 @@ BEGIN
     EDITTEXT        IDC_EDIT1,10,139,165,13,ES_AUTOHSCROLL

     PUSHBUTTON      "Default",IDC_BUTTON2,179,138,54,14

     PUSHBUTTON      "Set",IDC_BUTTON_EXT_SET,237,138,49,14

-    GROUPBOX        "Windows 8",IDC_STATIC3,5,127,286,26

+    GROUPBOX        "Windows 8 or later",IDC_STATIC3,5,127,286,26

     PUSHBUTTON      "&Set default programs",IDC_BUTTON6,10,136,120,14

     GROUPBOX        "Association",IDC_STATIC,5,157,286,26

     PUSHBUTTON      "&Video",IDC_BUTTON4,10,167,40,14