[gnome-shell] osk-layouts: Fix Swiss layouts

[Marge Bot <marge-bot src gnome org>]

commit b9b96e2b5ba470d399a314811f66889852d59dc1
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Apr 21 01:24:45 2022 +0200

    osk-layouts: Fix Swiss layouts
    
    Commit fe3a80ab9fcf added layouts for both Swiss French and Swiss
    French, but as neither name matches the XKB layout code, they are
    not used and the OSK falls back to the US layout.
    
    The correct names are 'ch' (for Switch German) and 'ch+fr', so
    rename the layout definitions accordingly.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5372
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2273>

 data/gnome-shell-osk-layouts.gresource.xml  | 4 ++--
 data/osk-layouts/{fr+ch.json => ch+fr.json} | 0
 data/osk-layouts/{de+ch.json => ch.json}    | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/data/gnome-shell-osk-layouts.gresource.xml b/data/gnome-shell-osk-layouts.gresource.xml
index ad6dc9963c..c5f22ef5bd 100644
--- a/data/gnome-shell-osk-layouts.gresource.xml
+++ b/data/gnome-shell-osk-layouts.gresource.xml
@@ -7,9 +7,10 @@
     <file>bg.json</file>
     <file>by.json</file>
     <file>ca.json</file>
+    <file>ch.json</file>
+    <file>ch+fr.json</file>
     <file>cz.json</file>
     <file>de.json</file>
-    <file>de+ch.json</file>
     <file>dk.json</file>
     <file>ee.json</file>
     <file>epo.json</file>
@@ -17,7 +18,6 @@
     <file>es.json</file>
     <file>fi.json</file>
     <file>fr.json</file>
-    <file>fr+ch.json</file>
     <file>ge.json</file>
     <file>gr.json</file>
     <file>hr.json</file>
diff --git a/data/osk-layouts/fr+ch.json b/data/osk-layouts/ch+fr.json
similarity index 100%
rename from data/osk-layouts/fr+ch.json
rename to data/osk-layouts/ch+fr.json
diff --git a/data/osk-layouts/de+ch.json b/data/osk-layouts/ch.json
similarity index 100%
rename from data/osk-layouts/de+ch.json
rename to data/osk-layouts/ch.json