Merge release 1.0.0 into stable branchHEADstable

See the tag 'v1.0.0' or the changelog for more information about this
release.

6 files changed, 103 insertions, 2 deletions

diff --git a/src/main/resources/about.txt b/src/main/resources/about/en.txt
index 782b422..37986e5 100644
--- a/src/main/resources/about.txt
+++ b/src/main/resources/about/en.txt
@@ -4,14 +4,18 @@ About 7Units Version [VERSION]
 inspired by GNU Units (https://www.gnu.org/software/units/).
 You can use it to simply convert units, but you can also
 use it like a calculator, computing and converting expressions
-like "10 m/s + (25^2 - 5^2) mi/hr".
+like "10 m/s + (25^2 - 5^2) mi/h".
 
 This software was written by Adrien Hopkins
 <adrien.p.hopkins@gmail.com>.
 
+Unit/Prefix/Dimension Statistics:
+
+[LOADSTATS]
+
 Copyright Notice:
 
-Unit Converter Copyright (C) 2018-2024 Adrien Hopkins
+Unit Converter Copyright (C) 2018-2025 Adrien Hopkins
 This program comes with ABSOLUTELY NO WARRANTY;
 for details read the LICENSE file, section 15
 
diff --git a/src/main/resources/about/fr.txt b/src/main/resources/about/fr.txt
new file mode 100644
index 0000000..fc7ed83
--- /dev/null
+++ b/src/main/resources/about/fr.txt
@@ -0,0 +1,24 @@
+À propos de 7Unités version [VERSION]
+
+7Unités est une programme pour convertir les unités avec plusieurs fonctions,
+inspiré par GNU Units (https://www.gnu.org/software/units/).
+Vous pouvez l’utiliser pour convertir des unités, mais vous pouvez aussi
+l’utiliser comme calculatrice, computer et convertir des expressions
+comme "10 m/s + (25^2 - 5^2) mi/h".
+
+Ce logiciel est par Adrien Hopkins <adrien.p.hopkins@gmail.com>.
+
+Statistiques d’unités, préfixes et dimensions:
+
+[LOADSTATS]
+
+Copyright Notice:
+
+Unit Converter Copyright (C) 2018-2025 Adrien Hopkins
+This program comes with ABSOLUTELY NO WARRANTY;
+for details read the LICENSE file, section 15
+
+This is free software, and you are welcome to redistribute
+it under certain conditions; for details go to
+<https://www.gnu.org/licenses/quick-guide-gplv3.html>
+or read the LICENSE file.
diff --git a/src/main/resources/locales/en.txt b/src/main/resources/locales/en.txt
new file mode 100644
index 0000000..666e363
--- /dev/null
+++ b/src/main/resources/locales/en.txt
@@ -0,0 +1,31 @@
+tv.title=7Units [v]
+tv.convert_units.title=Convert Units
+tv.convert_units.value_prompt=Value to convert:
+tv.convert_units.convert_btn=Convert
+tv.convert_expressions.title=Convert Unit Expressions
+tv.convert_expressions.from=From
+tv.convert_expressions.to=To
+tv.convert_expressions.convert_btn=Convert
+tv.convert_expressions.output=Output
+tv.unit_viewer.title=Unit Viewer
+tv.prefix_viewer.title=Prefix Viewer
+tv.settings.rounding.title=Rounding Settings
+tv.settings.rounding.rule=Rounding Rule:
+tv.settings.rounding.precision=Precision:
+tv.settings.rounding.fixed_sigfig=Fixed Precision
+tv.settings.rounding.fixed_places=Fixed Decimal Places
+tv.settings.rounding.uncertainty=Uncertainty-based Rounding
+tv.settings.repetition.title=Prefix Repetition Settings
+tv.settings.repetition.no=No Repetition
+tv.settings.repetition.any=No Restriction
+tv.settings.repetition.complex=Complex Repetition
+tv.settings.search.title=Search Settings
+tv.settings.search.no_prefixes=Never Include Prefixed Units
+tv.settings.search.common_prefixes=Include Common Prefixes
+tv.settings.search.all_prefixes=Include All Single Prefixes
+tv.settings.oneway=Convert One Way Only
+tv.settings.show_duplicate=Show Duplicate Units & Prefixes
+tv.settings.use_default_files=Use Default Datafiles
+tv.settings.locale=🌐 Locale:
+tv.settings.unitfiles.button=Manage Unit Data Files
+load_stat_msg=Successfully loaded [u] unique units with [un] names ([b] base units), [p] unique prefixes with [pn] names, [s] unit sets, and [d] named dimensions.
diff --git a/src/main/resources/locales/fr.txt b/src/main/resources/locales/fr.txt
new file mode 100644
index 0000000..3fef030
--- /dev/null
+++ b/src/main/resources/locales/fr.txt
@@ -0,0 +1,31 @@
+tv.title=7Unités [v]
+tv.convert_units.title=Convertir Unités
+tv.convert_units.value_prompt=Valueur à convertir:
+tv.convert_units.convert_btn=Convertir
+tv.convert_expressions.title=Convertir Expressions
+tv.convert_expressions.from=De
+tv.convert_expressions.to=À
+tv.convert_expressions.convert_btn=Convertir
+tv.convert_expressions.output=Résultat
+tv.unit_viewer.title=Unités
+tv.prefix_viewer.title=Préfixes
+tv.settings.rounding.title=Préférences d’Arrondissement
+tv.settings.rounding.rule=Règle d’Arrondissement
+tv.settings.rounding.precision=Précision:
+tv.settings.rounding.fixed_sigfig=Precision fixe
+tv.settings.rounding.fixed_places=Chiffres fixe
+tv.settings.rounding.uncertainty=Arrondissement d’Incertitude
+tv.settings.repetition.title=Préférences de répetition de préfixes
+tv.settings.repetition.no=Non répetition
+tv.settings.repetition.any=Tout répetition
+tv.settings.repetition.complex=Répetition Complexe
+tv.settings.search.title=Préférences de Recherche
+tv.settings.search.no_prefixes=Jamais inclure unités préfixés
+tv.settings.search.common_prefixes=Inclure préfixes fréquents
+tv.settings.search.all_prefixes=Inclure tous préfixes seuls
+tv.settings.oneway=Convertir Seulement en un Direction
+tv.settings.show_duplicate=Montrer unités et préfixes doubles
+tv.settings.use_default_files=Utilise donées par défaut
+tv.settings.locale=🌐 Locale:
+tv.settings.unitfiles.button=Gérer donées d’unités
+load_stat_msg=Chargé [u] unités uniques avec [un] noms ([b] unités bases), [p] préfixes uniques avec [pn] noms, [s] collections d’unités, et [d] dimensions nomées.
diff --git a/src/main/resources/metric_exceptions.txt b/src/main/resources/metric_exceptions.txt
index 73748c0..433dbb5 100644
--- a/src/main/resources/metric_exceptions.txt
+++ b/src/main/resources/metric_exceptions.txt
@@ -10,6 +10,7 @@ min
 minute
 h
 hour
+hms
 d
 day
 wk
diff --git a/src/main/resources/unitsfile.txt b/src/main/resources/unitsfile.txt
index 543c821..17fe98a 100644
--- a/src/main/resources/unitsfile.txt
+++ b/src/main/resources/unitsfile.txt
@@ -155,6 +155,7 @@ minute					60 second
 min						minute
 hour					3600 second
 h						hour
+hms						hour; minute; second
 day						86400 second
 d						day
 week                    7 day
@@ -164,6 +165,7 @@ gregorianyear			365.2425 day
 gregorianmonth          gregorianyear / 12
 
 # Other non-SI "metric" units
+are						100 m^2
 litre					0.001 m^3
 liter					litre
 l						litre
@@ -187,8 +189,16 @@ inch					foot / 12
 in						inch
 yard					3 foot
 yd						yard
+chain					66 ft
+ch						chain
+furlong					10 chain
 mile					1760 yard
 mi						mile
+ftin					ft; in
+ydftin					yd; ft; in
+
+# Imperial area units
+acre					chain * furlong
 
 # Compressed notation
 kph						km / hour