Skip to content

Commit

Permalink
i18n: fix duplicate messsages in po files (#4722)
Browse files Browse the repository at this point in the history
This PR de-duplicates the PO message files (currently the compilation is broken, apparently introduced in #4710), using

```
cd locale/po/
for i in $(ls grass*.po); do
    msguniq --use-first ${i} > $i.tmp
    rm -f ${i}
    mv $i.tmp ${i}
done
```
  • Loading branch information
neteler authored Nov 21, 2024
1 parent 36359e2 commit 55c0326
Show file tree
Hide file tree
Showing 30 changed files with 23 additions and 149 deletions.
32 changes: 16 additions & 16 deletions locale/po/grassmods_fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -1578,8 +1578,8 @@ msgid ""
"Unable to convert input map coordinate reference system to GRASS format; "
"cannot create new project."
msgstr ""
"Impossible de convertir la projection de la couche en entrée au format GRASS "
"; impossible de créer le nouveau projet"
"Impossible de convertir la projection de la couche en entrée au format "
"GRASS ; impossible de créer le nouveau projet"

#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035
#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522
Expand Down Expand Up @@ -1638,7 +1638,7 @@ msgstr "Le PROJ_INFO du jeu de données est : \n"
#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90
#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360
#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492
#, c-format, fuzzy
#, fuzzy, c-format
msgid ""
"\n"
"In case of no significant differences in the coordinate reference system "
Expand Down Expand Up @@ -4444,7 +4444,7 @@ msgid "unable to open input file <%s>"
msgstr ""

#: ../raster/r.quant/read_rules.c:89
#, c-format, fuzzy
#, fuzzy, c-format
msgid ""
"\n"
"Enter the rule or 'help' for the format description or 'end' to exit:\n"
Expand Down Expand Up @@ -4561,7 +4561,7 @@ msgid "Failed to set raster attribute table"
msgstr ""

#: ../raster/r.out.gdal/main.c:51
#, c-format, fuzzy
#, fuzzy, c-format
msgid "Supported formats:\n"
msgstr "Formats supportés :\n"

Expand Down Expand Up @@ -12802,7 +12802,7 @@ msgid "Amount of memory cannot be negative."
msgstr "Maximum de mémoire à utiliser (en MB)"

#: ../raster/r.viewshed/main.cpp:616
#, c-format, fuzzy
#, fuzzy, c-format
msgid " Converting %d to %d MB"
msgstr " Conversion de %d en %d MB"

Expand Down Expand Up @@ -23481,12 +23481,12 @@ msgid "Region%s"
msgstr ""

#: ../imagery/i.cluster/main.c:261
#, c-format, fuzzy
#, fuzzy, c-format
msgid " North: %12.2f East: %12.2f%s"
msgstr " Nord : %12.2f Est : %12.2f%s"

#: ../imagery/i.cluster/main.c:263
#, c-format, fuzzy
#, fuzzy, c-format
msgid " South: %12.2f West: %12.2f%s"
msgstr " Sud : %12.2f Ouest : %12.2f%s"

Expand All @@ -23496,7 +23496,7 @@ msgid " Res: %12.2f Res: %12.2f%s"
msgstr ""

#: ../imagery/i.cluster/main.c:267
#, c-format, fuzzy
#, fuzzy, c-format
msgid " Rows: %12d Cols: %12d Cells: %d%s"
msgstr " Lignes : %12d Colonnes : %12d Cellules : %d%s"

Expand Down Expand Up @@ -23526,17 +23526,17 @@ msgid " Minimum class size: %d%s"
msgstr ""

#: ../imagery/i.cluster/main.c:278
#, c-format, fuzzy
#, fuzzy, c-format
msgid " Minimum class separation: %f%s"
msgstr " Séparation minimale des classes : %f%s"

#: ../imagery/i.cluster/main.c:280
#, c-format, fuzzy
#, fuzzy, c-format
msgid " Percent convergence: %f%s"
msgstr " Pourcentage de convergence : %f%s"

#: ../imagery/i.cluster/main.c:282
#, c-format, fuzzy
#, fuzzy, c-format
msgid " Maximum number of iterations: %d%s"
msgstr " Nombre maximum d'itérations : %d%s"

Expand Down Expand Up @@ -28076,7 +28076,7 @@ msgid "Lists all database drivers."
msgstr "Lister tous les pilotes de bases de données."

#: ../db/db.execute/main.c:55 ../db/db.select/main.c:62
#, c-format, fuzzy
#, fuzzy, c-format
msgid "Unable to open file <%s>: %s"
msgstr "Impossible d'ouvrir le fichier <%s> : %s"

Expand Down Expand Up @@ -28981,7 +28981,7 @@ msgid "The password was stored in file (%s%cdblogin)"
msgstr ""

#: ../db/db.select/main.c:104
#, c-format, fuzzy
#, fuzzy, c-format
msgid "Test %s."
msgstr "Test %s."

Expand Down Expand Up @@ -57802,7 +57802,7 @@ msgstr ""
#: ../vector/v.vol.rst/user1.c:586 ../vector/v.vol.rst/user1.c:640
#: ../vector/v.vol.rst/user1.c:694 ../vector/v.vol.rst/user1.c:748
#: ../vector/v.vol.rst/user1.c:802
#, c-format, fuzzy
#, fuzzy, c-format
msgid "Error closing output file %s"
msgstr "Erreur en fermant le fichier de sortie %s"

Expand Down Expand Up @@ -66437,7 +66437,7 @@ msgid ""
msgstr ""

#: ../display/d.vect.thematic/main.c:515
#, c-format, fuzzy
#, fuzzy, c-format
msgid ""
"\n"
"Total number of records: %.0f\n"
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -14934,10 +14934,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_bn.po
Original file line number Diff line number Diff line change
Expand Up @@ -14944,10 +14944,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -15316,10 +15316,6 @@ msgstr "Nastavit výpočetní region podle aktuálního okna"
msgid "Set computational region extent interactively"
msgstr "Nastavit výpočetní region interaktivně"

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr "Nastavit výpočetní region podle pojmenovaného regionu"

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr "Uložit výpočetní region jako pojmenovaný region"
Expand Down
8 changes: 2 additions & 6 deletions locale/po/grasswxpy_de.po
Original file line number Diff line number Diff line change
Expand Up @@ -6948,8 +6948,8 @@ msgstr "SIMWE Oberflächenabflussmodellierung"
#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391
msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)."
msgstr ""
"Hydrologische Simulation des Oberflächenabfluss mittels \"path "
"sampling\" (SIMWE)."
"Hydrologische Simulation des Oberflächenabfluss mittels \"path sampling\" "
"(SIMWE)."

#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392
msgid "SIMWE Sediment flux modeling"
Expand Down Expand Up @@ -15227,10 +15227,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1563
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1566
msgid "Save computational region to named region"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_el.po
Original file line number Diff line number Diff line change
Expand Up @@ -15045,10 +15045,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr ""
Expand Down
5 changes: 0 additions & 5 deletions locale/po/grasswxpy_es.po
Original file line number Diff line number Diff line change
Expand Up @@ -16108,10 +16108,6 @@ msgstr "Definir región computacional a partir de la visualización"
msgid "Set computational region extent interactively"
msgstr "Definir extensión de la región computacional de manera interactiva"

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr "Establecer región computacional desde región nombrada"

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr "Guardar región computacional con nombre"
Expand Down Expand Up @@ -22328,7 +22324,6 @@ msgstr "etiquetas:"
#~ msgid "Deactive overwrite"
#~ msgstr "Desactivar sobreescribir"


#, python-format
#~ msgid "Unable to load icon theme. Reason: %s. Quiting wxGUI..."
#~ msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_fi.po
Original file line number Diff line number Diff line change
Expand Up @@ -14975,10 +14975,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr ""
Expand Down
15 changes: 5 additions & 10 deletions locale/po/grasswxpy_fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -11908,8 +11908,8 @@ msgstr "Niveau de verbosité :"
#: ../gui/wxpython/gui_core/preferences.py:1294
msgid "Number of threads for parallel computing (supported tools only):"
msgstr ""
"Nombre de threads pour le calcul parallèle (outils pris en charge uniquement)"
" :"
"Nombre de threads pour le calcul parallèle (outils pris en charge "
"uniquement) :"

#: ../gui/wxpython/gui_core/preferences.py:1319
msgid "Maximum memory in MB to be used (supported tools only):"
Expand Down Expand Up @@ -16054,10 +16054,6 @@ msgstr "Définir la région calculée à partir de celle de l'écran"
msgid "Set computational region extent interactively"
msgstr "Définir l'emprise de la région de calcul de manière interactive"

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr "Définir la région calculée depuis un nom de région"

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr "Enregistrer la région calculée vers un nom de région"
Expand Down Expand Up @@ -21053,6 +21049,9 @@ msgstr "Cliquez-déposez pour redimensionner l'objet"
msgid "labels: "
msgstr "étiquettes :"

msgid "supported tools only"
msgstr "outils pris en charge uniquement"

#~ msgid "Location Name:"
#~ msgstr "Nom du secteur : "

Expand Down Expand Up @@ -22505,7 +22504,6 @@ msgstr "étiquettes :"
#~ msgid "Deactive overwrite"
#~ msgstr "Désactiver l'écrasement"


#, python-format
#~ msgid "Unable to load icon theme. Reason: %s. Quiting wxGUI..."
#~ msgstr ""
Expand All @@ -22517,6 +22515,3 @@ msgstr "étiquettes :"
#~ msgstr ""
#~ "Impossible d'obtenir l’extension géographique courante. Sortie forcée de "
#~ "wxGUI. Merci d'exécuter manuellement g.region pour résoudre ce problème."

msgid "supported tools only"
msgstr "outils pris en charge uniquement"
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_hu.po
Original file line number Diff line number Diff line change
Expand Up @@ -15220,10 +15220,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr "Számítási régió interaktív beállítása"

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr "Számítási régió beállítása névvel bíró régióval"

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr "Számítási régió mentése névvel bíró régióba"
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_id_ID.po
Original file line number Diff line number Diff line change
Expand Up @@ -14937,10 +14937,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_it.po
Original file line number Diff line number Diff line change
Expand Up @@ -15709,10 +15709,6 @@ msgstr "Imposta la regione computazionale dall'estensione del display"
msgid "Set computational region extent interactively"
msgstr "Imposta la region computazionale interattivamente"

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr "Imposta regione computazionale da una regione precedentemente salvata"

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr "Salva la regione computazionale a una regione con nome"
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -15242,10 +15242,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_ko.po
Original file line number Diff line number Diff line change
Expand Up @@ -15073,10 +15073,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_lv.po
Original file line number Diff line number Diff line change
Expand Up @@ -15155,10 +15155,6 @@ msgstr "Iestatīt aprēķinu reģiona apjomu no kartes skata"
msgid "Set computational region extent interactively"
msgstr "Interaktīvi iestatīt aprēķinu reģiona apjomu"

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_ml.po
Original file line number Diff line number Diff line change
Expand Up @@ -15022,10 +15022,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -15292,10 +15292,6 @@ msgstr "Ustaw zasięg wyświetlonej mapy jako region obliczeniowy"
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr "Zapisz region obliczeniowy do nazwanego regionu"
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_pt.po
Original file line number Diff line number Diff line change
Expand Up @@ -15041,10 +15041,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr ""
Expand Down
5 changes: 0 additions & 5 deletions locale/po/grasswxpy_pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -15863,10 +15863,6 @@ msgstr "Definir a extensão da região computacional a partir da exibição"
msgid "Set computational region extent interactively"
msgstr "Definir a extensão da região computacional interativamente"

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr "Definir a região computacional da região nomeada"

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr "Salvar região computacional para região nomeada"
Expand Down Expand Up @@ -21946,7 +21942,6 @@ msgstr "rótulos:"
#~ msgid "Deactive overwrite"
#~ msgstr "Desativar susbstituição"


#, python-format
#~ msgid "Unable to load icon theme. Reason: %s. Quiting wxGUI..."
#~ msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions locale/po/grasswxpy_ro.po
Original file line number Diff line number Diff line change
Expand Up @@ -15407,10 +15407,6 @@ msgstr ""
msgid "Set computational region extent interactively"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1531
msgid "Set computational region from named region"
msgstr ""

#: ../gui/wxpython/mapdisp/frame.py:1534
msgid "Save computational region to named region"
msgstr ""
Expand Down
Loading

0 comments on commit 55c0326

Please sign in to comment.