From 54ed708c9107bb6639b6fcfce0e3a1b8b6305bf2 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 17 May 2016 22:43:28 +0200 Subject: [PATCH] kernel32-Locale_Definitions: Update patchset and remove STAGED status. --- ...nel32-Add-sr-Latn-RS-locale-definition.patch | 17 ++++++++++++----- patches/kernel32-Locale_Definitions/definition | 2 +- patches/patchinstall.sh | 3 --- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/patches/kernel32-Locale_Definitions/0002-kernel32-Add-sr-Latn-RS-locale-definition.patch b/patches/kernel32-Locale_Definitions/0002-kernel32-Add-sr-Latn-RS-locale-definition.patch index cfa22394..8c96b94c 100644 --- a/patches/kernel32-Locale_Definitions/0002-kernel32-Add-sr-Latn-RS-locale-definition.patch +++ b/patches/kernel32-Locale_Definitions/0002-kernel32-Add-sr-Latn-RS-locale-definition.patch @@ -1,12 +1,12 @@ -From 61531ffe85ccac683fd6b2904b8b03a4eef0fe92 Mon Sep 17 00:00:00 2001 +From e7fc618b090431d0baaadf917131bbcf3f8bff3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 13 May 2016 17:55:15 +0200 Subject: kernel32: Add sr-Latn-RS locale definition. --- dlls/kernel32/locale_rc.rc | 1 + - dlls/kernel32/nls/srsl.nls | 161 +++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 162 insertions(+) + dlls/kernel32/nls/srsl.nls | 168 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 169 insertions(+) create mode 100644 dlls/kernel32/nls/srsl.nls diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc @@ -23,10 +23,10 @@ index 363e7ab..5673c30 100644 diff --git a/dlls/kernel32/nls/srsl.nls b/dlls/kernel32/nls/srsl.nls new file mode 100644 -index 0000000..f4d8e57 +index 0000000..455179b --- /dev/null +++ b/dlls/kernel32/nls/srsl.nls -@@ -0,0 +1,161 @@ +@@ -0,0 +1,168 @@ +/* + * Locale definitions for Serbian (Serbia, Latin) + * @@ -163,6 +163,13 @@ index 0000000..f4d8e57 + LOCALE_SPOSITIVESIGN "+" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "d.M.yyyy" ++ LOCALE_SSHORTESTDAYNAME1 "pon" ++ LOCALE_SSHORTESTDAYNAME2 "uto" ++ LOCALE_SSHORTESTDAYNAME3 "sre" ++ LOCALE_SSHORTESTDAYNAME4 "čet" ++ LOCALE_SSHORTESTDAYNAME5 "pet" ++ LOCALE_SSHORTESTDAYNAME6 "sub" ++ LOCALE_SSHORTESTDAYNAME7 "ned" + LOCALE_SSHORTTIME "H:mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." diff --git a/patches/kernel32-Locale_Definitions/definition b/patches/kernel32-Locale_Definitions/definition index ccb47625..4118472b 100644 --- a/patches/kernel32-Locale_Definitions/definition +++ b/patches/kernel32-Locale_Definitions/definition @@ -1 +1 @@ -Fixes: [40619] Add sr-Latn-RS locale definition +# Fixes: [40619] Add sr-Latn-RS locale definition diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index cd6779b1..d7d00d66 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -4154,9 +4154,6 @@ fi # Patchset kernel32-Locale_Definitions # | -# | This patchset fixes the following Wine bugs: -# | * [#40619] Add sr-Latn-RS locale definition -# | # | Modified files: # | * dlls/kernel32/locale_rc.rc, dlls/kernel32/nls/srl.nls, dlls/kernel32/nls/srsl.nls # |