diff --git a/l10n/messages.properties b/l10n/messages.properties
index fcabdad29..5c495ae77 100644
--- a/l10n/messages.properties
+++ b/l10n/messages.properties
@@ -98,7 +98,7 @@ AboutDialog.lbl.version = Version
AboutDialog.lbl.translation = English translation by:
AboutDialog.lbl.translator =
AboutDialog.lbl.translatorWebsite =
-AboutDialog.lbl.translatorIcon =
+AboutDialog.lbl.translatorIcon =
! Print dialog
@@ -113,6 +113,15 @@ PrintDialog.error.preview.title = Unable to open preview
PrintDialog.error.preview.desc1 = Unable to open PDF preview.
PrintDialog.error.preview.desc2 = Please use the "Save as PDF" option instead.
+!PrintSettingsDialog
+PrintSettingsDialog.title = Print settings
+PrintSettingsDialog.lbl.Templatefillcolor = Template fill color:
+PrintSettingsDialog.lbl.Templatebordercolor = Template border color:
+PrintSettingsDialog.lbl.Papersize = Paper size:
+PrintSettingsDialog.lbl.Paperorientation = Paper orientation:
+PrintSettingsDialog.but.Reset = Reset
+PrintSettingsDialog.but.Close = Close
+
! Bug Report dialog
bugreport.dlg.title = Bug report
diff --git a/l10n/messages_de.properties b/l10n/messages_de.properties
index bd51927fb..fa1747c3c 100644
--- a/l10n/messages_de.properties
+++ b/l10n/messages_de.properties
@@ -1,3 +1,11 @@
+#
+# German base translation file
+#
+# Should you need to add new logical keys here is the proposed method
+#
+# className.ComponantType.componantName
+#
+
! Set to the name of the current translation file (used for debugging purposes)
debug.currentFile = messages_de.properties
@@ -54,10 +62,10 @@ BasicFrame.item.Closedesign = Aktuelles Raketendesign schlie
BasicFrame.item.Quitprogram = Programm beenden
BasicFrame.menu.Rocketedt = Rakete bearbeiten
BasicFrame.dlg.lbl1 = Design '
-BasicFrame.dlg.lbl2 = ist nicht gespeichert.
+BasicFrame.dlg.lbl2 = ' ist nicht gespeichert.
BasicFrame.dlg.lbl3 = Möchten Sie es speichern?
BasicFrame.dlg.title = Design nicht gespeichert
-BasicFrame.StageName.Sustainer = Sustainer
+BasicFrame.StageName.Sustainer = Hauptstufe
BasicFrame.WarningDialog.txt1 = Die folgenden Probleme würden beim Öffnen festgestellt
BasicFrame.WarningDialog.txt2 = Einige Designeigenschaften wurde eventuell nicht korrekt geladen.
BasicFrame.WarningDialog.title = Warnungen während des Öffnens der Datei
@@ -72,10 +80,45 @@ dlg.but.ok = OK
dlg.but.cancel = Abbrechen
dlg.but.close = Schließen
+
+! General file type names
+filetypes.pdf = PDF files
+
+
! About Dialog
-about.dlg.but.close = Schließen
-about.dlg.lbl.translation = Ins Deutsche übersetzt von Stefan Lobas (ERIG e.V.)
-about.dlg.lbl.transwebsite = http://www.er-ig.de/
+AboutDialog.lbl.version = Version
+! The texts below provide additional credits for the translation maintainer
+! - In AboutDialog.lbl.translation replace "English" with the current language.
+! - AboutDialog.lbl.translator is the translator / group name (may be empty)
+! - AboutDialog.lbl.translatorWebsite is a URL to the translator / group (may be empty)
+! - AboutDialog.lbl.translatorIcon is the file name of an icon under pix/translators/ (may be empty)
+AboutDialog.lbl.translation = Ins Deutsche übersetzt von:
+AboutDialog.lbl.translator = Stefan Lobas (ERIG e.V.)
+AboutDialog.lbl.translatorWebsite = http://www.er-ig.de/
+AboutDialog.lbl.translatorIcon = ERIG_Logo-small.png
+
+
+! Print dialog
+PrintDialog.title = Drucken oder exportieren
+PrintDialog.but.previewAndPrint = Vorschau & Drucken
+PrintDialog.checkbox.showByStage = In Stufen anzeigen
+PrintDialog.lbl.selectElements = Elemente auswählen, die berücksichtigt werden sollen:
+printdlg.but.saveaspdf = Als PDF speichern
+printdlg.but.preview = Vorschau
+printdlg.but.settings = Einstellungen
+PrintDialog.error.preview.title = Vorschau kann nicht geöffnet werden
+PrintDialog.error.preview.desc1 = PDF-Vorschau kann nicht geöffnet werden
+PrintDialog.error.preview.desc2 = Bitte "Als PDF speichern" benutzen.
+
+!PrintSettingsDialog
+PrintSettingsDialog.title = Print settings
+PrintSettingsDialog.lbl.Templatefillcolor = Template fill color:
+PrintSettingsDialog.lbl.Templatebordercolor = Template border color:
+PrintSettingsDialog.lbl.Papersize = Paper size:
+PrintSettingsDialog.lbl.Paperorientation = Paper orientation:
+PrintSettingsDialog.but.Reset = Reset
+PrintSettingsDialog.but.Close = Close
+
! Bug Report dialog
bugreport.dlg.title = Fehlerbericht
@@ -127,10 +170,6 @@ exdesigndlg.lbl.Openexampledesign = Beispieldesign
exdesigndlg.lbl.Exampledesignsnotfound = Beispieldesigns konnten nicht gefunden werden.
exdesigndlg.lbl.Examplesnotfound = Beispieldesign konnten nicht gefunden werden
-! Print panel dialog
-printdlg.but.saveaspdf = Als PDF speichern
-printdlg.but.preview = Vorschau
-printdlg.but.settings = Einstellungen
! Material edit panel
matedtpan.but.new = Neu
@@ -410,7 +449,7 @@ compaddbuttons.Engineblock = Motor-\nblock
compaddbuttons.Massobjects = Massenobjekte
compaddbuttons.Parachute = Fallschirm
compaddbuttons.Streamer = Strömer
-compaddbuttons.Shockcord = Gummiseil
+compaddbuttons.Shockcord = Gummiband
compaddbuttons.Masscomponent = Massen-\nobjekt
compaddbuttons.Donotaskmeagain = Nicht wieder fragen
compaddbuttons.Selectcomppos = Komponentenposition auswählen
@@ -438,8 +477,8 @@ componentanalysisdlg.dragTableModel.Col.Pressure = Druck CD
componentanalysisdlg.dragTableModel.Col.Base = Base CD
componentanalysisdlg.dragTableModel.Col.friction = Reibung CD
componentanalysisdlg.dragTableModel.Col.total = Gesamt CD
-componentanalysisdlg.dragTabchar = Drag characteristics
-componentanalysisdlg.dragTabchar.ttip = Drag characteristics
+componentanalysisdlg.dragTabchar = Luftwiderstand
+componentanalysisdlg.dragTabchar.ttip = Luftwiderstands-Eigenschaften
componentanalysisdlg.rollTableModel.Col.component = Komponente
componentanalysisdlg.rollTableModel.Col.rollforc = Roll forcing coefficient
componentanalysisdlg.rollTableModel.Col.rolldamp = Roll damping coefficient
@@ -520,7 +559,7 @@ RocketCfg.lbl.Revisionhistory = Versionsgeschichte:
RocketCfg.lbl.Material = Material:
! ShockCordConfig
-ShockCordCfg.lbl.Shockcordlength = Gummiseillänge
+ShockCordCfg.lbl.Shockcordlength = Gummibandlänge
! RocketComponentConfig
RocketCompCfg.lbl.Componentname = Komponentenname:
@@ -715,8 +754,8 @@ ParachuteCfg.lbl.Radialdirection = radiale Richtung:
ParachuteCfg.but.Reset = Zurücksetzen
! ShockCordConfig
-ShockCordCfg.lbl.Shockcordlength = Länge des Gummiseils
-ShockCordCfg.lbl.Shockcordmaterial = Material des Gummiseils:
+ShockCordCfg.lbl.Shockcordlength = Länge des Gummibands
+ShockCordCfg.lbl.Shockcordmaterial = Material des Gummibands:
ShockCordCfg.lbl.Posrelativeto = Position relativ zu:
ShockCordCfg.lbl.plus = plus
ShockCordCfg.lbl.Packedlength = gepackte Länge:
@@ -802,7 +841,7 @@ TrapezoidFinSetCfg.tab.General = Allgemein
TrapezoidFinSetCfg.tab.Generalproperties = Allgemeine Eigenschaften
!MotorConfigurationModel
-MotorCfgModel.Editcfg = Konfigurationen bearbeiten
+MotorCfgModel.Editcfg = Konfiguration bearbeiten
! StorageOptionChooser
StorageOptChooser.lbl.Simdatatostore = Zu speichernde Simulationsdaten:
@@ -863,7 +902,7 @@ main.menu.file.open =
main.menu.file.openExample = Beispiel öffnen..
main.menu.file.save = Speichern
main.menu.file.saveAs = Speichern unter...
-main.menu.file.print = Drucken...
+main.menu.file.print = Drucken / als PDF exportieren...
main.menu.file.close = Schließen
main.menu.file.quit = Beenden
@@ -1006,7 +1045,7 @@ MassComponent.MassComponent = Masse
! Parachute
Parachute.Parachute = Fallschirm
! ShockCord
-ShockCord.ShockCord = Gummiseil
+ShockCord.ShockCord = Gummiband
! Bulkhead
Bulkhead.Bulkhead = Schott
@@ -1036,7 +1075,7 @@ ComponentIcons.Bulkhead = Schott
ComponentIcons.Engineblock = Motorhalterung
ComponentIcons.Parachute = Fallschirm
ComponentIcons.Streamer = Strömer
-ComponentIcons.Shockcord = Gummiseil
+ComponentIcons.Shockcord = Gummiband
ComponentIcons.Masscomponent = Masse
ComponentIcons.disabled = (deaktiviert)
@@ -1147,7 +1186,7 @@ FlightDataType.TYPE_WIND_VELOCITY = Windgeschwindigkeit
FlightDataType.TYPE_AIR_TEMPERATURE = Lufttemperatur
FlightDataType.TYPE_AIR_PRESSURE = Luftdruck
FlightDataType.TYPE_SPEED_OF_SOUND = Schallgeschwindigkeit
-FlightDataType.TYPE_TIME_STEP = Simulationszeitschritt
+FlightDataType.TYPE_TIME_STEP = Simulationsintervall
FlightDataType.TYPE_COMPUTATION_TIME = Berechnnungszeit
! PlotConfiguration
diff --git a/l10n/messages_es.properties b/l10n/messages_es.properties
index b1aeebb9c..21477eb4d 100644
--- a/l10n/messages_es.properties
+++ b/l10n/messages_es.properties
@@ -83,10 +83,41 @@ dlg.but.ok = OK
dlg.but.cancel = Borrar
dlg.but.close = Cerrar
+! General file type names
+filetypes.pdf = PDF files
+
! About Dialog
-about.dlg.but.close = Cerrar
-about.dlg.lbl.translation = Traducido al español por Tripoli Spain
-about.dlg.lbl.transwebsite = http://www.tripoli-spain.org/
+AboutDialog.lbl.version = Version
+! The texts below provide additional credits for the translation maintainer
+! - In AboutDialog.lbl.translation replace "English" with the current language.
+! - AboutDialog.lbl.translator is the translator / group name (may be empty)
+! - AboutDialog.lbl.translatorWebsite is a URL to the translator / group (may be empty)
+! - AboutDialog.lbl.translatorIcon is the file name of an icon under pix/translators/ (may be empty)
+AboutDialog.lbl.translation = Traducido al español por:
+AboutDialog.lbl.translator = Tripoli Spain
+AboutDialog.lbl.translatorWebsite = http://www.tripoli-spain.org/
+AboutDialog.lbl.translatorIcon = logoTripoliSpain.png
+
+! Print dialog
+PrintDialog.title = Imprimir o exportar
+PrintDialog.but.previewAndPrint = Vista previa & Imprimir
+PrintDialog.checkbox.showByStage = Mostrar por etapas
+PrintDialog.lbl.selectElements = Seleccionar elementos a incluir:
+printdlg.but.saveaspdf = Guardar como PDF
+printdlg.but.preview = Previsualizar
+printdlg.but.settings = Configuraciones
+PrintDialog.error.preview.title = Imposible abrir vista previa
+PrintDialog.error.preview.desc1 = Imposible abrir vista previa en PDF.
+PrintDialog.error.preview.desc2 = Por favour usar la opción Guardar como PDF.
+
+!PrintSettingsDialog
+PrintSettingsDialog.title = Imprimir puesta a punto
+PrintSettingsDialog.lbl.Templatefillcolor = Plantilla de colores:
+PrintSettingsDialog.lbl.Templatebordercolor = Color del borde de la plantilla:
+PrintSettingsDialog.lbl.Papersize = Tamaño del papel:
+PrintSettingsDialog.lbl.Paperorientation = Orientación del papel:
+PrintSettingsDialog.but.Reset = Reinicializar
+PrintSettingsDialog.but.Close = Cerrar
! Bug Report dialog
bugreport.dlg.title = Report de error
@@ -138,10 +169,6 @@ exdesigndlg.lbl.Openexampledesign = Abra un dise
exdesigndlg.lbl.Exampledesignsnotfound = Los ejemplos de diseño podrían no hallarse.
exdesigndlg.lbl.Examplesnotfound = Ejemplos no hallados
-! Print panel dialog
-printdlg.but.saveaspdf = Guardar como PDF
-printdlg.but.preview = Previsualizar
-printdlg.but.settings = Configuraciones
! Material edit panel
matedtpan.but.new = Nuevo
diff --git a/l10n/messages_fr.properties b/l10n/messages_fr.properties
index d4c0972ae..4d2a093a4 100644
--- a/l10n/messages_fr.properties
+++ b/l10n/messages_fr.properties
@@ -78,10 +78,41 @@ dlg.but.ok = Accepter
dlg.but.cancel = Annuler
dlg.but.close = Fermer
+! General file type names
+filetypes.pdf = PDF files
+
! About Dialog
-AboutDialog.lbl.translation = Traduit en français par
+AboutDialog.lbl.version = Version
+! The texts below provide additional credits for the translation maintainer
+! - In AboutDialog.lbl.translation replace "English" with the current language.
+! - AboutDialog.lbl.translator is the translator / group name (may be empty)
+! - AboutDialog.lbl.translatorWebsite is a URL to the translator / group (may be empty)
+! - AboutDialog.lbl.translatorIcon is the file name of an icon under pix/translators/ (may be empty)
+AboutDialog.lbl.translation = Traduit en français par:
AboutDialog.lbl.translator = Tripoli France
AboutDialog.lbl.translatorWebsite = http://tripoli.france.free.fr/
+AboutDialog.lbl.translatorIcon = logoTripoliFrance.png
+
+! Print dialog
+PrintDialog.title = Imprimer ou exporter
+PrintDialog.but.previewAndPrint = Previsualiser et imprimer
+PrintDialog.checkbox.showByStage = Montrer par étage
+PrintDialog.lbl.selectElements = Choisir les elements à inclure:
+printdlg.but.saveaspdf = Sauvegarder en PDF
+printdlg.but.preview = Prévisualisation
+printdlg.but.settings = Configuration
+PrintDialog.error.preview.title = Impossible d'ouvrir la prévisualisation
+PrintDialog.error.preview.desc1 = Impossible d'ouvrir la prévisualisation PDF.
+PrintDialog.error.preview.desc2 = S'il vous plait utilisez l'option "Sauvegarder en PDF" à la place.
+
+!PrintSettingsDialog
+PrintSettingsDialog.title = Configuration impression
+PrintSettingsDialog.lbl.Templatefillcolor = Couleur de remplissage du modele:
+PrintSettingsDialog.lbl.Templatebordercolor = Couleur des bords du modéle:
+PrintSettingsDialog.lbl.Papersize = Dimessions du papier:
+PrintSettingsDialog.lbl.Paperorientation = Orientation du papier:
+PrintSettingsDialog.but.Reset = Réinitialiser
+PrintSettingsDialog.but.Close = Fermer
! Bug Report dialog
bugreport.dlg.title = Rapport d'erreurs
@@ -133,10 +164,7 @@ exdesigndlg.lbl.Openexampledesign = Ouvrir un exemple de projet
exdesigndlg.lbl.Exampledesignsnotfound = Impossible de trouver les exemples de projets.
exdesigndlg.lbl.Examplesnotfound = Exemples non trouvés
-! Print panel dialog
-printdlg.but.saveaspdf = Sauvegarder en PDF
-printdlg.but.preview = Prévisualisation
-printdlg.but.settings = Configuration
+
! Material edit panel
matedtpan.but.new = Nouveau
diff --git a/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java b/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java
index 8020bf488..183ee7a1f 100644
--- a/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java
+++ b/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java
@@ -19,6 +19,7 @@ import net.sf.openrocket.gui.components.ColorChooserButton;
import net.sf.openrocket.gui.print.PaperOrientation;
import net.sf.openrocket.gui.print.PaperSize;
import net.sf.openrocket.gui.print.PrintSettings;
+import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.GUIUtil;
@@ -28,7 +29,8 @@ import net.sf.openrocket.util.GUIUtil;
*/
public class PrintSettingsDialog extends JDialog {
private static final LogHelper log = Application.getLogger();
-
+ private static final Translator trans = Application.getTranslator();
+
/**
* Construct a dialog for setting the advanced rocket print settings.
@@ -36,13 +38,14 @@ public class PrintSettingsDialog extends JDialog {
* @param parent the owning dialog
*/
public PrintSettingsDialog(Window parent, final PrintSettings settings) {
- super(parent, "Print settings", ModalityType.APPLICATION_MODAL);
+ ////Print settings
+ super(parent, trans.get("title"), ModalityType.APPLICATION_MODAL);
JPanel panel = new JPanel(new MigLayout("fill"));
-
- panel.add(new JLabel("Template fill color:"));
+ ////Template fill color:
+ panel.add(new JLabel(trans.get("lbl.Templatefillcolor")));
final ColorChooserButton fillColorButton = new ColorChooserButton(settings.getTemplateFillColor());
fillColorButton.addColorPropertyChangeListener(new PropertyChangeListener() {
@Override
@@ -54,8 +57,8 @@ public class PrintSettingsDialog extends JDialog {
});
panel.add(fillColorButton, "wrap para");
-
- panel.add(new JLabel("Template border color:"));
+ //// Template border color:
+ panel.add(new JLabel(trans.get("lbl.Templatebordercolor")));
final ColorChooserButton borderColorButton = new ColorChooserButton(settings.getTemplateBorderColor());
borderColorButton.addColorPropertyChangeListener(new PropertyChangeListener() {
@Override
@@ -70,19 +73,21 @@ public class PrintSettingsDialog extends JDialog {
JComboBox combo = new JComboBox(new EnumModel(settings, "PaperSize"));
- panel.add(new JLabel("Paper size:"));
+ ////Paper size:
+ panel.add(new JLabel(trans.get("lbl.Papersize")));
panel.add(combo, "growx, wrap para");
combo = new JComboBox(new EnumModel(settings, "PaperOrientation"));
- panel.add(new JLabel("Paper orientation:"));
+ //// Paper orientation:
+ panel.add(new JLabel(trans.get("lbl.Paperorientation")));
panel.add(combo, "growx, wrap para*2");
-
- JButton button = new JButton("Reset");
+ //// Reset
+ JButton button = new JButton(trans.get("but.Reset"));
button.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -95,8 +100,8 @@ public class PrintSettingsDialog extends JDialog {
});
panel.add(button, "spanx, split, right");
-
- JButton closeButton = new JButton("Close");
+ //// Close
+ JButton closeButton = new JButton(trans.get("but.Close"));
closeButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {