diff --git a/geoportal/geomapfish_geoportal/locale/de/LC_MESSAGES/geomapfish_geoportal-client.po b/geoportal/geomapfish_geoportal/locale/de/LC_MESSAGES/geomapfish_geoportal-client.po
index e4ee3db63..ffd668b51 100644
--- a/geoportal/geomapfish_geoportal/locale/de/LC_MESSAGES/geomapfish_geoportal-client.po
+++ b/geoportal/geomapfish_geoportal/locale/de/LC_MESSAGES/geomapfish_geoportal-client.po
@@ -631,9 +631,6 @@ msgstr "E-Mail"
 msgid "entertainment"
 msgstr "Unterhaltung"
 
-msgid "fid"
-msgstr "ID"
-
 msgid "filter_double"
 msgstr "Doppelfilter"
 
@@ -658,9 +655,6 @@ msgstr "Brunnen"
 msgid "fuel"
 msgstr "Tankstelle"
 
-msgid "geom_4326"
-msgstr ""
-
 msgid "good"
 msgstr "Gut"
 
@@ -756,9 +750,6 @@ msgstr "Bodennutzung"
 msgid "landuse_alias"
 msgstr "Bodennutzung (alias)"
 
-msgid "landuse_ingrp"
-msgstr "Bodennutzung (Gruppe)"
-
 msgid "layer"
 msgstr "Ebene"
 
@@ -867,16 +858,9 @@ msgstr "OSM Feuerwehrstation (ohne WFS)"
 msgid "osm_firestations_dual_restricted"
 msgstr "OSM Feuerwehrstation (doppelt, begrenzt)"
 
-msgid "osm_firestations_ingrp"
-msgstr "OSM Feuerwehrstation (Gruppe)"
-
 msgid "osm_firestations_restricted"
 msgstr "OSM Feuerwehrstation (begrenzt)"
 
-#, fuzzy
-msgid "osm_firestations_restricted_ingrp"
-msgstr "OSM Feuerwehrstation (begrenzt)"
-
 msgid "osm_group"
 msgstr "OSM Gruppe"
 
@@ -892,16 +876,9 @@ msgstr "OSM Spital (ohne WFS)"
 msgid "osm_hospitals_dual_restricted"
 msgstr "OSM Spital (doppelt, begrenzt)"
 
-msgid "osm_hospitals_ingrp"
-msgstr "OSM Spital (Gruppe)"
-
 msgid "osm_hospitals_restricted"
 msgstr "OSM Spital (begrenzt)"
 
-#, fuzzy
-msgid "osm_hospitals_restricted_ingrp"
-msgstr "OSM Spital (begrenzt)"
-
 msgid "osm_id"
 msgstr "OSM ID"
 
@@ -1061,15 +1038,6 @@ msgstr "Punkte und Bodennutzung"
 msgid "points+landuse no wfs"
 msgstr "Punkte und Bodennutzung (ohne WFS)"
 
-msgid "points_ingrp"
-msgstr "Punkte (in einer Gruppe)"
-
-msgid "pointscopier"
-msgstr "Kopierte Punkte"
-
-msgid "pointslabels"
-msgstr "Label-Punkte"
-
 msgid "police"
 msgstr "Polizei"
 
@@ -1146,9 +1114,6 @@ msgstr "Eisenbahn"
 msgid "railways9"
 msgstr "Eisenbahn"
 
-msgid "railways_ingrp"
-msgstr "Eisenbahn (in einer Gruppe)"
-
 msgid "recycling"
 msgstr "Sammelstelle"
 
@@ -1164,6 +1129,9 @@ msgstr "Restaurant"
 msgid "restricted"
 msgstr "Bezirk"
 
+msgid "restricted_group"
+msgstr "Begrenzte Gruppe"
+
 msgid "roads10"
 msgstr "Straßen"
 
@@ -1248,9 +1216,6 @@ msgstr "Zeit"
 msgid "time range"
 msgstr "Zeit (Intervall)"
 
-msgid "time_ingrp"
-msgstr "Zeit (in einer Gruppe)"
-
 msgid "timestamp"
 msgstr "Zeitstempel"
 
@@ -1416,14 +1381,43 @@ msgstr ""
 #~ msgid "You must change your password"
 #~ msgstr "Sie müssen Ihr Passwort ändern"
 
+#~ msgid "fid"
+#~ msgstr "ID"
+
+#~ msgid "landuse_ingrp"
+#~ msgstr "Bodennutzung (Gruppe)"
+
 #~ msgid "last_update_timestamp"
 #~ msgstr "zuletzt aktualisierter Zeitstempel"
 
 #~ msgid "last_update_user"
 #~ msgstr "zuletzt aktualisierter Nutzer"
 
-#~ msgid "restricted_group"
-#~ msgstr "Begrenzte Gruppe"
+#~ msgid "osm_firestations_ingrp"
+#~ msgstr "OSM Feuerwehrstation (Gruppe)"
+
+#, fuzzy
+#~ msgid "osm_firestations_restricted_ingrp"
+#~ msgstr "OSM Feuerwehrstation (begrenzt)"
+
+#~ msgid "osm_hospitals_ingrp"
+#~ msgstr "OSM Spital (Gruppe)"
+
+#, fuzzy
+#~ msgid "osm_hospitals_restricted_ingrp"
+#~ msgstr "OSM Spital (begrenzt)"
+
+#~ msgid "points_ingrp"
+#~ msgstr "Punkte (in einer Gruppe)"
+
+#~ msgid "pointscopier"
+#~ msgstr "Kopierte Punkte"
+
+#~ msgid "pointslabels"
+#~ msgstr "Label-Punkte"
+
+#~ msgid "railways_ingrp"
+#~ msgstr "Eisenbahn (in einer Gruppe)"
 
 #, fuzzy
 #~ msgid "standard application"
@@ -1431,3 +1425,6 @@ msgstr ""
 
 #~ msgid "test2"
 #~ msgstr "Test2"
+
+#~ msgid "time_ingrp"
+#~ msgstr "Zeit (in einer Gruppe)"
diff --git a/geoportal/geomapfish_geoportal/locale/en/LC_MESSAGES/geomapfish_geoportal-client.po b/geoportal/geomapfish_geoportal/locale/en/LC_MESSAGES/geomapfish_geoportal-client.po
index d4b872cbd..6c54a5aee 100644
--- a/geoportal/geomapfish_geoportal/locale/en/LC_MESSAGES/geomapfish_geoportal-client.po
+++ b/geoportal/geomapfish_geoportal/locale/en/LC_MESSAGES/geomapfish_geoportal-client.po
@@ -627,9 +627,6 @@ msgstr "Email"
 msgid "entertainment"
 msgstr "Entertainment"
 
-msgid "fid"
-msgstr "ID"
-
 msgid "filter_double"
 msgstr "Filter double"
 
@@ -654,9 +651,6 @@ msgstr "Fountain"
 msgid "fuel"
 msgstr "Fuel"
 
-msgid "geom_4326"
-msgstr "Geom"
-
 msgid "good"
 msgstr "Good"
 
@@ -750,9 +744,6 @@ msgstr "Landuse"
 msgid "landuse_alias"
 msgstr "Landuse (alias)"
 
-msgid "landuse_ingrp"
-msgstr "Landuse (group)"
-
 msgid "layer"
 msgstr "Layer"
 
@@ -861,15 +852,9 @@ msgstr "OSM Fire stations (no WFS)"
 msgid "osm_firestations_dual_restricted"
 msgstr "OSM Fire stations dual restricted"
 
-msgid "osm_firestations_ingrp"
-msgstr "OSM Fire stations (group)"
-
 msgid "osm_firestations_restricted"
 msgstr "OSM Fire stations (restricted)"
 
-msgid "osm_firestations_restricted_ingrp"
-msgstr "OSM Fire stations (restricted, ingroup)"
-
 msgid "osm_group"
 msgstr "OSM group"
 
@@ -885,15 +870,9 @@ msgstr "OSM Hospitals (no WFS)"
 msgid "osm_hospitals_dual_restricted"
 msgstr "OSM Hospitals (dual, restricted)"
 
-msgid "osm_hospitals_ingrp"
-msgstr "OSM Hospitals (group)"
-
 msgid "osm_hospitals_restricted"
 msgstr "OSM Hospitals (restricted)"
 
-msgid "osm_hospitals_restricted_ingrp"
-msgstr "OSM Hospitals (restricted, ingroup)"
-
 msgid "osm_id"
 msgstr "OSM ID"
 
@@ -1053,15 +1032,6 @@ msgstr "Points & Landuse"
 msgid "points+landuse no wfs"
 msgstr "Points & Landuse (no WFS)"
 
-msgid "points_ingrp"
-msgstr "Points in group"
-
-msgid "pointscopier"
-msgstr "Point copier"
-
-msgid "pointslabels"
-msgstr "Points label"
-
 msgid "police"
 msgstr "Police"
 
@@ -1137,9 +1107,6 @@ msgstr "Railways"
 msgid "railways9"
 msgstr "Railways"
 
-msgid "railways_ingrp"
-msgstr "Railways in group"
-
 msgid "recycling"
 msgstr "Recycling"
 
@@ -1155,6 +1122,9 @@ msgstr "Restaurant"
 msgid "restricted"
 msgstr "Restricted"
 
+msgid "restricted_group"
+msgstr "Restricted group"
+
 msgid "roads10"
 msgstr "Roads"
 
@@ -1239,9 +1209,6 @@ msgstr "Time"
 msgid "time range"
 msgstr "Time (range)"
 
-msgid "time_ingrp"
-msgstr "Time (group)"
-
 msgid "timestamp"
 msgstr "Timestamp"
 
@@ -1453,14 +1420,44 @@ msgstr ""
 #~ msgid "ch.bfe.solarenergie-eignung-fassaden_overview"
 #~ msgstr "Solarenergie: Eignung Fassaden"
 
+#~ msgid "fid"
+#~ msgstr "ID"
+
+#~ msgid "geom_4326"
+#~ msgstr "Geom"
+
+#~ msgid "landuse_ingrp"
+#~ msgstr "Landuse (group)"
+
 #~ msgid "last_update_timestamp"
 #~ msgstr "Timestamp"
 
 #~ msgid "last_update_user"
 #~ msgstr "User"
 
-#~ msgid "restricted_group"
-#~ msgstr "Restricted group"
+#~ msgid "osm_firestations_ingrp"
+#~ msgstr "OSM Fire stations (group)"
+
+#~ msgid "osm_firestations_restricted_ingrp"
+#~ msgstr "OSM Fire stations (restricted, ingroup)"
+
+#~ msgid "osm_hospitals_ingrp"
+#~ msgstr "OSM Hospitals (group)"
+
+#~ msgid "osm_hospitals_restricted_ingrp"
+#~ msgstr "OSM Hospitals (restricted, ingroup)"
+
+#~ msgid "points_ingrp"
+#~ msgstr "Points in group"
+
+#~ msgid "pointscopier"
+#~ msgstr "Point copier"
+
+#~ msgid "pointslabels"
+#~ msgstr "Points label"
+
+#~ msgid "railways_ingrp"
+#~ msgstr "Railways in group"
 
 #~ msgid "standard application"
 #~ msgstr "Standard version"
@@ -1468,6 +1465,9 @@ msgstr ""
 #~ msgid "test2"
 #~ msgstr "Second test"
 
+#~ msgid "time_ingrp"
+#~ msgstr "Time (group)"
+
 #~ msgid "vd.batiment_rcb"
 #~ msgstr "Buildings VD RCB"
 
diff --git a/geoportal/geomapfish_geoportal/locale/fr/LC_MESSAGES/geomapfish_geoportal-client.po b/geoportal/geomapfish_geoportal/locale/fr/LC_MESSAGES/geomapfish_geoportal-client.po
index 13bb8e97a..bde0575ad 100644
--- a/geoportal/geomapfish_geoportal/locale/fr/LC_MESSAGES/geomapfish_geoportal-client.po
+++ b/geoportal/geomapfish_geoportal/locale/fr/LC_MESSAGES/geomapfish_geoportal-client.po
@@ -627,9 +627,6 @@ msgstr "Courriel"
 msgid "entertainment"
 msgstr "Divertissement"
 
-msgid "fid"
-msgstr "ID"
-
 msgid "filter_double"
 msgstr "Filtre double"
 
@@ -654,9 +651,6 @@ msgstr "Fontaines"
 msgid "fuel"
 msgstr "Station d'essence"
 
-msgid "geom_4326"
-msgstr "Geométrie"
-
 msgid "good"
 msgstr "Correcte"
 
@@ -750,9 +744,6 @@ msgstr "Utilisation du sol"
 msgid "landuse_alias"
 msgstr "Utilisation du sol (alias)"
 
-msgid "landuse_ingrp"
-msgstr "Utilisation du sol (groupe)"
-
 msgid "layer"
 msgstr "Couches"
 
@@ -861,15 +852,9 @@ msgstr "Caserne de pompiers OSM (sans WFS)"
 msgid "osm_firestations_dual_restricted"
 msgstr "Caserne de pompiers OSM (double, restrain)"
 
-msgid "osm_firestations_ingrp"
-msgstr "Caserne de pompiers OSM (groupe)"
-
 msgid "osm_firestations_restricted"
 msgstr "Caserne de pompiers OSM (restrain)"
 
-msgid "osm_firestations_restricted_ingrp"
-msgstr "Caserne de pompiers OSM (groupe, restrain)"
-
 msgid "osm_group"
 msgstr "OSM groupe"
 
@@ -885,15 +870,9 @@ msgstr "Hôpitaux OSM (sans WFS)"
 msgid "osm_hospitals_dual_restricted"
 msgstr "Hôpitaux OSM (double, restrain)"
 
-msgid "osm_hospitals_ingrp"
-msgstr "Hôpitaux OSM (groupe)"
-
 msgid "osm_hospitals_restricted"
 msgstr "Hôpitaux OSM (restrain)"
 
-msgid "osm_hospitals_restricted_ingrp"
-msgstr "Hôpitaux OSM (groupe, restrain)"
-
 msgid "osm_id"
 msgstr "ID OSM"
 
@@ -1053,15 +1032,6 @@ msgstr "Points & Utilisation du sol"
 msgid "points+landuse no wfs"
 msgstr "Points & Utilisation du sol (sans WFS)"
 
-msgid "points_ingrp"
-msgstr "Points dans groupe"
-
-msgid "pointscopier"
-msgstr "Points copier"
-
-msgid "pointslabels"
-msgstr "Points labels"
-
 msgid "police"
 msgstr "Police"
 
@@ -1137,9 +1107,6 @@ msgstr "Voies ferrées"
 msgid "railways9"
 msgstr "Voies ferrées"
 
-msgid "railways_ingrp"
-msgstr "Voies ferrées dans groupe"
-
 msgid "recycling"
 msgstr "Recyclage"
 
@@ -1155,6 +1122,9 @@ msgstr "Restaurants"
 msgid "restricted"
 msgstr "Restrain"
 
+msgid "restricted_group"
+msgstr "Restrain dans groupe"
+
 msgid "roads10"
 msgstr "Routes"
 
@@ -1239,9 +1209,6 @@ msgstr "Temps"
 msgid "time range"
 msgstr "Temps (intervalle)"
 
-msgid "time_ingrp"
-msgstr "Temps (groupe)"
-
 msgid "timestamp"
 msgstr "Datation"
 
@@ -1460,17 +1427,47 @@ msgstr ""
 #~ msgid "ch.swisstopo.swissnames3d_feature_poly"
 #~ msgstr "Noms géographiques swissNAMES3D"
 
+#~ msgid "fid"
+#~ msgstr "ID"
+
 #~ msgid "geom21781"
 #~ msgstr "Géometrie 21781"
 
+#~ msgid "geom_4326"
+#~ msgstr "Geométrie"
+
+#~ msgid "landuse_ingrp"
+#~ msgstr "Utilisation du sol (groupe)"
+
 #~ msgid "last_update_timestamp"
 #~ msgstr "Data de mise à jours"
 
 #~ msgid "last_update_user"
 #~ msgstr "User"
 
-#~ msgid "restricted_group"
-#~ msgstr "Restrain dans groupe"
+#~ msgid "osm_firestations_ingrp"
+#~ msgstr "Caserne de pompiers OSM (groupe)"
+
+#~ msgid "osm_firestations_restricted_ingrp"
+#~ msgstr "Caserne de pompiers OSM (groupe, restrain)"
+
+#~ msgid "osm_hospitals_ingrp"
+#~ msgstr "Hôpitaux OSM (groupe)"
+
+#~ msgid "osm_hospitals_restricted_ingrp"
+#~ msgstr "Hôpitaux OSM (groupe, restrain)"
+
+#~ msgid "points_ingrp"
+#~ msgstr "Points dans groupe"
+
+#~ msgid "pointscopier"
+#~ msgstr "Points copier"
+
+#~ msgid "pointslabels"
+#~ msgstr "Points labels"
+
+#~ msgid "railways_ingrp"
+#~ msgstr "Voies ferrées dans groupe"
 
 #~ msgid "standard application"
 #~ msgstr "Application bureau"
@@ -1481,6 +1478,9 @@ msgstr ""
 #~ msgid "test2"
 #~ msgstr "Deuxième test"
 
+#~ msgid "time_ingrp"
+#~ msgstr "Temps (groupe)"
+
 #~ msgid "vd.batiment_rcb"
 #~ msgstr "Bâtiment VD RCB"
 
diff --git a/geoportal/geomapfish_geoportal/locale/it/LC_MESSAGES/geomapfish_geoportal-client.po b/geoportal/geomapfish_geoportal/locale/it/LC_MESSAGES/geomapfish_geoportal-client.po
index dd831d43e..581636888 100644
--- a/geoportal/geomapfish_geoportal/locale/it/LC_MESSAGES/geomapfish_geoportal-client.po
+++ b/geoportal/geomapfish_geoportal/locale/it/LC_MESSAGES/geomapfish_geoportal-client.po
@@ -627,9 +627,6 @@ msgstr ""
 msgid "entertainment"
 msgstr ""
 
-msgid "fid"
-msgstr ""
-
 msgid "filter_double"
 msgstr ""
 
@@ -654,9 +651,6 @@ msgstr ""
 msgid "fuel"
 msgstr ""
 
-msgid "geom_4326"
-msgstr ""
-
 msgid "good"
 msgstr ""
 
@@ -750,9 +744,6 @@ msgstr ""
 msgid "landuse_alias"
 msgstr ""
 
-msgid "landuse_ingrp"
-msgstr ""
-
 msgid "layer"
 msgstr ""
 
@@ -861,15 +852,9 @@ msgstr ""
 msgid "osm_firestations_dual_restricted"
 msgstr ""
 
-msgid "osm_firestations_ingrp"
-msgstr ""
-
 msgid "osm_firestations_restricted"
 msgstr ""
 
-msgid "osm_firestations_restricted_ingrp"
-msgstr ""
-
 msgid "osm_group"
 msgstr ""
 
@@ -885,15 +870,9 @@ msgstr ""
 msgid "osm_hospitals_dual_restricted"
 msgstr ""
 
-msgid "osm_hospitals_ingrp"
-msgstr ""
-
 msgid "osm_hospitals_restricted"
 msgstr ""
 
-msgid "osm_hospitals_restricted_ingrp"
-msgstr ""
-
 msgid "osm_id"
 msgstr ""
 
@@ -1053,15 +1032,6 @@ msgstr ""
 msgid "points+landuse no wfs"
 msgstr ""
 
-msgid "points_ingrp"
-msgstr ""
-
-msgid "pointscopier"
-msgstr ""
-
-msgid "pointslabels"
-msgstr ""
-
 msgid "police"
 msgstr ""
 
@@ -1137,9 +1107,6 @@ msgstr ""
 msgid "railways9"
 msgstr ""
 
-msgid "railways_ingrp"
-msgstr ""
-
 msgid "recycling"
 msgstr ""
 
@@ -1155,6 +1122,9 @@ msgstr ""
 msgid "restricted"
 msgstr ""
 
+msgid "restricted_group"
+msgstr ""
+
 msgid "roads10"
 msgstr ""
 
@@ -1239,9 +1209,6 @@ msgstr ""
 msgid "time range"
 msgstr ""
 
-msgid "time_ingrp"
-msgstr ""
-
 msgid "timestamp"
 msgstr ""