[android] Clean background color in views

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml

@@ -2,6 +2,6 @@
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
-  <solid android:color="@color/bg_panel"/>
+  <solid android:color="@color/bg_window"/>
   <corners android:radius="100dp"/>
 </shape>

android/app/src/main/res/drawable/bg_search_wheel_background_round.xml

@@ -2,5 +2,5 @@
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="oval">
-  <solid android:color="@color/bg_panel"/>
+  <solid android:color="@color/bg_window"/>
 </shape>

android/app/src/main/res/layout/dialog_missed_map.xml

@@ -24,7 +24,7 @@
     android:id="@+id/items_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?panel">
+    android:background="?windowBackgroundForced">
     <include
       layout="@layout/item_missed_map"
       android:layout_width="match_parent"

android/app/src/main/res/layout/dialog_missed_maps.xml

@@ -26,7 +26,7 @@
     android:id="@+id/items_frame"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?panel"
+    android:background="?windowBackgroundForced"
     android:listSelector="?clickableBackground"
     android:drawSelectorOnTop="true"/>
 

android/app/src/main/res/layout/edit_bookmark_common.xml

@@ -60,7 +60,7 @@
       android:layout_below="@id/tv__bookmark_set_title"
       android:layout_centerVertical="true"
       android:layout_marginEnd="@dimen/margin_quadruple"
-      android:background="?attr/selectableItemBackground"
+      android:background="?selectableItemBackground"
       android:clickable="true"
       android:paddingTop="@dimen/margin_quarter_plus"
       android:paddingBottom="@dimen/margin_half_plus"

android/app/src/main/res/layout/fragment_driving_options.xml

@@ -2,7 +2,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?attr/cardBackground"
+  android:background="?cardBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
@@ -11,7 +11,6 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?colorPrimary"
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme">
   </com.google.android.material.appbar.MaterialToolbar>

android/app/src/main/res/layout/fragment_edit_bookmark.xml

@@ -18,7 +18,7 @@
         app:srcCompat="@drawable/ic_done"
         android:layout_width="?actionBarSize"
         android:layout_height="?actionBarSize"
-        android:background="?attr/selectableItemBackgroundBorderless"
+        android:background="?selectableItemBackgroundBorderless"
         android:layout_gravity="end|center_vertical"
         android:scaleType="centerInside"
         android:contentDescription="@string/save" />

android/app/src/main/res/layout/fragment_editor_host.xml

@@ -48,7 +48,6 @@
   <FrameLayout
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?panel"/>
+    android:layout_height="match_parent" />
 
 </LinearLayout>

android/app/src/main/res/layout/fragment_osm_profile.xml

@@ -12,7 +12,6 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?colorPrimary"
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme">
     <com.google.android.material.imageview.ShapeableImageView

android/app/src/main/res/layout/fragment_report.xml

@@ -22,8 +22,7 @@
   <ScrollView
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?panel">
+    android:layout_height="match_parent">
 
     <LinearLayout
       android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_search.xml

@@ -15,7 +15,7 @@
       android:id="@+id/app_bar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?attr/colorPrimary"
+      android:background="?colorPrimary"
       android:elevation="@dimen/dp_0"
       app:elevation="@dimen/dp_0">
         <include

android/app/src/main/res/layout/manage_route_bottom_sheet.xml

@@ -45,7 +45,7 @@
     android:paddingStart="0dp"
     android:paddingEnd="@dimen/altitude_chart_container_padding_left">
 
-    <View
+    <com.google.android.material.divider.MaterialDivider
       android:layout_width="match_parent"
       android:layout_height="@dimen/divider_height"
       android:background="?dividerHorizontal"/>

android/app/src/main/res/layout/place_page_details.xml

@@ -4,7 +4,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?panel"
+  android:background="?windowBackgroundForced"
   android:orientation="vertical">
 
 

android/app/src/main/res/layout/place_page_preview.xml

@@ -155,7 +155,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_half_plus"
         android:layout_marginBottom="@dimen/margin_quarter"
-        android:background="?attr/selectableItemBackground"
+        android:background="?selectableItemBackground"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingStart="@dimen/margin_quarter"

android/app/src/main/res/layout/position_chooser.xml

@@ -29,7 +29,7 @@
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?panel"
+    android:background="?cardBackground"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_focus_map_on_location"
     app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />

android/app/src/main/res/layout/pp_buttons_fragment.xml

@@ -4,7 +4,7 @@
   android:id="@+id/pp_buttons_layout"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?ppButtonsBackground"
+  android:background="?windowBackgroundForced"
   android:orientation="horizontal"
   android:layout_gravity="bottom">
   <include layout="@layout/item_divider" />

android/app/src/main/res/layout/routing_plan.xml

@@ -28,7 +28,7 @@
             android:layout_width="?attr/actionBarSize"
             android:layout_height="?attr/actionBarSize"
             android:layout_alignParentStart="true"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="?selectableItemBackgroundBorderless"
             app:srcCompat="?homeAsUpIndicator"
             android:scaleType="center"
             tools:src="@drawable/ic_expand_more" />
@@ -143,7 +143,7 @@
     android:id="@+id/driving_options_btn_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/drivingOptionsViewBg"
+    android:background="?drivingOptionsViewBg"
     android:foreground="@drawable/shadow_top"
     android:visibility="gone"
     tools:visibility="visible">
@@ -151,7 +151,7 @@
       android:id="@+id/driving_options_btn"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?attr/selectableItemBackgroundBorderless"
+      android:background="?selectableItemBackgroundBorderless"
       android:gravity="center"
       android:minHeight="@dimen/height_block_base">
       <LinearLayout

android/app/src/main/res/layout/toolbar_search_controls.xml

@@ -14,7 +14,7 @@
     android:id="@+id/back"
     android:layout_width="?attr/actionBarSize"
     android:layout_height="?attr/actionBarSize"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     app:srcCompat="?homeAsUpIndicator"
     android:scaleType="center"
     tools:src="@drawable/ic_expand_more"
@@ -52,7 +52,7 @@
     android:layout_height="?actionBarSize"
     android:layout_gravity="center_vertical"
     android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     android:contentDescription="@string/clear_the_search"
     android:scaleType="center"
     app:srcCompat="@drawable/ic_close"/>
@@ -63,7 +63,7 @@
     android:layout_height="?actionBarSize"
     android:layout_gravity="center_vertical"
     android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     android:contentDescription="@null"
     android:scaleType="center"
     app:srcCompat="@drawable/ic_mic_white"

data/categories-strings/fr.json/localize.json

@@ -220,13 +220,13 @@
 "tourism-motel|@category_hotel": "3Motel|auberge de jeunesse",
 "tourism-alpine_hut|@category_hotel": "Refuge de montagne|auberge de jeunesse|cabane alpine",
 "shop-hairdresser": "3Coiffeur|salon de coiffure",
-"aeroway-aerodrome": "3Aéroport|3aérodrome|3avion",
+"aeroway-aerodrome": "3Aéroport|3aérodrome|3avion|3aérogare",
 "leisure-stadium": "4Stade|4sport",
-"leisure-playground|@category_children": "Terrain de jeu|aire de jeu",
-"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Centre sportif|sport",
+"leisure-playground|@category_children": "Terrain de jeu|aire de jeu|parc de jeux|espace de jeu",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Centre sportif|salle omnisports|complexe sportif|sport",
 "leisure-golf_course": "Terrain de golf|Parcours de golf",
 "leisure-miniature_golf": "Minigolf",
-"leisure-escape_game": "Salle d'évasion",
+"leisure-escape_game": "Salle d'évasion|escape game",
 "leisure-pitch": "Terrain de sport|sport",
 "leisure-swimming_pool": "4Piscine|sport",
 "sport-american_football": "Football américain",
@@ -245,12 +245,12 @@
 "sport-gymnastics": "Gymnastique",
 "sport-handball": "Handball",
 "sport-scuba_diving": "Plongée sous-marine",
-"sport-shooting": "Stand de tir|Centre de tir",
+"sport-shooting": "Stand de tir|Centre de tir|champ de tir|salle de tir",
 "sport-skateboard": "Skateboard",
 "sport-skiing": "Ski",
 "sport-soccer": "Football",
 "sport-swimming": "Piscine|Natation",
-"sport-table_tennis": "Tennis de table",
+"sport-table_tennis": "Tennis de table|Ping Pong",
 "sport-tennis": "Tennis",
 "sport-padel": "Padel",
 "sport-volleyball": "Volley-ball",
@@ -272,27 +272,27 @@
 "natural-water-pond|@waterbody": "Étang|bassin",
 "natural-water-lake|@waterbody": "Lac",
 "natural-water-reservoir|landuse-reservoir|@waterbody": "5Réservoir",
-"waterway-river|waterway-stream|natural-water-river": "Rivière|fleuve",
+"waterway-river|waterway-stream|natural-water-river": "Rivière|fleuve|ruisseau|cours d'eau|torrent",
 "waterway-canal": "Canal",
 "shop-car_repair": "3Réparation d'automobiles|3garage|4station service|voiture|auto|garagiste|mécano|mécanicien automobile",
 "tourism-camp_site|@category_hotel": "4Camping|terrain de camping",
 "tourism-caravan_site|@category_rv||@category_hotel": "4Parc caravanier|VR|caravane|camping-car",
 "office": "Bureau|compagnie",
 "office-company": "Bureaux d'entreprise",
-"office-government": "Administration publique",
-"office-lawyer": "Cabinet d'avocat",
+"office-government": "Administration publique|service public|fonction publique|service civil|services administratifs",
+"office-lawyer": "Cabinet d'avocat|bureau d'avocat",
 "office-telecommunication": "Opérateur mobile",
 "craft-beekeeper": "Apiculteur",
 "craft-blacksmith": "Forgeron",
-"craft-brewery": "Brasserie artisanale|Brasseur",
+"craft-brewery": "Brasserie artisanale|Brasseur|micro-brasserie",
 "craft-caterer": "Traiteur",
 "craft-carpenter": "Menuisier|charpentier",
 "craft-confectionery": "Confiseur",
 "craft-electrician": "4Électricien",
 "craft-electronics_repair": "Réparation d'appareils électroniques",
-"craft-gardener": "Paysagiste",
+"craft-gardener": "Paysagiste|jardinier",
 "craft-grinding_mill": "Moulin",
-"craft-handicraft": "Artisanat",
+"craft-handicraft": "Artisanat|fait-main|métiers d'art",
 "craft-hvac": "Chauffage, ventilation et climatisation",
 "craft-metal_construction": "5Métallo|métallurgiste",
 "craft-key_cutter": "Reproduction de clé",
@@ -302,7 +302,7 @@
 "craft-plumber": "Plombier",
 "craft-sawmill": "Scierie",
 "craft-shoemaker": "Cordonnier",
-"craft-winery": "Chai",
+"craft-winery": "Chai|établissement vinicole",
 "craft-tailor": "5Tailleur",
 "area:highway-footway|area:highway-pedestrian|area:highway-steps|place-square": "Place",
 "place-sea": "Mer",
@@ -320,11 +320,11 @@
 "shop-copyshop": "Boutique de photocopies|5Imprimerie",
 "shop-photo|@shop": "5Matériel de photographie|5Photographie|Cadres",
 "shop-camera|@shop": "Boutique d'appareils photo",
-"shop-travel_agency": "Agence de voyages|Voyages organisés",
+"shop-travel_agency": "Agence de voyages|Voyages organisés|agence de tourisme|voyagiste",
 "shop-outdoor|@shop": "Matériel de loisirs de plein air|Randonnée|Escalade|Camping",
 "shop-dry_cleaning": "Nettoyage à sec|Pressing|Lavage",
 "shop-tyres|@shop": "Pneu|Pneus",
-"amenity-car_wash": "Station de lavage|lavage-autp",
+"amenity-car_wash": "Station de lavage|lavage-auto|lavage de voiture",
 "amenity-veterinary": "Docteur vétérinaire|véto|Clinique vétérinaire",
 "@charging_station": "Borne de recharge|station de recharge|4voiture électrique|4recharge|IRVE",
 "amenity-charging_station-bicycle|@charging_station": "Chargement des vélos",
@@ -332,14 +332,14 @@
 "amenity-bicycle_parking": "Parking à vélo|Stationnement vélo",
 "amenity-waste_basket": "Poubelle",
 "emergency-phone": "3Téléphone d'urgence",
-"leisure-fitness_centre": "Centre fitness|salle de gym|salle de sport",
+"leisure-fitness_centre": "Centre fitness|salle de gym|salle de sport|centre de remise en forme",
 "leisure-sauna": "3Sauna",
 "shop-car_repair-tyres|shop-car_repair": "Réparation de pneus",
 "shop-chemist|@shop": "4Droguerie",
-"shop-pet|@shop": "5Animalerie",
-"tourism-zoo|@category_tourism|@category_children": "Zoo|Parc Animalier",
+"shop-pet|@shop": "5Animalerie|magasin d'animaux",
+"tourism-zoo|@category_tourism|@category_children": "Zoo|Parc Animalier|ménagerie|parc zoologique",
 "attraction-animal": "Enclos pour animaux",
-"tourism-information-office|amenity-ranger_station|@category_tourism": "Office de tourisme|syndicat d'initiative",
+"tourism-information-office|amenity-ranger_station|@category_tourism": "Office de tourisme|syndicat d'initiative|bureau d'information touristique",
 "tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "centre de visite",
 "amenity-community_centre": "Centre communautaire|Salle polyvalente|Salle des fêtes",
 "amenity-compressed_air": "Air comprimé",
@@ -350,14 +350,14 @@
 "amenity-vending_machine-drinks": "Distributeur de boissons|cannettes",
 "amenity-vending_machine-food|@category_food": "Distributeur d'aliments|Aliments",
 "amenity-vending_machine-parking_tickets|@category_parking": "Horodateur|parcmètre",
-"amenity-vending_machine-public_transport_tickets|@category_transport": "Distributeur de billets de transport en commun|ticket de bus",
+"amenity-vending_machine-public_transport_tickets|@category_transport": "Distributeur de billets de transport en commun|ticket de bus|ticket de tram|ticket de métro",
 "amenity-vending_machine-newspapers": "Distributeur de journaux|Journaux",
 "amenity-vending_machine-sweets": "Distributeur de bonbons|Bonbons",
 "amenity-vending_machine-excrement_bags": "5Distributeur de sacs à excréments",
 "amenity-parcel_locker|@category_post": "Consigne automatique pour colis|3locker",
 "shop-outpost": "Point de retrait",
 "building-garage": "Garage",
-"highway-rest_area|highway-services": "Aire de repos|Aire de service",
+"highway-rest_area|highway-services": "Aire de repos|Aire de service|relais routier",
 "man_made-chimney": "Cheminée",
 "man_made-tower|man_made-flare": "Tour",
 "shop-bookmaker|@gambling": "Bookmaker",
@@ -371,12 +371,12 @@
 "tourism-information-board": "Panneau d'informations",
 "tourism-information-map": "Carte touristique|Plan",
 "aerialway-station": "Remontées mécaniques",
-"aeroway-helipad": "Hélisurface",
-"barrier-border_control": "Contrôle aux frontières",
+"aeroway-helipad": "Hélisurface|zone d'atterrissage pour hélicoptères",
+"barrier-border_control": "Contrôle aux frontières|contrôle frontalier",
 "leisure-water_park|@category_tourism|@category_children": "Centre aquatique|Parc aquatique",
 "man_made-water_tower": "Château d'eau",
 "man_made-windmill": "Moulin",
-"natural-cave_entrance": "4Grotte",
+"natural-cave_entrance": "4Grotte|caverne",
 "natural-volcano|@mountain": "4Volcan",
 "office-estate_agent": "Agence immobilière|agent immobilier",
 "waterway-lock_gate": "Écluse",
@@ -387,24 +387,24 @@
 "leisure-resort|@category_hotel": "Complexe touristique",
 "amenity-biergarten|@category_eat|@category_nightlife": "5Biergarten",
 "amenity-driving_school": "4Auto-école|École de conduite",
-"amenity-music_school": "École de musique",
+"amenity-music_school": "École de musique|conservatoire de musique",
 "amenity-language_school": "École de langue",
 "amenity-ice_cream": "Stand de crème glacée|Marchand de glaces|Glacier",
 "amenity-internet_cafe": "5Cybercafé",
 "amenity-motorcycle_parking": "Parking moto|Stationnement moto",
 "amenity-parking_space-disabled|@category_parking": "Place de stationnement handicapé|Stationnement PMR|Parking PMR",
-"amenity-nursing_home": "Maison de retraite|résidence pour personnes âgées",
+"amenity-nursing_home": "Maison de retraite|résidence pour personnes âgées|EHPAD",
 "amenity-payment_terminal": "Terminal de paiement",
 "amenity-public_bath": "Bain public",
 "amenity-shower": "Douche",
 "emergency-assembly_point": "Point de rassemblement d'urgence",
 "emergency-defibrillator": "4Défibrillateur|DAE",
-"emergency-fire_hydrant": "Bouche d’incendie|bouche de incendie|borne d’incendie|borne de incendie|Borne hydratante|Poteau d’incendie|Hydrant|Hydrante",
-"amenity-hydrant": "Bouche d’puisage|bouche de puisage|borne d’puisage|bourne de puisage|Hydrant|Hydrante",
-"emergency-lifeguard": "Sauveteur d’urgence|Sauveteur",
+"emergency-fire_hydrant": "Bouche d’incendie|borne d’incendie|Poteau d’incendie|Hydrant",
+"amenity-hydrant": "Bouche de puisage|borne de puisage|Hydrant",
+"emergency-lifeguard": "Sauveteur d’urgence",
 "emergency-mountain_rescue": "Sauveteurs en montagne d’urgence",
 "leisure-fitness_station": "Station de fitness|Parcours de santé",
-"office-insurance": "Bureau d’assurance|assureur|Agent d'assurance",
+"office-insurance": "Bureau d’assurance|assureur|Agent d'assurance|courtier en assurance|compagnie d'assurance",
 "office-ngo": "Bureau d'ONG|organisation non gouvernementale|Bureau ONG",
 "shop-erotic|@shop": "Boutique érotique",
 "shop-massage": "Salon de massage",
@@ -416,10 +416,10 @@
 "shop-tattoo": "Salon de tatouage|tatoueur",
 "shop-variety_store|@category_shopping|@shop": "Bazar",
 "shop-video|@shop": "Boutique de vidéos|videostore",
-"shop-video_games|@shop": "Boutique de jeux vidéo",
+"shop-video_games|@shop": "Boutique de jeux vidéos",
 "tourism-wilderness_hut|@category_hotel": "Refuge non gardé|Refuge-bivouac",
-"tourism-gallery|@category_tourism": "3Galerie d'art|musée d'art",
-"tourism-theme_park|@category_tourism|@category_children": "Parc d'attractions|Parc de loisirs",
+"tourism-gallery|@category_tourism": "3Galerie d'art|musée d'art|galerie de peinture",
+"tourism-theme_park|@category_tourism|@category_children": "Parc d'attractions|Parc de loisirs|parc à thèmes",
 "boundary-national_park|@category_tourism": "Parc national",
 "leisure-nature_reserve|@category_tourism": "Réserve naturelle",
 "natural-cape": "Cap",
@@ -447,7 +447,7 @@
 "shop-medical_supply|@shop": "Materiel médical",
 "shop-nutrition_supplements|@shop": "Suppléments nutritionnels",
 "shop-paint|@shop": "Magasin de peinture",
-"shop-perfumery|@category_shopping|@shop": "Parfumerie",
+"shop-perfumery|@category_shopping|@shop": "Parfumerie|boutique de parfum",
 "shop-sewing|@shop": "Mercerie|Couture",
 "shop-storage_rental": "Location de stockage",
 "shop-tobacco|@shop": "Bureau de tabac",
@@ -462,19 +462,19 @@
 "amenity-social_facility": "Établissement de services sociaux",
 "leisure-sports_hall": "Salle de sport",
 "amenity-arts_centre|@category_tourism": "Centre artistique",
-"amenity-prison": "prison",
+"amenity-prison": "prison|centre pénitentiaire|centre de détention",
 "amenity-exhibition_centre": "Centre d'exposition",
 "shop-bathroom_furnishing|@shop": "Mobilier de salle de bain",
 "shop-bed|@shop": "Magasin de literie",
 "shop-boutique|@shop": "Boutique",
-"amenity-food_court": "Aire de restauration",
+"amenity-food_court": "Aire de restauration|foodcourt",
 "shop-curtain|@shop": "Magasin de rideaux",
-"shop-gas|@shop": "Vente de gaz",
+"shop-gas|@shop": "Vente de gaz|bouteille de gaz",
 "shop-pet_grooming": "Salon de toilettage",
 "shop-hifi|@shop": "Matériel Hi-Fi",
 "amenity-conference_centre": "Centre de conférence",
 "shop-herbalist|@shop": "Herboristerie",
-"shop-appliance|@shop": "Magasin d'électroménager",
+"shop-appliance|@shop": "Magasin d'électroménager|boutique d'électroménager",
 "shop-agrarian|@shop": "Magasin d'agriculture",
 "shop-fashion_accessories|@shop": "Boutique d'accessoires de mode",
 "amenity-waste_transfer_station": "Station de transfert de déchets",
@@ -489,7 +489,7 @@
 "amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Chargeur automobile|Chargeur de voiture|Chargeur",
 "shop-lighting|@shop": "4Lumières|Luminaires|4Lampes",
 "office-security": "Bureau de sécurité",
-"building-guardhouse": "Garde",
+"building-guardhouse": "Garde|poste de sécurité|poste de gardiennage",
 "leisure-dance|@category_entertainment": "4Danse|École de danse",
 "shop-money_lender": "Prêteur d'argent",
 "attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "Attraction|Labyrinthe",