Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
---
data/os/microsoft.com/win-10.xml.in | 20 +++++++++---------
data/os/microsoft.com/win-2k.xml.in | 2 +-
data/os/microsoft.com/win-2k12.xml.in | 10 ++++-----
data/os/microsoft.com/win-2k12r2.xml.in | 10 ++++-----
data/os/microsoft.com/win-2k16.xml.in | 6 +++---
data/os/microsoft.com/win-2k3.xml.in | 6 +++---
data/os/microsoft.com/win-2k3r2.xml.in | 4 ++--
data/os/microsoft.com/win-2k8.xml.in | 4 ++--
data/os/microsoft.com/win-2k8r2.xml.in | 4 ++--
data/os/microsoft.com/win-7.xml.in | 28 ++++++++++++-------------
data/os/microsoft.com/win-8.1.xml.in | 20 +++++++++---------
data/os/microsoft.com/win-8.xml.in | 20 +++++++++---------
data/os/microsoft.com/win-vista.xml.in | 4 ++--
data/os/microsoft.com/win-xp.xml.in | 4 ++--
14 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/data/os/microsoft.com/win-10.xml.in b/data/os/microsoft.com/win-10.xml.in
index 288bc06..633dcf8 100644
--- a/data/os/microsoft.com/win-10.xml.in
+++ b/data/os/microsoft.com/win-10.xml.in
@@ -32,7 +32,7 @@
<iso>
<volume-id>(J_)?CEDN?A_X86FRE_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -40,7 +40,7 @@
<iso>
<volume-id>(J_)?CEDN?A_X64FREE?_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -50,7 +50,7 @@
<iso>
<volume-id>^(J_)?CEN?A_X86FREV_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -58,7 +58,7 @@
<iso>
<volume-id>^(J_)?CENN?A_X64FREV_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -68,7 +68,7 @@
<iso>
<volume-id>(J_)?CESN?N?_X86FREV_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -76,7 +76,7 @@
<iso>
<volume-id>(J_)?CESN?N?_X64FREV_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -86,7 +86,7 @@
<iso>
<volume-id>CESE_X86FREE_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -94,7 +94,7 @@
<iso>
<volume-id>CESE_X64FREE_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -103,14 +103,14 @@
<iso>
<volume-id>^(J_)?CCSN?A_X86FRE_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
<iso>
<volume-id>^(J_)?(CCSN?A|C?CCOMA)_X64FREE?_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-2k.xml.in b/data/os/microsoft.com/win-2k.xml.in
index 9524e2b..ea33ccb 100644
--- a/data/os/microsoft.com/win-2k.xml.in
+++ b/data/os/microsoft.com/win-2k.xml.in
@@ -17,7 +17,7 @@
<media arch="i686">
<iso>
<volume-id>(W2AFPP|SP1AFPP|SP2AFPP|YRMAFPP|ZRMAFPP|W2AOEM|SP1AOEM|SP2AOEM|YRMAOEM|ZRMAOEM|W2ASEL|SP2ASEL|W2SFPP|SP1SFPP|SP2SFPP|YRMSFPP|ZRMSFPP|W2SOEM|W2SOEM|SP1SOEM|SP2SOEM|YRMSOEM|ZRMSOEM|W2SSEL|SP2SSEL|W2PFPP|SP1PFPP|SP2PFPP|YRMPFPP|ZRMPFPP|W2POEM|SP1POEM|SP2POEM|YRMPOEM|ZRMPOEM|W2PSEL|SP2PSEL|W2PCCP|WIN2000|W2K_SP4)</volume-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-2k12.xml.in b/data/os/microsoft.com/win-2k12.xml.in
index b40ee11..6ef098c 100644
--- a/data/os/microsoft.com/win-2k12.xml.in
+++ b/data/os/microsoft.com/win-2k12.xml.in
@@ -35,7 +35,7 @@
<iso>
<volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
@@ -44,7 +44,7 @@
<iso>
<volume-id>(HRM_SSSO_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -52,7 +52,7 @@
<iso>
<volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -60,7 +60,7 @@
<iso>
<volume-id>(HRM_SFST_X64FREO)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -68,7 +68,7 @@
<iso>
<volume-id>(HRM_SSS_X64FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-2k12r2.xml.in b/data/os/microsoft.com/win-2k12r2.xml.in
index 7bf7b9c..7ca74d6 100644
--- a/data/os/microsoft.com/win-2k12r2.xml.in
+++ b/data/os/microsoft.com/win-2k12r2.xml.in
@@ -30,7 +30,7 @@
<iso>
<volume-id>(IRM_SSS_X64FREE?|IRM_SSS_X64CHK|IR3_SSS_X64FREE?|IR5_SSS_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -38,7 +38,7 @@
<iso>
<volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FREE?|IRM_SSSO_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -46,7 +46,7 @@
<iso>
<volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -54,7 +54,7 @@
<iso>
<volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV|IR1_SSS_X64FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -62,7 +62,7 @@
<iso>
<volume-id>(IRM_SFST_X64FREO|IR5_SFST_X64FREO)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-2k16.xml.in b/data/os/microsoft.com/win-2k16.xml.in
index a13c628..ef5048f 100644
--- a/data/os/microsoft.com/win-2k16.xml.in
+++ b/data/os/microsoft.com/win-2k16.xml.in
@@ -21,7 +21,7 @@
<iso>
<volume-id>^(SSS_X64CHK|SSS_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -29,7 +29,7 @@
<iso>
<volume-id>^(SESS_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
@@ -37,7 +37,7 @@
<iso>
<volume-id>^(SHV_X64CHK|SHV_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-2k3.xml.in b/data/os/microsoft.com/win-2k3.xml.in
index 5bc543c..b2f631a 100644
--- a/data/os/microsoft.com/win-2k3.xml.in
+++ b/data/os/microsoft.com/win-2k3.xml.in
@@ -22,21 +22,21 @@
<iso>
<volume-id>(ARMECHK|ARMEVOL|ARMSVOL|ARMWVOL|ARMEEVL|ARMSEVL|ARMWEVL|ARMEOEM|ARMDOEM|ARMSOEM|ARMWOEM|ARMEFPP|ARMDFPP|ARMSFPP|ARMWFPP|NRMECHK|NRMEVOL|NRMSVOL|NRMWVOL|NRMEEVL|NRMSEVL|NRMWEVL|NRMEOEM|NRMDOEM|NRMSOEM|NRMWOEM|NRMEFPP|NRMDFPP|NRMSFPP|NRMSFPP|CRMSVOL|CRMSXVOL|BRMEVOL|BX2DVOL|ARMEEVL|BRMEEVL|CR0SP2)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
<iso>
<volume-id>(ARMEICHK|ARMEIFPP|ARMEIEVL|ARMEIOEM|ARMDIOEM|ARMEXFPP|ARMDFPP|ARMSXFPP|CR0SPX2|NRMEICHK|NRMEIFPP|NRMDIFPP|NRMEIOEM|NRMDIOEM|NRMEIVOL|NRMEIEVL|BRMEXVOL|BX2DXVOL)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="ia64">
<iso>
<volume-id>(ARMEIFPP|CR0SPI2)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-2k3r2.xml.in b/data/os/microsoft.com/win-2k3r2.xml.in
index 83fb749..8d49a35 100644
--- a/data/os/microsoft.com/win-2k3r2.xml.in
+++ b/data/os/microsoft.com/win-2k3r2.xml.in
@@ -18,14 +18,14 @@
<iso>
<volume-id>(CRMEFPP|CRMSFPP|CR0SCD2|CR0ECD2|BX2SFPP|BX2EFPP|BRMECD2FRE|BRMSCD2FRE)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
<iso>
<volume-id>(CRMEXFPP|CRMSXFPP|CR0SCD2X|CR0ECD2X|BX2SXFPP|BX2EXFPP|BRMECD2XFRE|BRMSCD2XFRE)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-2k8.xml.in b/data/os/microsoft.com/win-2k8.xml.in
index ef14532..97c2342 100644
--- a/data/os/microsoft.com/win-2k8.xml.in
+++ b/data/os/microsoft.com/win-2k8.xml.in
@@ -22,14 +22,14 @@
<iso>
<volume-id>(KRTMSVOL|KRTMSCHK|KRMWVOL|KRMSVOL)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
<iso>
<volume-id>(KRTMSXVOL|KRTMSXCHK|KRMWXVOL|KRMSXVOL)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-2k8r2.xml.in b/data/os/microsoft.com/win-2k8r2.xml.in
index 9c5c249..732cbe7 100644
--- a/data/os/microsoft.com/win-2k8r2.xml.in
+++ b/data/os/microsoft.com/win-2k8r2.xml.in
@@ -24,14 +24,14 @@
<iso>
<volume-id>(GRMSXVOL|GRMSXFRER|GRMSHXVOL)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="ia64">
<iso>
<volume-id>(GRMSIAIVOL|SRVHPCR2)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-7.xml.in b/data/os/microsoft.com/win-7.xml.in
index 119a744..a094b92 100644
--- a/data/os/microsoft.com/win-7.xml.in
+++ b/data/os/microsoft.com/win-7.xml.in
@@ -42,7 +42,7 @@
<iso>
<volume-id>(GRMCCHK)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -50,7 +50,7 @@
<iso>
<volume-id>(GRMCXCHK)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
@@ -60,7 +60,7 @@
<iso>
<volume-id>(GSP1RMCNSTFREO|GRMCNSTFREO|GRMCSTFREO|GSP1RMCSTFREO)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
@@ -70,7 +70,7 @@
<iso>
<volume-id>(GSP1RMCHBFRER|GRMCHBFRER)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
@@ -80,7 +80,7 @@
<iso>
<volume-id>(GSP1RMCNHPFRER|GRMCNHPFRER|GSP1RMCHPFRER|GRMCHPFRER)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -88,7 +88,7 @@
<iso>
<volume-id>(GSP1RMCNHPXFRER|GSP1RMCHPXFRER|GSP1RMCNHPXFRER|GRMCNHPXFRER|GRMCHPXFRER)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
@@ -98,7 +98,7 @@
<iso>
<volume-id>(GRMCNPRFRER|GRMCPRVOL|GSP1RMCPRVOL|GRMCPRFRER|GSP1RMCN?PRFRER|GRMCPRFREO)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -106,7 +106,7 @@
<iso>
<volume-id>(GRMCNPRXFRER|GRMCPRXVOL|GSP1RMCN?PRXFRER|GSP1RMCPRXVOL)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
@@ -116,7 +116,7 @@
<iso>
<volume-id>(GRMCENVOL|GRMCNENVOL|GSP1RMCNENVOL|GSP1RMCENVOL)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -124,7 +124,7 @@
<iso>
<volume-id>(GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GSP1RMCNENXVOL)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
@@ -134,7 +134,7 @@
<iso>
<volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GRMCNULFRER)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -142,7 +142,7 @@
<iso>
<volume-id>(GRMCULXFRER|GSP1RMCNULXFRER|GSP1RMCULXFRER|GRMCNULXFRER)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
@@ -151,14 +151,14 @@
<iso>
<volume-id>(GRMCPRFRER)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
<iso>
<volume-id>(GRMCHPXFRER|GRMCXCHK|GRMCPRXFRER)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-8.1.xml.in b/data/os/microsoft.com/win-8.1.xml.in
index 9294ba0..25f71c7 100644
--- a/data/os/microsoft.com/win-8.1.xml.in
+++ b/data/os/microsoft.com/win-8.1.xml.in
@@ -32,7 +32,7 @@
<iso>
<volume-id>(IRM_CCSN?A_X86CHK)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -40,7 +40,7 @@
<iso>
<volume-id>(IRM_CCSN?A_X64CHK)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -50,7 +50,7 @@
<iso>
<volume-id>(IRM_CENN?A_X86CHKV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -58,7 +58,7 @@
<iso>
<volume-id>(IRM_CENN?A_X64CHKV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -68,7 +68,7 @@
<iso>
<volume-id>(IR[M15]_CPRN?A_X86FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -76,7 +76,7 @@
<iso>
<volume-id>(IR[M15]_CPRN?A_X64FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -86,7 +86,7 @@
<iso>
<volume-id>(IR[M135]_CENN?A_X86FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -94,7 +94,7 @@
<iso>
<volume-id>(IR[M135]_CENN?A_X64FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -103,14 +103,14 @@
<iso>
<volume-id>(IR[M35]_CCSN?A_X86FRE)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
<iso>
<volume-id>(IR[M35]_CCSN?A_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-8.xml.in b/data/os/microsoft.com/win-8.xml.in
index 900eac4..21cae2f 100644
--- a/data/os/microsoft.com/win-8.xml.in
+++ b/data/os/microsoft.com/win-8.xml.in
@@ -31,14 +31,14 @@
<iso>
<volume-id>(HB1_CCPA_X86FRE|HRM_CCSN?A_X86FRE)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
<iso>
<volume-id>(HB1_CCPA_X64FREE?|HRM_CCSN?A_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -48,7 +48,7 @@
<iso>
<volume-id>(HRM_CCSN?A_X86CHK)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -56,7 +56,7 @@
<iso>
<volume-id>(HRM_CCSN?A_X64CHK)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -66,7 +66,7 @@
<iso>
<volume-id>(HRM_CENN?A_X86FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -74,7 +74,7 @@
<iso>
<volume-id>(HRM_CENN?A_X64FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -84,7 +84,7 @@
<iso>
<volume-id>(HRM_CENN?A_X86CHKV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -92,7 +92,7 @@
<iso>
<volume-id>(HRM_CENN?A_X64CHKV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
@@ -102,7 +102,7 @@
<iso>
<volume-id>(HRM_CPRN?A_X86FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64" installer-reboots="2">
@@ -110,7 +110,7 @@
<iso>
<volume-id>(HRM_CPRN?A_X64FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[A-Z[:digit:]_]*_([A-Z]*-[A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-vista.xml.in b/data/os/microsoft.com/win-vista.xml.in
index 770be67..fc269b1 100644
--- a/data/os/microsoft.com/win-vista.xml.in
+++ b/data/os/microsoft.com/win-vista.xml.in
@@ -18,14 +18,14 @@
<iso>
<volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRTMEVOL|FRMBVOL|FRMEVOL|FRMCFRE)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
<media arch="x86_64">
<iso>
<volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMEXVOL|FRTMEXVOL|FRMBXVOL|FRMCXFRE)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
diff --git a/data/os/microsoft.com/win-xp.xml.in b/data/os/microsoft.com/win-xp.xml.in
index f598452..9c8f2db 100644
--- a/data/os/microsoft.com/win-xp.xml.in
+++ b/data/os/microsoft.com/win-xp.xml.in
@@ -23,7 +23,7 @@
<iso>
<volume-id>(WXPFPP|WXHFPP|WXPCCP|WXHCCP|WXPOEM|WXHOEM|WXPVOL|WXPEVL|XRMPFPP|XRMHFPP|XRMPCCP|XRMHCCP|XRMPOEM|XRMHOEM|XRMPVOL|XRMSD2|X1APFPP|X1AHFPP|X1APCCP|X1APCCP|X1AHCCP|X1APOEM|X1AHOEM|X1APVOL|VRMPFPP|VRMHFPP|VRMPCCP|VRMHCCP|VRMPOEM|VRMHOEM|VRMPVOL|VRMSD2|VX2PFPP|VX2HFPP|VX2PCCP|VX2HCCP|VX2POEM|VX2HOEM|VX2PRMFPP|VX2PVOL|GRTMUPD|GRTMPFPP|GRTMPRMFPP|GRTMHFPP|GRTMHKFPP|GRTMHKNFPP|GRTMHRMFPP|GRTMPOEM|GRTMHOEM|GRTMPVOL|GRTMPKNVOL|GRTMPKVOL|GRTMPRMVOL|MX2PFPP|MRMSD2)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
@@ -31,7 +31,7 @@
<iso>
<volume-id>(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXCFPP|AX2PXFPP)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
- <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[A-Z[:digit:]]*_([A-Z]*)</l10n-language>
</iso>
</media>
--
2.20.1
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
