[libgweather: 2/2] Merge branch 'main' into 'main'

[Emmanuele Bassi <ebassi src gnome org>]

commit 30b5f486db5b633bcdb03933172922fb006a174b
Merge: 4b7fce75 2cb20d48
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Tue Aug 23 14:14:44 2022 +0000

    Merge branch 'main' into 'main'
    
    Added cities in Brazil
    
    See merge request GNOME/libgweather!209

 data/Locations.xml | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 208 insertions(+), 7 deletions(-)
---
diff --cc data/Locations.xml
index b4f2e136,3f45bca8..aa558d31
--- a/data/Locations.xml
+++ b/data/Locations.xml
@@@ -10264,16 -10401,10 +10441,16 @@@
          </city>
          <city>
            <!-- A city in São Paulo in Brazil -->
-           <_name>São José dos Campos</_name>
-           <coordinates>-23.183333 -45.883333</coordinates>
+           <_name msgctxt="City in São Paulo, Brazil">São José do Rio Preto</_name>
+           <coordinates>-20.820000 -49.378889</coordinates>
            <tz-hint>America/Sao_Paulo</tz-hint>
          </city>
 +        <city>
 +          <!-- A city in São Paulo in Brazil -->
 +          <_name>Diadema</_name>
 +          <coordinates>-23.681347 -46.62052</coordinates>
 +          <tz-hint>America/Sao_Paulo</tz-hint>
 +        </city>
          <city>
            <!-- A city in São Paulo in Brazil -->
            <_name msgctxt="City in São Paulo, Brazil">São Paulo</_name>