Refactoring.

Author: albertus82

src/main/resources/io/github/albertus82/eqbulletin/resources/messages.properties

@@ -1,5 +1,5 @@
-error.fatal=An unrecoverable error has occurred.
 error.fatal.init=An unrecoverable error has occurred during the application startup.
+error.fatal=An unrecoverable error has occurred.
 error.form.decimal.range=Value must be a Decimal between {0} and {1}
 error.form.integer.min=Value must be an Integer greater than or equal to {0}
 error.form.integer.range=Value must be an Integer between {0} and {1}
@@ -30,32 +30,27 @@ label.about.3rdparty.license=License
 label.about.3rdparty.name=Name
 label.about.3rdparty=This application uses or includes portions of the following third party software:
 label.about.acknowledgements.data=Seismic data were obtained from the GEOFON data centre of the GFZ German Research Centre for Geosciences.
-label.about.acknowledgements.icon=The stylized {0} icon has been downloaded from {1} ({2} license).
 label.about.acknowledgements.icon.cc-by-30.a.href=https://creativecommons.org/licenses/by/3.0/
 label.about.acknowledgements.icon.cc-by-30.a.text=Creative Commons Attribution 3.0 Unported
 label.about.acknowledgements.icon.iconfinder.a.href=https://www.iconfinder.com/icons/4691290/openstreetmap_icon
 label.about.acknowledgements.icon.iconfinder.a.text=Iconfinder
 label.about.acknowledgements.icon.openstreetmap.a.href=https://www.openstreetmap.org
 label.about.acknowledgements.icon.openstreetmap.a.text=OpenStreetMap
-label.about.acknowledgements.locations=Locations were obtained from the {0} programme of the {1} German Research Centre for Geosciences using data from the {2} partner networks.
+label.about.acknowledgements.icon=The stylized {0} icon has been downloaded from {1} ({2} license).
 label.about.acknowledgements.locations.geofon.a.href=https://geofon.gfz-potsdam.de
 label.about.acknowledgements.locations.geofon.a.text=GEOFON
 label.about.acknowledgements.locations.gevn.a.href=https://geofon.gfz-potsdam.de/eqinfo/gevn/
 label.about.acknowledgements.locations.gevn.a.text=GEVN
 label.about.acknowledgements.locations.gfz.a.href=https://www.gfz-potsdam.de
 label.about.acknowledgements.locations.gfz.a.text=GFZ
+label.about.acknowledgements.locations=Locations were obtained from the {0} programme of the {1} German Research Centre for Geosciences using data from the {2} partner networks.
 label.about.acknowledgements=Acknowledgements
 label.about.home.page=Home page
-label.about.license=This application is distributed under the {0}:
 label.about.license.gpl.a.href=https://www.gnu.org/licenses/gpl.html
 label.about.license.gpl.a.text=GNU General Public License
+label.about.license=This application is distributed under the {0}:
 label.about.title=About ${project.name}
 label.about.version=Version {0} ({1})
-
-label.sameareaevents.title=Find events in the same area
-label.sameareaevents.message=Latitude interval
-
-
 label.button.cancel=&Cancel
 label.button.close=&Close
 label.button.confirm=&Confirm
@@ -116,9 +111,9 @@ label.menu.item.epicenter.map.popup=Show epicenter in OpenStreet&Map
 label.menu.item.exit=E&xit
 label.menu.item.export.csv=Export &CSV...
 label.menu.item.feregion=&Flinn-Engdahl regionalization
+label.menu.item.find.events.same.area=Find &events in the same area...
 label.menu.item.google.maps.browser=View map in &browser
 label.menu.item.open.browser=&Open event in browser
-label.menu.item.find.events.same.area=Find &events in the same area...
 label.menu.item.preferences=&Configuration
 label.menu.item.save.map=&Save map as...
 label.menu.item.show.map=&Show map
@@ -133,7 +128,6 @@ label.preferences.cache=Cache
 label.preferences.confirm.close=Confirm on close
 label.preferences.connection=Connection
 label.preferences.criteria=Default criteria
-label.preferences.same.area.events.latitude.interval=Same area events latitude interval \u00B1\u00B0
 label.preferences.general=General
 label.preferences.geofon.base.url=Geofon base URL
 label.preferences.html.bulletin.version=HTML bulletin version available at the specified URL
@@ -173,9 +167,12 @@ label.preferences.proxy.port=Port
 label.preferences.proxy.type=Proxy type
 label.preferences.proxy.username=Username
 label.preferences.restart=Cannot apply settings without restarting application.
+label.preferences.same.area.events.latitude.interval=Same area events latitude interval \u00B1\u00B0
 label.preferences.search.on.start=Search on start
 label.preferences.start.minimized=Start minimized
 label.preferences.timezone=Time zone
+label.sameareaevents.message=Latitude interval
+label.sameareaevents.title=Find events in the same area
 label.status.a=Automatic
 label.status.bar.item.count={0} item
 label.status.bar.items.count={0} items

src/main/resources/io/github/albertus82/eqbulletin/resources/messages_it.properties

@@ -1,5 +1,5 @@
-error.fatal=Si \u00E8 verificato un errore non gestito.
 error.fatal.init=Si \u00E8 verificato un errore non gestito durante l''avvio dell'applicazione.
+error.fatal=Si \u00E8 verificato un errore non gestito.
 error.form.decimal.range=Il valore deve essere un numero decimale compreso tra {0} e {1}
 error.form.integer.min=Il valore deve essere un numero intero maggiore o uguale a {0}
 error.form.integer.range=Il valore deve essere un numero intero compreso tra {0} e {1}
@@ -30,37 +30,31 @@ label.about.3rdparty.license=Licenza
 label.about.3rdparty.name=Nome
 label.about.3rdparty=Quest''applicazione fa uso ovvero include porzioni dei seguenti software di terze parti:
 label.about.acknowledgements.data=I dati sismici sono ricavati dal centro dati GEOFON del Centro di ricerca tedesco per le geoscienze GFZ.
-label.about.acknowledgements.icon=L''icona stilizzata di {0} \u00E8 stata prelevata da {1} (licenza {2}).
 label.about.acknowledgements.icon.cc-by-30.a.href=https://creativecommons.org/licenses/by/3.0/
 label.about.acknowledgements.icon.cc-by-30.a.text=Creative Commons Attribuzione 3.0 Unported
 label.about.acknowledgements.icon.iconfinder.a.href=https://www.iconfinder.com/icons/4691290/openstreetmap_icon
 label.about.acknowledgements.icon.iconfinder.a.text=Iconfinder
 label.about.acknowledgements.icon.openstreetmap.a.href=https://www.openstreetmap.org
 label.about.acknowledgements.icon.openstreetmap.a.text=OpenStreetMap
-label.about.acknowledgements.locations=Le posizioni sono ricavate dal programma {0} del Centro di ricerca tedesco per le geoscienze {1} utilizzando i dati provenienti dalle reti partner {2}.
+label.about.acknowledgements.icon=L''icona stilizzata di {0} \u00E8 stata prelevata da {1} (licenza {2}).
 label.about.acknowledgements.locations.geofon.a.href=https://geofon.gfz-potsdam.de
 label.about.acknowledgements.locations.geofon.a.text=GEOFON
 label.about.acknowledgements.locations.gevn.a.href=https://geofon.gfz-potsdam.de/eqinfo/gevn/
 label.about.acknowledgements.locations.gevn.a.text=GEVN
 label.about.acknowledgements.locations.gfz.a.href=https://www.gfz-potsdam.de
 label.about.acknowledgements.locations.gfz.a.text=GFZ
+label.about.acknowledgements.locations=Le posizioni sono ricavate dal programma {0} del Centro di ricerca tedesco per le geoscienze {1} utilizzando i dati provenienti dalle reti partner {2}.
 label.about.acknowledgements=Riconoscimenti
 label.about.home.page=Home page
-label.about.license=Quest''applicazione \u00E8 distribuita secondo la {0}:
 label.about.license.gpl.a.href=https://www.gnu.org/licenses/gpl.html
 label.about.license.gpl.a.text=GNU General Public License
+label.about.license=Quest''applicazione \u00E8 distribuita secondo la {0}:
 label.about.title=Informazioni su ${project.name}
 label.about.version=Versione {0} ({1})
 label.button.cancel=&Annulla
 label.button.close=&Chiudi
 label.button.confirm=&Conferma
 label.button.ok=&OK
-
-label.sameareaevents.title=Trova eventi nella stessa area
-label.sameareaevents.message=Intervallo di latitudine
-
-
-
 label.error=Errore
 label.feregion.dialog.coordinates=Coordinate
 label.feregion.dialog.latitude=Latitudine
@@ -117,9 +111,9 @@ label.menu.item.epicenter.map.popup=Visualizza epicentro in OpenStreet&Map
 label.menu.item.exit=&Esci
 label.menu.item.export.csv=Esporta &CSV...
 label.menu.item.feregion=&Regionalizzazione Flinn-Engdahl
+label.menu.item.find.events.same.area=Trova &eventi nella stessa area...
 label.menu.item.google.maps.browser=Visualizza mappa nel &browser
 label.menu.item.open.browser=&Apri evento nel browser
-label.menu.item.find.events.same.area=Trova &eventi nella stessa area...
 label.menu.item.preferences=&Configurazione
 label.menu.item.save.map=&Salva mappa con nome...
 label.menu.item.show.map=&Visualizza mappa
@@ -134,7 +128,6 @@ label.preferences.cache=Cache
 label.preferences.confirm.close=Conferma chiusura
 label.preferences.connection=Connessione
 label.preferences.criteria=Criteri predefiniti
-label.preferences.same.area.events.latitude.interval=Intervallo latitudine eventi nella stessa area \u00B1\u00B0
 label.preferences.general=Generale
 label.preferences.geofon.base.url=URL base Geofon
 label.preferences.html.bulletin.version=Versione del bollettino HTML presente all'URL specificato
@@ -174,9 +167,12 @@ label.preferences.proxy.port=Porta
 label.preferences.proxy.type=Tipo proxy
 label.preferences.proxy.username=Nome utente
 label.preferences.restart=Per rendere effettive le modifiche \u00E8 necessario riavviare l''applicazione.
+label.preferences.same.area.events.latitude.interval=Intervallo latitudine eventi nella stessa area \u00B1\u00B0
 label.preferences.search.on.start=Avvia ricerca all''avvio
 label.preferences.start.minimized=Avvia ridotto a icona
 label.preferences.timezone=Fuso orario
+label.sameareaevents.message=Intervallo di latitudine
+label.sameareaevents.title=Trova eventi nella stessa area
 label.status.a=Automatico
 label.status.bar.item.count={0} elemento
 label.status.bar.items.count={0} elementi