From 18b15f7854d7c600eb3170118ad4342261bcedfb Mon Sep 17 00:00:00 2001 From: SiboVG Date: Tue, 16 Aug 2022 01:41:56 +0200 Subject: [PATCH 1/2] Rename 'remove' to 'delete' --- core/resources/l10n/messages.properties | 24 +++++++-------- core/resources/l10n/messages_cs.properties | 18 +++++------ core/resources/l10n/messages_de.properties | 20 ++++++------- core/resources/l10n/messages_es.properties | 20 ++++++------- core/resources/l10n/messages_fr.properties | 20 ++++++------- core/resources/l10n/messages_it.properties | 20 ++++++------- core/resources/l10n/messages_ja.properties | 20 ++++++------- core/resources/l10n/messages_nl.properties | 20 ++++++------- core/resources/l10n/messages_pl.properties | 18 +++++------ core/resources/l10n/messages_pt.properties | 20 ++++++------- core/resources/l10n/messages_ru.properties | 20 ++++++------- core/resources/l10n/messages_uk_UA.properties | 22 +++++++------- core/resources/l10n/messages_zh_CN.properties | 20 ++++++------- .../CustomExpressionPanel.java | 2 +- .../FlightConfigurationPanel.java | 18 +++++------ .../MotorConfigurationPanel.java | 30 +++++++++---------- .../RecoveryConfigurationPanel.java | 2 +- .../SeparationConfigurationPanel.java | 4 +-- .../gui/simulation/SimulationPlotPanel.java | 2 +- 19 files changed, 160 insertions(+), 160 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index aa9ae51b7..732550b7c 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -28,7 +28,7 @@ RocketActions.DelSimuAct.ttip.Delete = Delete the selected simulation. RocketActions.DelAct.Delete = Delete RocketActions.DelAct.ttip.Delete = Delete the selected component or simulation. RocketActions.CutAction.Cut = Cut -RocketActions.CutAction.ttip.Cut = Cut this component or simulation to the clipboard and remove from this design +RocketActions.CutAction.ttip.Cut = Cut this component or simulation to the clipboard and delete from this design RocketActions.CopyAct.Copy = Copy RocketActions.CopyAct.ttip.Copy = Copy this component (and subcomponents) to the clipboard. RocketActions.PasteAct.Paste = Paste @@ -190,7 +190,7 @@ MotorChooserDialog.title = Select a rocket motor ! Edit Motor configuration dialog edtmotorconfdlg.col.configuration = Configuration -edtmotorconfdlg.but.Removeconfiguration = Remove Configuration +edtmotorconfdlg.but.Deleteconfiguration = Delete Configuration edtmotorconfdlg.but.Renameconfiguration = Rename Configuration edtmotorconfdlg.but.Newconfiguration = New Configuration edtmotorconfdlg.but.Duplicateconfiguration = Duplicate Configuration @@ -374,7 +374,7 @@ simedtdlg.but.runsimulation = Run simulation simedtdlg.but.resettodefault = Reset to default simedtdlg.but.savedefault = Save as default simedtdlg.but.add = Add -simedtdlg.but.remove = Remove +simedtdlg.but.delete = Delete simedtdlg.title.Editsim = Edit simulation simedtdlg.lbl.Simname = Simulation name: simedtdlg.tab.Launchcond = Launch conditions @@ -606,7 +606,7 @@ customExpressionPanel.but.ttip.Import = Import custom expressions from another . customExpressionPanel.lbl.UpdateNote = You must run the simulation before data will be available for plotting. customExpressionPanel.lbl.CalcNote = Expressions will be calculated in the order shown. customExpressionPanel.lbl.CustomExpressions = Custom Expressions -customExpression.Units.but.ttip.Remove = Remove this expression +customExpression.Units.but.ttip.Delete = Delete this expression customExpression.Units.but.ttip.Edit = Edit this expression customExpression.Units.but.ttip.MoveUp = Move expression up in calculation order customExpression.Units.but.ttip.MoveDown = Move expression down in calculation order @@ -690,7 +690,7 @@ simplotpanel.but.All = All simplotpanel.but.None = None simplotpanel.but.NewYaxisplottype = New Y axis plot type simplotpanel.lbl.Axis = Axis: -simplotpanel.but.ttip.Removethisplot = Remove this plot +simplotpanel.but.ttip.Deletethisplot = Delete this plot simplotpanel.Desc = The data will be plotted in time order even if the X axis type is not time. simplotpanel.OptionPane.lbl1 = A maximum of 15 plots is allowed. simplotpanel.OptionPane.lbl2 = Cannot add plot @@ -1003,7 +1003,7 @@ FreeformFinSetCfg.lbl.Thickness = Thickness: FreeformFinSetConfig.lbl.doubleClick1 = Double-click FreeformFinSetConfig.lbl.doubleClick2 = to edit FreeformFinSetConfig.lbl.clickDrag = Click+drag: Add and move points -FreeformFinSetConfig.lbl.ctrlClick = Ctrl+click: Remove point +FreeformFinSetConfig.lbl.ctrlClick = Ctrl+click: Delete point FreeformFinSetConfig.lbl.scaleFin = Scale Fin FreeformFinSetConfig.lbl.exportCSV = Export CSV @@ -1089,7 +1089,7 @@ MotorCfg.lbl.longA2 = Stages can be added by clicking \"New stage\". MotorCfg.lbl.longB1 = The current design has MotorCfg.lbl.longB2 = stages. MotorCfg.but.Selectmotor = Select motor -MotorCfg.but.Removemotor = Remove motor +MotorCfg.but.Deletemotor = Delete motor MotorCfg.lbl.motorLabel = None ! NoseConeConfig @@ -1956,10 +1956,10 @@ GeneralOptimizationDialog.btn.stop = Stop optimization GeneralOptimizationDialog.lbl.paramsToOptimize = Parameters to optimize: GeneralOptimizationDialog.btn.add = Add GeneralOptimizationDialog.btn.add.ttip = Add the selected parameter to the optimization -GeneralOptimizationDialog.btn.remove = Remove -GeneralOptimizationDialog.btn.remove.ttip = Remove the selected parameter from the optimization -GeneralOptimizationDialog.btn.removeAll = Remove all -GeneralOptimizationDialog.btn.removeAll.ttip = Remove all parameters from the optimization +GeneralOptimizationDialog.btn.delete = Delete +GeneralOptimizationDialog.btn.delete.ttip = Delete the selected parameter from the optimization +GeneralOptimizationDialog.btn.deleteAll = Delete all +GeneralOptimizationDialog.btn.deleteAll.ttip = Delete all parameters from the optimization GeneralOptimizationDialog.lbl.availableParams = Available parameters: GeneralOptimizationDialog.lbl.optimizationOpts = Optimization options GeneralOptimizationDialog.lbl.optimizeSim = Optimize simulation: @@ -2141,7 +2141,7 @@ EditDecalHelper.editPreferencesHelp = The editor used can be modified in the Pre MotorConfigurationPanel.lbl.motorMounts = Motor mounts MotorConfigurationPanel.lbl.motorConfiguration = Motor configurations -MotorConfigurationPanel.btn.removeMotor = Remove motor +MotorConfigurationPanel.btn.deleteMotor = Delete motor MotorConfigurationPanel.btn.selectMotor = Select motor MotorConfigurationPanel.btn.selectIgnition = Select ignition MotorConfigurationPanel.btn.resetIgnition = Reset ignition diff --git a/core/resources/l10n/messages_cs.properties b/core/resources/l10n/messages_cs.properties index f5b5933f7..6554159a9 100644 --- a/core/resources/l10n/messages_cs.properties +++ b/core/resources/l10n/messages_cs.properties @@ -173,9 +173,9 @@ debuglogdlg.lbl.Stacktrace = Tracov ! Edit Motor configuration dialog -MotorConfigurationPanel.btn.removeMotor = Odeber motor +MotorConfigurationPanel.btn.deleteMotor = Odeber motor MotorConfigurationPanel.btn.selectMotor = Vyber motor -edtmotorconfdlg.but.Removeconfiguration = Odeber nastavení +edtmotorconfdlg.but.Deleteconfiguration = Odeber nastavení edtmotorconfdlg.but.Newconfiguration = Nové nastavení MotorConfigurationPanel.lbl.motorMounts = Pripojení motoru edtmotorconfdlg.title.Editmotorconf = Úprava nastavení motoru @@ -283,7 +283,7 @@ update.dlg.latestVersion = Je spu\u0161tena nejnovej\u0161 simedtdlg.but.runsimulation = Simulace be\u017Eí simedtdlg.but.resettodefault = Reset do výchozí hodnoty simedtdlg.but.add = Pridej -simedtdlg.but.remove = Odeber +simedtdlg.but.delete = Odeber simedtdlg.title.Editsim = Uprav simulaci simedtdlg.lbl.Simname = Jméno simulace: simedtdlg.tab.Launchcond = Startovací podmínky @@ -472,7 +472,7 @@ simplotpanel.but.None = Nic simplotpanel.but.NewYaxisplottype = Nový typ osy Y simplotpanel.but.Plotflight = Letový graf simplotpanel.lbl.Axis = Osy: -simplotpanel.but.ttip.Removethisplot = Odeber tento graf +simplotpanel.but.ttip.Deletethisplot = Odeber tento graf simplotpanel.Desc = Data budou vykreslena v casovém poradí i kdy\u017E osa x nebude nastavena jako cas. simplotpanel.OptionPane.lbl1 = Maximálne 15 grafu je povoleno. simplotpanel.OptionPane.lbl2 = Nemohu pridat graf @@ -780,7 +780,7 @@ MotorCfg.lbl.longA2 = Stupne mohou b MotorCfg.lbl.longB1 = Soucasný návrh má MotorCfg.lbl.longB2 = stupnu. MotorCfg.but.Selectmotor = Vyber motor -MotorCfg.but.Removemotor = Odeber motor +MotorCfg.but.Deletemotor = Odeber motor MotorCfg.lbl.motorLabel = Nic ! NoseConeConfig @@ -1471,10 +1471,10 @@ GeneralOptimizationDialog.btn.stop = Konec optimalizace GeneralOptimizationDialog.lbl.paramsToOptimize = Parametry optimalizace: GeneralOptimizationDialog.btn.add = Pridej GeneralOptimizationDialog.btn.add.ttip = Pridej oznacené parametry k optimalizaci -GeneralOptimizationDialog.btn.remove = Odeber -GeneralOptimizationDialog.btn.remove.ttip = Odeber oznacené parametry z optimalizace -GeneralOptimizationDialog.btn.removeAll = Odeber v\u0161e -GeneralOptimizationDialog.btn.removeAll.ttip = Odeber v\u0161echny parametry z optimalizace +GeneralOptimizationDialog.btn.delete = Odeber +GeneralOptimizationDialog.btn.delete.ttip = Odeber oznacené parametry z optimalizace +GeneralOptimizationDialog.btn.deleteAll = Odeber v\u0161e +GeneralOptimizationDialog.btn.deleteAll.ttip = Odeber v\u0161echny parametry z optimalizace GeneralOptimizationDialog.lbl.availableParams = Dostupné parametry: GeneralOptimizationDialog.lbl.optimizationOpts = Nastavení optimalizace GeneralOptimizationDialog.lbl.optimizeSim = Optimalizuj simulaci: diff --git a/core/resources/l10n/messages_de.properties b/core/resources/l10n/messages_de.properties index 45f91eda5..0eed3aeea 100644 --- a/core/resources/l10n/messages_de.properties +++ b/core/resources/l10n/messages_de.properties @@ -174,9 +174,9 @@ debuglogdlg.lbl.Stacktrace = Stacktrace: ! Edit Motor configuration dialog -MotorConfigurationPanel.btn.removeMotor = Motor entfernen +MotorConfigurationPanel.btn.deleteMotor = Motor entfernen MotorConfigurationPanel.btn.selectMotor = Motor auswählen -edtmotorconfdlg.but.Removeconfiguration = Konfiguration entfernen +edtmotorconfdlg.but.Deleteconfiguration = Konfiguration entfernen edtmotorconfdlg.but.Newconfiguration = Neue Konfiguration MotorConfigurationPanel.lbl.motorMounts = Motorhalterungen edtmotorconfdlg.title.Editmotorconf = Motorkonfiguration bearbeiten @@ -285,7 +285,7 @@ update.dlg.latestVersion = Sie benutzen die neueste Version von OpenRocket, Vers simedtdlg.but.runsimulation = Simulation starten simedtdlg.but.resettodefault = Auf Standardeinstellungen zurücksetzen simedtdlg.but.add = Hinzufügen -simedtdlg.but.remove = Entfernen +simedtdlg.but.delete = Entfernen simedtdlg.title.Editsim = Simulation bearbeiten simedtdlg.lbl.Simname = Name der Simulation: simedtdlg.tab.Launchcond = Startbedingungen @@ -462,7 +462,7 @@ customExpressionPanel.but.NewExpression = Neuer Ausdruck customExpressionPanel.lbl.UpdateNote = Die Simulation muss erst ausgeführt werden, bevor die Daten zum Plotten verfügbar sind. customExpressionPanel.lbl.CalcNote = Ausdrücke werden in der angezeigten Reihenfolge berechnet. customExpressionPanel.lbl.CustomExpressions = Benutzerdefinierte Ausdrücke: -customExpression.Units.but.ttip.Remove = Diesen Ausdruck entfernen +customExpression.Units.but.ttip.Delete = Diesen Ausdruck entfernen customExpression.Units.but.ttip.Edit = Diesen Ausdruck bearbeiten customExpression.Units.but.ttip.MoveUp = Ausdruck in der Berechnungsreihenfolge nach oben schieben customExpression.Units.but.ttip.MoveDown = Ausdruck in der Berechnungsreihenfolge nach unten schieben @@ -530,7 +530,7 @@ simplotpanel.but.None = Keine simplotpanel.but.NewYaxisplottype = Neuer Y-Achsenplot-Typ simplotpanel.but.Plotflight = Flug plotten simplotpanel.lbl.Axis = Achsen: -simplotpanel.but.ttip.Removethisplot = Diesen Plot löschen +simplotpanel.but.ttip.Deletethisplot = Diesen Plot löschen simplotpanel.Desc = Die Daten werden in zeitlicher Reihenfolge geplottet, auch wenn der X-Achsen-Typ nicht Zeit ist. simplotpanel.OptionPane.lbl1 = Es sind maximal 15 Plots erlaubt. simplotpanel.OptionPane.lbl2 = Plot konnte nicht hinzugefügt werden @@ -837,7 +837,7 @@ MotorCfg.lbl.longA2 = Stufen k MotorCfg.lbl.longB1 = Das aktuelle Design hat im Moment nur eine Stufe. MotorCfg.lbl.longB2 = Stufen. MotorCfg.but.Selectmotor = Motor auswählen -MotorCfg.but.Removemotor = Motor entfernen +MotorCfg.but.Deletemotor = Motor entfernen MotorCfg.lbl.motorLabel = Keiner ! NoseConeConfig @@ -1531,10 +1531,10 @@ GeneralOptimizationDialog.btn.stop = Optimierung stoppen GeneralOptimizationDialog.lbl.paramsToOptimize = Zu optimierende Parameter: GeneralOptimizationDialog.btn.add = Hinzufügen GeneralOptimizationDialog.btn.add.ttip = Fügt den ausgewählten Parameter der Optimierung hinzu. -GeneralOptimizationDialog.btn.remove = Entfernen -GeneralOptimizationDialog.btn.remove.ttip = Entfernt den ausgewählten Parameter aus der Optimierung -GeneralOptimizationDialog.btn.removeAll = Alle entfernen -GeneralOptimizationDialog.btn.removeAll.ttip = Entfernt alle Parameter aus der Optimierung +GeneralOptimizationDialog.btn.delete = Entfernen +GeneralOptimizationDialog.btn.delete.ttip = Entfernt den ausgewählten Parameter aus der Optimierung +GeneralOptimizationDialog.btn.deleteAll = Alle entfernen +GeneralOptimizationDialog.btn.deleteAll.ttip = Entfernt alle Parameter aus der Optimierung GeneralOptimizationDialog.lbl.availableParams = Verfügbare Parameter: GeneralOptimizationDialog.lbl.optimizationOpts = Optimierungsoptionen GeneralOptimizationDialog.lbl.optimizeSim = Simulation optimieren: diff --git a/core/resources/l10n/messages_es.properties b/core/resources/l10n/messages_es.properties index 255e26369..b115de176 100644 --- a/core/resources/l10n/messages_es.properties +++ b/core/resources/l10n/messages_es.properties @@ -388,10 +388,10 @@ GeneralOptimizationDialog.btn.close = Cerrar GeneralOptimizationDialog.btn.close.ttip = Cerrar el cuadro de di\u00e1logo sin modificar el dise\u00f1o actual del cohete. GeneralOptimizationDialog.btn.plotPath = Gr\u00e1fica del proceso GeneralOptimizationDialog.btn.plotPath.ttip = Gr\u00e1fica del proceso de optimizaci\u00f3n (s\u00f3lo para 1 o 2 dimensiones). -GeneralOptimizationDialog.btn.remove = Eliminar -GeneralOptimizationDialog.btn.remove.ttip = Eliminar el par\u00e1metro seleccionado de la optimizaci\u00f3n. -GeneralOptimizationDialog.btn.removeAll = Eliminar todo -GeneralOptimizationDialog.btn.removeAll.ttip = Eliminar todos los par\u00e1metros de optimizaci\u00f3n. +GeneralOptimizationDialog.btn.delete = Eliminar +GeneralOptimizationDialog.btn.delete.ttip = Eliminar el par\u00e1metro seleccionado de la optimizaci\u00f3n. +GeneralOptimizationDialog.btn.deleteAll = Eliminar todo +GeneralOptimizationDialog.btn.deleteAll.ttip = Eliminar todos los par\u00e1metros de optimizaci\u00f3n. GeneralOptimizationDialog.btn.reset = Reiniciar GeneralOptimizationDialog.btn.reset.ttip = Reiniciar el dise\u00f1o actual del cohete con el dise\u00f1o optimizado. GeneralOptimizationDialog.btn.save = Guardar resultados @@ -544,7 +544,7 @@ MaximumVelocityParameter.name = Velocidad m\u00e1xima MotorCfg.but.FlightcfgEdit = Editar MotorCfg.but.New = Nuevo -MotorCfg.but.Removemotor = Quitar motor +MotorCfg.but.Deletemotor = Quitar motor MotorCfg.but.Selectmotor = Seleccionar motor ! MotorConfig MotorCfg.checkbox.compmotormount = Este componente es un porta motor @@ -568,7 +568,7 @@ MotorCfgModel.Editcfg = Editar configuraciones MotorChooserDialog.title = Seleccione un motor ! Edit Motor configuration dialog -MotorConfigurationPanel.btn.removeMotor = Quitar motor +MotorConfigurationPanel.btn.deleteMotor = Quitar motor MotorConfigurationPanel.btn.resetIgnition = Reiniciar ignici\u00f3n MotorConfigurationPanel.btn.selectIgnition = Seleccionar ignici\u00f3n MotorConfigurationPanel.btn.selectMotor = Seleccionar motor @@ -1346,7 +1346,7 @@ customExpression.Units = Unidades customExpression.Units.but.ttip.Edit = Editar esta expresi\u00f3n customExpression.Units.but.ttip.MoveDown = Mover la expresi\u00f3n hacia abajo en el orden de c\u00e1lculo customExpression.Units.but.ttip.MoveUp = Mover la expresi\u00f3n hacia arriba en el orden de c\u00e1lculo -customExpression.Units.but.ttip.Remove = Eliminar esta expresi\u00f3n +customExpression.Units.but.ttip.Delete = Eliminar esta expresi\u00f3n customExpressionPanel.but.Import = Importar ! Custom expression panel @@ -1384,7 +1384,7 @@ dlg.but.ok = OK edtmotorconfdlg.but.Duplicateconfiguration = Duplicar edtmotorconfdlg.but.Newconfiguration = Nueva configuraci\u00f3n ! Edit Motor configuration dialog -edtmotorconfdlg.but.Removeconfiguration = Quitar configuraci\u00f3n +edtmotorconfdlg.but.Deleteconfiguration = Quitar configuraci\u00f3n edtmotorconfdlg.but.Renameconfiguration = Renombrar configuraci\u00f3n edtmotorconfdlg.but.Resetdeployment = Reiniciar despliegue edtmotorconfdlg.but.Resetseparation = Reiniciar separaci\u00f3n @@ -1735,7 +1735,7 @@ simedtdlg.border.Simlist = Extensiones del simulador simedtdlg.border.Simopt = Opciones del simulador simedtdlg.but.FlightcfgEdit = Editar simedtdlg.but.add = Agregar -simedtdlg.but.remove = Quitar +simedtdlg.but.delete = Quitar simedtdlg.but.resettodefault = Restaurar por defecto ! Simulation edit dialog simedtdlg.but.runsimulation = Lanzar la simulaci\u00f3n @@ -1851,7 +1851,7 @@ simplotpanel.but.All = Todo simplotpanel.but.NewYaxisplottype = A\u00f1adir nuevo eje Y en la gr\u00e1fica simplotpanel.but.None = Ninguno simplotpanel.but.Plotflight = Ver gr\u00e1fica -simplotpanel.but.ttip.Removethisplot = Eliminar esta curva +simplotpanel.but.ttip.Deletethisplot = Eliminar esta curva simplotpanel.lbl.Axis = Ejes: simplotpanel.lbl.Flightevents = Eventos del vuelo: ! Simulation plot panel diff --git a/core/resources/l10n/messages_fr.properties b/core/resources/l10n/messages_fr.properties index d4cee80d0..506ae1c74 100644 --- a/core/resources/l10n/messages_fr.properties +++ b/core/resources/l10n/messages_fr.properties @@ -379,10 +379,10 @@ GeneralOptimizationDialog.btn.close = Fermer GeneralOptimizationDialog.btn.close.ttip = Fermer la fen\u00EAtre de dialogue sans modifier la fus\u00E9e GeneralOptimizationDialog.btn.plotPath = Tracer le chemin GeneralOptimizationDialog.btn.plotPath.ttip = Tracer le chemin de l'optimisation (optimisation \u00E0 une ou deux dimensions seulement) -GeneralOptimizationDialog.btn.remove = Enlever -GeneralOptimizationDialog.btn.remove.ttip = Enlever le param\u00E8tre s\u00E9lectionn\u00E9 des param\u00E8tres \u00E0 optimiser -GeneralOptimizationDialog.btn.removeAll = Tout enlever -GeneralOptimizationDialog.btn.removeAll.ttip = Enlever tous les param\u00E8tres de l'optimisation +GeneralOptimizationDialog.btn.delete = Enlever +GeneralOptimizationDialog.btn.delete.ttip = Enlever le param\u00E8tre s\u00E9lectionn\u00E9 des param\u00E8tres \u00E0 optimiser +GeneralOptimizationDialog.btn.deleteAll = Tout enlever +GeneralOptimizationDialog.btn.deleteAll.ttip = Enlever tous les param\u00E8tres de l'optimisation GeneralOptimizationDialog.btn.reset = R\u00E9initialiser GeneralOptimizationDialog.btn.reset.ttip = R\u00E9initialiser le "design" de la fus\u00E9e au "design" actuel de la fus\u00E9e GeneralOptimizationDialog.btn.save = Chemin pour la sauvegarder @@ -537,7 +537,7 @@ MaximumVelocityParameter.name = Vitesse maximum MotorCfg.but.FlightcfgEdit = Modifier MotorCfg.but.New = Nouveau -MotorCfg.but.Removemotor = Enlever le moteur +MotorCfg.but.Deletemotor = Enlever le moteur MotorCfg.but.Selectmotor = Choisir le moteur ! MotorConfig MotorCfg.checkbox.compmotormount = Cette pi\u00E8ce est un porte moteur @@ -561,7 +561,7 @@ MotorCfgModel.Editcfg = Modifier les configurations MotorChooserDialog.title = S\u00E9lectionnez un moteur fus\u00E9e ! Edit Motor configuration dialog -MotorConfigurationPanel.btn.removeMotor = Enlever le moteur +MotorConfigurationPanel.btn.deleteMotor = Enlever le moteur MotorConfigurationPanel.btn.resetIgnition = R\u00E9initialiser l'allumage MotorConfigurationPanel.btn.selectIgnition = Choisir l'allumage MotorConfigurationPanel.btn.selectMotor = Choisir le moteur @@ -1341,7 +1341,7 @@ customExpression.Units = Unit\u00E9s customExpression.Units.but.ttip.Edit = Modifier cette expression customExpression.Units.but.ttip.MoveDown = D\u00E9placer en bas l'expression dans l'ordre de calcul customExpression.Units.but.ttip.MoveUp = D\u00E9placer en haut l'expression dans l'ordre de calcul -customExpression.Units.but.ttip.Remove = Supprimer cette expression +customExpression.Units.but.ttip.Delete = Supprimer cette expression customExpressionPanel.but.Import = Importer ! Custom expression panel @@ -1378,7 +1378,7 @@ dlg.but.ok = Accepter edtmotorconfdlg.but.Duplicateconfiguration = Dupliquer edtmotorconfdlg.but.Newconfiguration = Nouvelle configuration -edtmotorconfdlg.but.Removeconfiguration = Supprimer la configuration +edtmotorconfdlg.but.Deleteconfiguration = Supprimer la configuration edtmotorconfdlg.but.Renameconfiguration = Renommer edtmotorconfdlg.but.Resetdeployment = R\u00E9initialiserle d\u00E9ploiement edtmotorconfdlg.but.Resetseparation = R\u00E9initialiser la s\u00E9paration @@ -1727,7 +1727,7 @@ simedtdlg.border.Simlist = Auditeurs de simulation simedtdlg.border.Simopt = Options de simulation simedtdlg.but.FlightcfgEdit = Modifier simedtdlg.but.add = Ajouter -simedtdlg.but.remove = Enlever +simedtdlg.but.delete = Enlever simedtdlg.but.resettodefault = Restaurer les param\u00E8tres par d\u00E9faut ! Simulation edit dialog simedtdlg.but.runsimulation = Lancer la simulation @@ -1843,7 +1843,7 @@ simplotpanel.but.All = Tous simplotpanel.but.NewYaxisplottype = Nouveau type de trac\u00E9 de l'axe Y simplotpanel.but.None = Aucun simplotpanel.but.Plotflight = Tracer le vol -simplotpanel.but.ttip.Removethisplot = Effacer le trac\u00E9 +simplotpanel.but.ttip.Deletethisplot = Effacer le trac\u00E9 simplotpanel.lbl.Axis = Axes: simplotpanel.lbl.Flightevents = Ev\u00E9nements du vol: ! Simulation plot panel diff --git a/core/resources/l10n/messages_it.properties b/core/resources/l10n/messages_it.properties index f99e43eb3..056aa8b6d 100644 --- a/core/resources/l10n/messages_it.properties +++ b/core/resources/l10n/messages_it.properties @@ -176,9 +176,9 @@ debuglogdlg.lbl.Stacktrace = traccia della memoria: ! Edit Motor configuration dialog -MotorConfigurationPanel.btn.removeMotor = Rimuovi il motore +MotorConfigurationPanel.btn.deleteMotor = Rimuovi il motore MotorConfigurationPanel.btn.selectMotor = Seleziona il motore -edtmotorconfdlg.but.Removeconfiguration = Rimuovi la configurazione +edtmotorconfdlg.but.Deleteconfiguration = Rimuovi la configurazione edtmotorconfdlg.but.Newconfiguration = Nuova configurazione MotorConfigurationPanel.lbl.motorMounts = Alloggiamenti motore edtmotorconfdlg.title.Editmotorconf = Modifica la configurazione del motore @@ -287,7 +287,7 @@ update.dlg.latestVersion = Stai usando l'ultima versione di OpenRocket, versione simedtdlg.but.runsimulation = Avvia simulazione simedtdlg.but.resettodefault = Riporta ai predefiniti simedtdlg.but.add = Aggiungi -simedtdlg.but.remove = Rimuovi +simedtdlg.but.delete = Rimuovi simedtdlg.title.Editsim = Modifica simulazione simedtdlg.lbl.Simname = Nome della simulazione: simedtdlg.tab.Launchcond = Condizioni di lancio @@ -463,7 +463,7 @@ customExpressionPanel.but.NewExpression = Nuova espressione customExpressionPanel.lbl.UpdateNote = Devi lanciare la simulazione prima che siano disponibili i dati per il disegno. customExpressionPanel.lbl.CalcNote = Le espressioni saranno calcolate nell'ordine proposto. customExpressionPanel.lbl.CustomExpressions = Espressioni personalizzate : -customExpression.Units.but.ttip.Remove = Rimuovi questa espressione +customExpression.Units.but.ttip.Delete = Rimuovi questa espressione customExpression.Units.but.ttip.Edit = Modifica questa espressione customExpression.Units.but.ttip.MoveUp = Sposta in s\u00f9 nell'ordine di calcolo delle espressioni customExpression.Units.but.ttip.MoveDown = Sposta in gi\u00f9 nell'ordine di calcolo delle espressioni @@ -531,7 +531,7 @@ simplotpanel.but.None = Nessuno simplotpanel.but.NewYaxisplottype = Nuovo asse Y simplotpanel.but.Plotflight = Grafico di volo simplotpanel.lbl.Axis = Assi: -simplotpanel.but.ttip.Removethisplot = Rimuovi questo grafico +simplotpanel.but.ttip.Deletethisplot = Rimuovi questo grafico simplotpanel.Desc = I dati verranno disegnati in ordine cronologico anche se l'asse X non rappresenta il tempo. simplotpanel.OptionPane.lbl1 = Sono permessi al massimo 15 grafici. simplotpanel.OptionPane.lbl2 = Non posso aggiungere il grafico @@ -839,7 +839,7 @@ MotorCfg.lbl.longA2 = Nuovi stadi possono essere aggiunti cliccando \"Nuovo stad MotorCfg.lbl.longB1 = Il disegno attuale ha MotorCfg.lbl.longB2 = stadi. MotorCfg.but.Selectmotor = Seleziona il motore -MotorCfg.but.Removemotor = Rimuovi il motore +MotorCfg.but.Deletemotor = Rimuovi il motore MotorCfg.lbl.motorLabel = Nessuno ! NoseConeConfig @@ -1535,10 +1535,10 @@ GeneralOptimizationDialog.btn.stop = Ferma l'ottimizzazione GeneralOptimizationDialog.lbl.paramsToOptimize = Parametri da ottimizzare: GeneralOptimizationDialog.btn.add = Aggiungi GeneralOptimizationDialog.btn.add.ttip = Aggiungi il parametro selezionato all'ottimizzazione -GeneralOptimizationDialog.btn.remove = Rimuovi -GeneralOptimizationDialog.btn.remove.ttip = Rimuovi il parametro selezionato dall'ottimizzazione -GeneralOptimizationDialog.btn.removeAll = Rimuovi tutti -GeneralOptimizationDialog.btn.removeAll.ttip = Rimuovi tutti i parametri dall'ottimizzazione +GeneralOptimizationDialog.btn.delete = Rimuovi +GeneralOptimizationDialog.btn.delete.ttip = Rimuovi il parametro selezionato dall'ottimizzazione +GeneralOptimizationDialog.btn.deleteAll = Rimuovi tutti +GeneralOptimizationDialog.btn.deleteAll.ttip = Rimuovi tutti i parametri dall'ottimizzazione GeneralOptimizationDialog.lbl.availableParams = Parametri disponibili: GeneralOptimizationDialog.lbl.optimizationOpts = Opzioni di ottimizzazione GeneralOptimizationDialog.lbl.optimizeSim = Ottimizza la simulazione: diff --git a/core/resources/l10n/messages_ja.properties b/core/resources/l10n/messages_ja.properties index 2417dd0c0..8c84cf48e 100644 --- a/core/resources/l10n/messages_ja.properties +++ b/core/resources/l10n/messages_ja.properties @@ -172,9 +172,9 @@ debuglogdlg.lbl.Stacktrace = Stack trace: MotorChooserDialog.title = \u30ED\u30B1\u30C3\u30C8\u30E2\u30FC\u30BF\u30FC\u306E\u9078\u629E ! Edit Motor configuration dialog -MotorConfigurationPanel.btn.removeMotor = \u30E2\u30FC\u30BF\u30FC\u306E\u524A\u9664 +MotorConfigurationPanel.btn.deleteMotor = \u30E2\u30FC\u30BF\u30FC\u306E\u524A\u9664 MotorConfigurationPanel.btn.selectMotor = \u30E2\u30FC\u30BF\u30FC\u306E\u9078\u629E -edtmotorconfdlg.but.Removeconfiguration = \u30B3\u30F3\u30D5\u30A3\u30AE\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u304B\u3089\u524A\u9664 +edtmotorconfdlg.but.Deleteconfiguration = \u30B3\u30F3\u30D5\u30A3\u30AE\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u304B\u3089\u524A\u9664 edtmotorconfdlg.but.Newconfiguration = \u65B0\u3057\u3044\u30E2\u30FC\u30BF\u30FC MotorConfigurationPanel.lbl.motorMounts = \u30E2\u30FC\u30BF\u30FC\u30DE\u30A6\u30F3\u30C8 edtmotorconfdlg.title.Editmotorconf = \u30E2\u30FC\u30BF\u30FC\u30B3\u30F3\u30D5\u30A3\u30AE\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u306E\u7DE8\u96C6 @@ -284,7 +284,7 @@ update.dlg.latestVersion = \u3053\u306EOpenRocket\u306F\u6700\u65B0\u7248\u3067\ simedtdlg.but.runsimulation = \u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u306E\u5B9F\u884C simedtdlg.but.resettodefault = \u30C7\u30D5\u30A9\u30EB\u30C8\u306B\u623B\u3059 simedtdlg.but.add = \u8FFD\u52A0 -simedtdlg.but.remove = \u524A\u9664 +simedtdlg.but.delete = \u524A\u9664 simedtdlg.title.Editsim = \u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u306E\u7DE8\u96C6 simedtdlg.lbl.Simname = \u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u306E\u540D\u524D\uFF1A simedtdlg.tab.Launchcond = \u30ED\u30FC\u30F3\u30C1\u30B3\u30F3\u30C7\u30A3\u30B7\u30E7\u30F3 @@ -472,7 +472,7 @@ customExpressionPanel.but.ttip.Import = .ork\u30D5\u30A1\u30A4\u30EB\u304B\u308 customExpressionPanel.lbl.UpdateNote = \u30B0\u30E9\u30D5\u3092\u5F97\u308B\u305F\u3081\u306B\u306F\u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u3092\u8A08\u7B97\u3055\u305B\u3066\u304A\u304B\u306A\u3044\u3068\u3044\u3051\u306A\u3044 customExpressionPanel.lbl.CalcNote = \u5F0F\u306F\u8868\u793A\u3055\u308C\u305F\u9806\u5E8F\u3067\u8A08\u7B97\u3055\u308C\u308B customExpressionPanel.lbl.CustomExpressions = \u30AB\u30B9\u30BF\u30E0\u5F0F -customExpression.Units.but.ttip.Remove = \u3053\u306E\u5F0F\u3092\u524A\u9664 +customExpression.Units.but.ttip.Delete = \u3053\u306E\u5F0F\u3092\u524A\u9664 customExpression.Units.but.ttip.Edit = \u3053\u306E\u5F0F\u3092\u7DE8\u96C6 customExpression.Units.but.ttip.MoveUp = \u5F0F\u3092\u4E0A\u306B\u79FB\u52D5 customExpression.Units.but.ttip.MoveDown = \u5F0F\u3092\u4E0B\u306B\u79FB\u52D5 @@ -556,7 +556,7 @@ simplotpanel.but.None = \u5168\u3066\u975E\u9078\u629E simplotpanel.but.NewYaxisplottype = Y\u8EF8\u8FFD\u52A0 simplotpanel.but.Plotflight = \u30D7\u30ED\u30C3\u30C8 simplotpanel.lbl.Axis = \u8EF8\uFF1A -simplotpanel.but.ttip.Removethisplot = \u3053\u306E\u30D7\u30ED\u30C3\u30C8\u3092\u524A\u9664 +simplotpanel.but.ttip.Deletethisplot = \u3053\u306E\u30D7\u30ED\u30C3\u30C8\u3092\u524A\u9664 simplotpanel.Desc = X\u8EF8\u304C\u6642\u9593\u3067\u306A\u3044\u6642\u306F\u30C7\u30FC\u30BF\u306F\u6642\u9593\u9806\u5E8F\u3067\u30D7\u30ED\u30C3\u30C8\u3055\u308C\u308B simplotpanel.OptionPane.lbl1 = Y\u8EF8\u306F15\u5909\u6570\u307E\u3067 simplotpanel.OptionPane.lbl2 = \u8FFD\u52A0\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u306A\u3044 @@ -869,7 +869,7 @@ MotorCfg.lbl.longA2 = \u30B9\u30C6\u30FC\u30B8\u306F\"\u65B0\u3057\u3044\u30B9\ MotorCfg.lbl.longB1 = \u73FE\u5728\u306E\u30C7\u30B6\u30A4\u30F3\u3067\u306F MotorCfg.lbl.longB2 = \u30B9\u30C6\u30FC\u30B8\u304C\u3042\u308B MotorCfg.but.Selectmotor = \u30E2\u30FC\u30BF\u30FC\u306E\u9078\u629E -MotorCfg.but.Removemotor = \u30E2\u30FC\u30BF\u30FC\u306E\u524A\u9664 +MotorCfg.but.Deletemotor = \u30E2\u30FC\u30BF\u30FC\u306E\u524A\u9664 MotorCfg.lbl.motorLabel = None ! NoseConeConfig @@ -1598,10 +1598,10 @@ GeneralOptimizationDialog.btn.stop = \u6700\u9069\u5316\u4E2D\u6B62 GeneralOptimizationDialog.lbl.paramsToOptimize = \u6700\u9069\u5316\u30D1\u30E9\u30E1\u30FC\u30BF\uFF1A GeneralOptimizationDialog.btn.add = \u8FFD\u52A0 GeneralOptimizationDialog.btn.add.ttip = \u6700\u9069\u5316\u306B\u9078\u629E\u3057\u305F\u30D1\u30E9\u30E1\u30FC\u30BF\u8FFD\u52A0 -GeneralOptimizationDialog.btn.remove = \u524A\u9664 -GeneralOptimizationDialog.btn.remove.ttip = \u6700\u9069\u5316\u304B\u3089\u9078\u629E\u3057\u305F\u30D1\u30E9\u30E1\u30FC\u30BF\u524A\u9664 -GeneralOptimizationDialog.btn.removeAll = \u5168\u3066\u524A\u9664 -GeneralOptimizationDialog.btn.removeAll.ttip = \u6700\u9069\u5316\u304B\u3089\u3059\u3079\u3066\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u524A\u9664 +GeneralOptimizationDialog.btn.delete = \u524A\u9664 +GeneralOptimizationDialog.btn.delete.ttip = \u6700\u9069\u5316\u304B\u3089\u9078\u629E\u3057\u305F\u30D1\u30E9\u30E1\u30FC\u30BF\u524A\u9664 +GeneralOptimizationDialog.btn.deleteAll = \u5168\u3066\u524A\u9664 +GeneralOptimizationDialog.btn.deleteAll.ttip = \u6700\u9069\u5316\u304B\u3089\u3059\u3079\u3066\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u524A\u9664 GeneralOptimizationDialog.lbl.availableParams = \u9078\u629E\u53EF\u80FD\u306A\u30D1\u30E9\u30E1\u30FC\u30BF\uFF1A GeneralOptimizationDialog.lbl.optimizationOpts = \u6700\u9069\u5316\u30AA\u30D7\u30B7\u30E7\u30F3 GeneralOptimizationDialog.lbl.optimizeSim = \u6700\u9069\u5316\u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3 diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties index b32a8d0a5..e86457754 100644 --- a/core/resources/l10n/messages_nl.properties +++ b/core/resources/l10n/messages_nl.properties @@ -178,7 +178,7 @@ MotorChooserDialog.title = Selecteer een raketmotor ! Edit Motor configuration dialog edtmotorconfdlg.col.configuration = Configuratie -edtmotorconfdlg.but.Removeconfiguration = Verwijder Configuratie +edtmotorconfdlg.but.Deleteconfiguration = Verwijder Configuratie edtmotorconfdlg.but.Renameconfiguration = Hernoem Configuratie edtmotorconfdlg.but.Newconfiguration = Nieuwe Configuratie edtmotorconfdlg.but.Duplicateconfiguration = Dupliceer Configuratie @@ -340,7 +340,7 @@ simedtdlg.but.runsimulation = Simulatie uitvoeren simedtdlg.but.resettodefault = Herstel naar standaard simedtdlg.but.savedefault = Sla op als standaard simedtdlg.but.add = Voeg toe -simedtdlg.but.remove = Verwijder +simedtdlg.but.delete = Verwijder simedtdlg.title.Editsim = Bewerk simulatie simedtdlg.lbl.Simname = Simulatienaam: simedtdlg.tab.Launchcond = Lanceeromstandigheden @@ -563,7 +563,7 @@ customExpressionPanel.but.ttip.Import = Importeer aangepaste uitdrukkingen uit e customExpressionPanel.lbl.UpdateNote = U moet de simulatie uitvoeren voordat er gegevens beschikbaar zijn om te plotten. customExpressionPanel.lbl.CalcNote = Uitdrukkingen worden berekend in de getoonde volgorde. customExpressionPanel.lbl.CustomExpressions = Aangepaste Uitdrukkingen -customExpression.Units.but.ttip.Remove = Verwijder deze uitdrukking +customExpression.Units.but.ttip.Delete = Verwijder deze uitdrukking customExpression.Units.but.ttip.Edit = Pas deze uitdrukking aan customExpression.Units.but.ttip.MoveUp = Verplaats uitdrukking omhoog in berekeningsvolgorde customExpression.Units.but.ttip.MoveDown = Verplaats uitdrukking omlaag in berekeningsvolgorde @@ -646,7 +646,7 @@ simplotpanel.but.All = Alles simplotpanel.but.None = Geen simplotpanel.but.NewYaxisplottype = Nieuw type plot op de Y-as simplotpanel.lbl.Axis = As: -simplotpanel.but.ttip.Removethisplot = Verwijder deze plot +simplotpanel.but.ttip.Deletethisplot = Verwijder deze plot simplotpanel.Desc = De gegevens worden in tijdsvolgorde uitgezet, zelfs als het type X-as niet tijd is. simplotpanel.OptionPane.lbl1 = Maximaal 15 plots zijn toegestaan. simplotpanel.OptionPane.lbl2 = Kan geen plot toevoegen @@ -1016,7 +1016,7 @@ MotorCfg.lbl.longA2 = Trappen kunnen toegevoegd worden door te klikken op \"Nieu MotorCfg.lbl.longB1 = Het huidige ontwerp heeft MotorCfg.lbl.longB2 = trap(pen). MotorCfg.but.Selectmotor = Selecteer motor -MotorCfg.but.Removemotor = Verwijder motor +MotorCfg.but.Deletemotor = Verwijder motor MotorCfg.lbl.motorLabel = Geen ! NoseConeConfig @@ -1852,10 +1852,10 @@ GeneralOptimizationDialog.btn.stop = Stop optimalisatie GeneralOptimizationDialog.lbl.paramsToOptimize = Parameters om te optimaliseren: GeneralOptimizationDialog.btn.add = Voeg toe GeneralOptimizationDialog.btn.add.ttip = Voeg de geslecteerde parameter toe aan de optimalisatie -GeneralOptimizationDialog.btn.remove = Verwijder -GeneralOptimizationDialog.btn.remove.ttip = Verwijder de geslecteerde parameter uit de optimalisatie -GeneralOptimizationDialog.btn.removeAll = Verwijder alles -GeneralOptimizationDialog.btn.removeAll.ttip = Verwijder alle parameters uit de optimalisatie +GeneralOptimizationDialog.btn.delete = Verwijder +GeneralOptimizationDialog.btn.delete.ttip = Verwijder de geslecteerde parameter uit de optimalisatie +GeneralOptimizationDialog.btn.deleteAll = Verwijder alles +GeneralOptimizationDialog.btn.deleteAll.ttip = Verwijder alle parameters uit de optimalisatie GeneralOptimizationDialog.lbl.availableParams = Beschikbare parameters: GeneralOptimizationDialog.lbl.optimizationOpts = Optimalisatie-opties GeneralOptimizationDialog.lbl.optimizeSim = Optimaliseer simulatie: @@ -2033,7 +2033,7 @@ EditDecalHelper.editPreferencesHelp = De gebruikte editor kan worden gewijzigd i MotorConfigurationPanel.lbl.motorMounts = Motorbevestigingen MotorConfigurationPanel.lbl.motorConfiguration = Motorconfiguraties -MotorConfigurationPanel.btn.removeMotor = Verwijder motor +MotorConfigurationPanel.btn.deleteMotor = Verwijder motor MotorConfigurationPanel.btn.selectMotor = Selecteer motor MotorConfigurationPanel.btn.selectIgnition = Selecteer ontsteking MotorConfigurationPanel.btn.resetIgnition = Herstel ontsteking diff --git a/core/resources/l10n/messages_pl.properties b/core/resources/l10n/messages_pl.properties index 08bcaec77..dd8c36c93 100644 --- a/core/resources/l10n/messages_pl.properties +++ b/core/resources/l10n/messages_pl.properties @@ -174,9 +174,9 @@ ! Edit Motor configuration dialog - MotorConfigurationPanel.btn.removeMotor = Usu\u0144 silnik + MotorConfigurationPanel.btn.deleteMotor = Usu\u0144 silnik MotorConfigurationPanel.btn.selectMotor = Wybierz silnik - edtmotorconfdlg.but.Removeconfiguration = Usu\u0144 konfiguracj\u0119 + edtmotorconfdlg.but.Deleteconfiguration = Usu\u0144 konfiguracj\u0119 edtmotorconfdlg.but.Newconfiguration = Nowa konfiguracja MotorConfigurationPanel.lbl.motorMounts = Gniazda silnikowe edtmotorconfdlg.title.Editmotorconf = Edytuj konfiguracje silnika @@ -285,7 +285,7 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s. simedtdlg.but.runsimulation = Przeprowad\u017A symulacj\u0119 simedtdlg.but.resettodefault = Przywró\u0107 domy\u015Blny simedtdlg.but.add = Dodaj - simedtdlg.but.remove = Usu\u0144 + simedtdlg.but.delete = Usu\u0144 simedtdlg.title.Editsim = Edytuj symulacj\u0119 simedtdlg.lbl.Simname = Nazwa symulacji: simedtdlg.tab.Launchcond = Warunki startowe @@ -474,7 +474,7 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s. simplotpanel.but.NewYaxisplottype = Nowy typ osi Y simplotpanel.but.Plotflight = Narysuj wykres lotu simplotpanel.lbl.Axis = O\u015B: - simplotpanel.but.ttip.Removethisplot = Usu\u0144 ten wykres + simplotpanel.but.ttip.Deletethisplot = Usu\u0144 ten wykres simplotpanel.Desc = Dane zostan\u0105 umieszczone na wykresie w porz\u0105dku chronologicznym, nawet je\u017Celi o\u015B X nie jest typu czasowego. simplotpanel.OptionPane.lbl1 = Maksymalna liczba wykresów to 15. simplotpanel.OptionPane.lbl2 = Nie mo\u017Cna doda\u0107 wykresu @@ -782,7 +782,7 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s. MotorCfg.lbl.longB1 = Obecny model ma MotorCfg.lbl.longB2 = stopnie. MotorCfg.but.Selectmotor = Wybierz silnik - MotorCfg.but.Removemotor = Usu\u0144 silnik + MotorCfg.but.Deletemotor = Usu\u0144 silnik MotorCfg.lbl.motorLabel = \u017Badne ! NoseConeConfig @@ -1477,10 +1477,10 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s. GeneralOptimizationDialog.lbl.paramsToOptimize = Parametry do optymalizacji: GeneralOptimizationDialog.btn.add = Dodaj GeneralOptimizationDialog.btn.add.ttip = Dodaj wybrany parametr do optymalizacji - GeneralOptimizationDialog.btn.remove = Usu\u0144 - GeneralOptimizationDialog.btn.remove.ttip = Usu\u0144 wybrany parametr z listy do optymalizacji - GeneralOptimizationDialog.btn.removeAll = Usu\u0144 wszystko - GeneralOptimizationDialog.btn.removeAll.ttip = Usu\u0144 wszystkie parametry z listy do optymalizacji + GeneralOptimizationDialog.btn.delete = Usu\u0144 + GeneralOptimizationDialog.btn.delete.ttip = Usu\u0144 wybrany parametr z listy do optymalizacji + GeneralOptimizationDialog.btn.deleteAll = Usu\u0144 wszystko + GeneralOptimizationDialog.btn.deleteAll.ttip = Usu\u0144 wszystkie parametry z listy do optymalizacji GeneralOptimizationDialog.lbl.availableParams = Dost\u0119pne parametry: GeneralOptimizationDialog.lbl.optimizationOpts = Opcje optymalizacji: GeneralOptimizationDialog.lbl.optimizeSim = Optymalizuj symulacj\u0119: diff --git a/core/resources/l10n/messages_pt.properties b/core/resources/l10n/messages_pt.properties index c40699812..cb8078cd8 100644 --- a/core/resources/l10n/messages_pt.properties +++ b/core/resources/l10n/messages_pt.properties @@ -368,10 +368,10 @@ GeneralOptimizationDialog.btn.close = Fechar GeneralOptimizationDialog.btn.close.ttip = Feche a caixa de di\u00e1logo sem modificar o projeto do foguete GeneralOptimizationDialog.btn.plotPath = Tra\u00e7ar caminho GeneralOptimizationDialog.btn.plotPath.ttip = Plotar o caminho de otimiza\u00e7\u00e3o (apenas para otimiza\u00e7\u00e3o de uma ou duas dimens\u00f5es) -GeneralOptimizationDialog.btn.remove = Remover -GeneralOptimizationDialog.btn.remove.ttip = Remova o par\u00e2metro selecionado da otimiza\u00e7\u00e3o -GeneralOptimizationDialog.btn.removeAll = Remover todos -GeneralOptimizationDialog.btn.removeAll.ttip = Remova todos os par\u00e2metros da otimiza\u00e7\u00e3o +GeneralOptimizationDialog.btn.delete = Remover +GeneralOptimizationDialog.btn.delete.ttip = Remova o par\u00e2metro selecionado da otimiza\u00e7\u00e3o +GeneralOptimizationDialog.btn.deleteAll = Remover todos +GeneralOptimizationDialog.btn.deleteAll.ttip = Remova todos os par\u00e2metros da otimiza\u00e7\u00e3o GeneralOptimizationDialog.btn.reset = Restaurar GeneralOptimizationDialog.btn.reset.ttip = Redefinir o projeto do foguete para o projeto do foguete atual GeneralOptimizationDialog.btn.save = Salvar destino @@ -523,7 +523,7 @@ MaximumVelocityParameter.name = Velocidade m\u00e1xima MotorCfg.but.FlightcfgEdit = Edit MotorCfg.but.New = Novo -MotorCfg.but.Removemotor = Remova o motor +MotorCfg.but.Deletemotor = Remova o motor MotorCfg.but.Selectmotor = Selecionar do motor # MotorConfig MotorCfg.checkbox.compmotormount = Este componente \u00e9 uma montagem do motor @@ -547,7 +547,7 @@ MotorCfgModel.Editcfg = Editar configura\u00e7\u00f5es MotorChooserDialog.title = Selecione um motor do foguete # Edit Motor configuration dialog -MotorConfigurationPanel.btn.removeMotor = Remover o motor +MotorConfigurationPanel.btn.deleteMotor = Remover o motor MotorConfigurationPanel.btn.resetIgnition = Reset ignition MotorConfigurationPanel.btn.selectIgnition = Select ignition MotorConfigurationPanel.btn.selectMotor = Selecionar motor @@ -1305,7 +1305,7 @@ customExpression.Units = Unidades customExpression.Units.but.ttip.Edit = Editar esta express\u00e3o customExpression.Units.but.ttip.MoveDown = Mova para baixo express\u00e3o na ordem de c\u00e1lculo customExpression.Units.but.ttip.MoveUp = Mova acima a express\u00e3o na ordem de c\u00e1lculo -customExpression.Units.but.ttip.Remove = Remover esta express\u00e3o +customExpression.Units.but.ttip.Delete = Remover esta express\u00e3o customExpressionPanel.but.Import = Importar # Custom expression panel @@ -1342,7 +1342,7 @@ dlg.but.ok = Ok edtmotorconfdlg.but.Duplicateconfiguration = Duplikat edtmotorconfdlg.but.Newconfiguration = Nova configura\u00e7\u00e3o -edtmotorconfdlg.but.Removeconfiguration = Remover configura\u00e7\u00e3o +edtmotorconfdlg.but.Deleteconfiguration = Remover configura\u00e7\u00e3o edtmotorconfdlg.but.Renameconfiguration = Renomear edtmotorconfdlg.but.Resetdeployment = Retornar o lan\u00e7amento edtmotorconfdlg.but.Resetseparation = Retornar a separa\u00e7\u00e3o @@ -1682,7 +1682,7 @@ simedtdlg.border.Simlist = Observa\u00e7\u00e3o da simula\u00 simedtdlg.border.Simopt = Op\u00e7\u00f5es do simulador simedtdlg.but.FlightcfgEdit = Edit simedtdlg.but.add = Adicionar -simedtdlg.but.remove = Remover +simedtdlg.but.delete = Remover simedtdlg.but.resettodefault = Restaurar padr\u00e3o # Simulation edit dialog simedtdlg.but.runsimulation = Executar a simula\u00e7\u00e3o @@ -1797,7 +1797,7 @@ simplotpanel.but.All = Todos simplotpanel.but.NewYaxisplottype = Novo tipo de plotagem para o eixo Y simplotpanel.but.None = Nenhum simplotpanel.but.Plotflight = Plotagem do voo -simplotpanel.but.ttip.Removethisplot = Remover esta plotagem +simplotpanel.but.ttip.Deletethisplot = Remover esta plotagem simplotpanel.lbl.Axis = Eixos: simplotpanel.lbl.Flightevents = Eventos de voo: # Simulation plot panel diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties index f7eeb8792..c13f204c6 100644 --- a/core/resources/l10n/messages_ru.properties +++ b/core/resources/l10n/messages_ru.properties @@ -190,7 +190,7 @@ MotorChooserDialog.title = \u0412\u044B\u0431\u043E\u0440 \u0440\u0430\u043A\u04 ! Edit Motor configuration dialog edtmotorconfdlg.col.configuration = \u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F -edtmotorconfdlg.but.Removeconfiguration = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E +edtmotorconfdlg.but.Deleteconfiguration = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E edtmotorconfdlg.but.Renameconfiguration = \u041F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u0442\u044C edtmotorconfdlg.but.Newconfiguration = \u041D\u043E\u0432\u0430\u044F \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F edtmotorconfdlg.but.Duplicateconfiguration = \u0414\u0443\u0431\u043B\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E @@ -375,7 +375,7 @@ simedtdlg.but.runsimulation = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u simedtdlg.but.resettodefault = \u0412\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E simedtdlg.but.savedefault = \u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E simedtdlg.but.add = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C -simedtdlg.but.remove = \u0423\u0434\u0430\u043B\u0438\u0442\u044C +simedtdlg.but.delete = \u0423\u0434\u0430\u043B\u0438\u0442\u044C simedtdlg.title.Editsim = \u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043A \u0440\u0430\u0441\u0447\u0435\u0442\u0430 simedtdlg.lbl.Simname = \u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0440\u0430\u0441\u0447\u0435\u0442\u0430: simedtdlg.tab.Launchcond = \u0423\u0441\u043B\u043E\u0432\u0438\u044F \u0437\u0430\u043F\u0443\u0441\u043A\u0430 @@ -607,7 +607,7 @@ customExpressionPanel.but.ttip.Import = \u0418\u043C\u043F\u043E\u0440\u0442\u04 customExpressionPanel.lbl.UpdateNote = \u0412\u0430\u043C \u043D\u0443\u0436\u043D\u043E \u0432\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0440\u0430\u0441\u0447\u0435\u0442, \u043F\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043C \u043F\u043E\u0441\u0442\u0440\u043E\u0435\u043D\u0438\u0435 \u0433\u0440\u0430\u0444\u0438\u043A\u043E\u0432 \u0441\u0442\u0430\u043D\u0435\u0442 \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u043E. customExpressionPanel.lbl.CalcNote = \u0412\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044F \u0431\u0443\u0434\u0443\u0442 \u0432\u044B\u0447\u0438\u0441\u043B\u0435\u043D\u044B \u0432 \u0442\u043E\u043C \u0436\u0435 \u043F\u043E\u0440\u044F\u0434\u043A\u0435, \u0432 \u043A\u0430\u043A\u043E\u043C \u043F\u043E\u043A\u0430\u0437\u0430\u043D\u044B. customExpressionPanel.lbl.CustomExpressions = \u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0435 \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044F -customExpression.Units.but.ttip.Remove = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u0442\u043E \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 +customExpression.Units.but.ttip.Delete = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u0442\u043E \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 customExpression.Units.but.ttip.Edit = \u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u044D\u0442\u043E \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 customExpression.Units.but.ttip.MoveUp = \u041F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0432\u0432\u0435\u0440\u0445 \u0432 \u043F\u043E\u0440\u044F\u0434\u043A\u0435 \u0432\u044B\u0447\u0438\u0441\u043B\u0435\u043D\u0438\u044F customExpression.Units.but.ttip.MoveDown = \u041F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0432\u043D\u0438\u0437 \u0432 \u043F\u043E\u0440\u044F\u0434\u043A\u0435 \u0432\u044B\u0447\u0438\u0441\u043B\u0435\u043D\u0438\u044F @@ -691,7 +691,7 @@ simplotpanel.but.All = \u0412\u0441\u0435 simplotpanel.but.None = \u041D\u0438 \u043E\u0434\u043D\u043E\u0433\u043E simplotpanel.but.NewYaxisplottype = \u041D\u043E\u0432\u044B\u0439 \u0442\u0438\u043F \u043E\u0441\u0438 Y \u0433\u0440\u0430\u0444\u0438\u043A\u0430 simplotpanel.lbl.Axis = \u041E\u0441\u044C: -simplotpanel.but.ttip.Removethisplot = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u0442\u043E\u0442 \u0433\u0440\u0430\u0444\u0438\u043A +simplotpanel.but.ttip.Deletethisplot = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u0442\u043E\u0442 \u0433\u0440\u0430\u0444\u0438\u043A simplotpanel.Desc = \u0414\u0430\u043D\u043D\u044B\u0435 \u0431\u0443\u0434\u0443\u0442 \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u044B \u0432\u043E \u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E\u043C \u043F\u043E\u0440\u044F\u0434\u043A\u0435, \u0434\u0430\u0436\u0435 \u0435\u0441\u043B\u0438 \u0442\u0438\u043F \u043E\u0441\u0438 X \u043D\u0435 \u0432\u0440\u0435\u043C\u044F. simplotpanel.OptionPane.lbl1 = \u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u043E\u0435 \u0447\u0438\u0441\u043B\u043E \u0433\u0440\u0430\u0444\u0438\u043A\u043E\u0432 - 15 simplotpanel.OptionPane.lbl2 = \u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0433\u0440\u0430\u0444\u0438\u043A @@ -1090,7 +1090,7 @@ MotorCfg.lbl.longA2 = \u0421\u0442\u0443\u043F\u0435\u043D\u0438 \u043C\u043E\u0 MotorCfg.lbl.longB1 = \u0412 \u0442\u0435\u043A\u0443\u0449\u0435\u0439 \u0441\u0445\u0435\u043C\u0435 MotorCfg.lbl.longB2 = \u0441\u0442\u0443\u043F\u0435\u043D\u0435\u0439. MotorCfg.but.Selectmotor = \u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044C -MotorCfg.but.Removemotor = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044C +MotorCfg.but.Deletemotor = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044C MotorCfg.lbl.motorLabel = \u041D\u0435\u0442 ! NoseConeConfig @@ -1960,10 +1960,10 @@ GeneralOptimizationDialog.btn.stop = \u041E\u0441\u0442\u0430\u043D\u043E\u0432\ GeneralOptimizationDialog.lbl.paramsToOptimize = \u041E\u043F\u0442\u0438\u043C\u0438\u0437\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B: GeneralOptimizationDialog.btn.add = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C GeneralOptimizationDialog.btn.add.ttip = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0432 \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0446\u0438\u044E -GeneralOptimizationDialog.btn.remove = \u0423\u0434\u0430\u043B\u0438\u0442\u044C -GeneralOptimizationDialog.btn.remove.ttip = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0438\u0437 \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0446\u0438\u0438 -GeneralOptimizationDialog.btn.removeAll = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u0441\u0435 -GeneralOptimizationDialog.btn.removeAll.ttip = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u0441\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0438\u0437 \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0446\u0438\u0438 +GeneralOptimizationDialog.btn.delete = \u0423\u0434\u0430\u043B\u0438\u0442\u044C +GeneralOptimizationDialog.btn.delete.ttip = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0438\u0437 \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0446\u0438\u0438 +GeneralOptimizationDialog.btn.deleteAll = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u0441\u0435 +GeneralOptimizationDialog.btn.deleteAll.ttip = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u0441\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0438\u0437 \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0446\u0438\u0438 GeneralOptimizationDialog.lbl.availableParams = \u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B: GeneralOptimizationDialog.lbl.optimizationOpts = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0446\u0438\u0438 GeneralOptimizationDialog.lbl.optimizeSim = \u041E\u043F\u0442\u0438\u043C\u0438\u0437\u0438\u0440\u0443\u0435\u043C\u044B\u0439 \u0440\u0430\u0441\u0447\u0435\u0442: @@ -2145,7 +2145,7 @@ EditDecalHelper.editPreferencesHelp = \u0413\u0440\u0430\u0444\u0438\u0447\u0435 MotorConfigurationPanel.lbl.motorMounts = \u041A\u0440\u0435\u043F\u043B\u0435\u043D\u0438\u044F \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u0435\u0439 MotorConfigurationPanel.lbl.motorConfiguration = \u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u0435\u0439 -MotorConfigurationPanel.btn.removeMotor = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044C +MotorConfigurationPanel.btn.deleteMotor = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044C MotorConfigurationPanel.btn.selectMotor = \u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044C MotorConfigurationPanel.btn.selectIgnition = \u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0437\u0430\u0436\u0438\u0433\u0430\u043D\u0438\u0435 MotorConfigurationPanel.btn.resetIgnition = \u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0437\u0430\u0436\u0438\u0433\u0430\u043D\u0438\u0435 diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties index 5d7147134..ad50ce5b8 100644 --- a/core/resources/l10n/messages_uk_UA.properties +++ b/core/resources/l10n/messages_uk_UA.properties @@ -180,7 +180,7 @@ MotorChooserDialog.title = Select a rocket motor ! Edit Motor configuration dialog edtmotorconfdlg.col.configuration = Configuration -edtmotorconfdlg.but.Removeconfiguration = Remove Configuration +edtmotorconfdlg.but.Deleteconfiguration = Delete Configuration edtmotorconfdlg.but.Renameconfiguration = Rename Configuration edtmotorconfdlg.but.Newconfiguration = New Configuration edtmotorconfdlg.but.Duplicateconfiguration = Duplicate Configuration @@ -324,7 +324,7 @@ simedtdlg.but.runsimulation = Run simulation simedtdlg.but.resettodefault = Reset to default simedtdlg.but.savedefault = Save as default simedtdlg.but.add = Add -simedtdlg.but.remove = Remove +simedtdlg.but.delete = Delete simedtdlg.title.Editsim = Edit simulation simedtdlg.lbl.Simname = Simulation name: simedtdlg.tab.Launchcond = Launch conditions @@ -520,7 +520,7 @@ customExpressionPanel.but.ttip.Import = Import custom expressions from another . customExpressionPanel.lbl.UpdateNote = You must run the simulation before data will be available for plotting. customExpressionPanel.lbl.CalcNote = Expressions will be calculated in the order shown. customExpressionPanel.lbl.CustomExpressions = Custom Expressions -customExpression.Units.but.ttip.Remove = Remove this expression +customExpression.Units.but.ttip.Delete = Delete this expression customExpression.Units.but.ttip.Edit = Edit this expression customExpression.Units.but.ttip.MoveUp = Move expression up in calculation order customExpression.Units.but.ttip.MoveDown = Move expression down in calculation order @@ -603,7 +603,7 @@ simplotpanel.but.All = All simplotpanel.but.None = None simplotpanel.but.NewYaxisplottype = New Y axis plot type simplotpanel.lbl.Axis = Axis: -simplotpanel.but.ttip.Removethisplot = Remove this plot +simplotpanel.but.ttip.Deletethisplot = Delete this plot simplotpanel.Desc = The data will be plotted in time order even if the X axis type is not time. simplotpanel.OptionPane.lbl1 = A maximum of 15 plots is allowed. simplotpanel.OptionPane.lbl2 = Cannot add plot @@ -878,7 +878,7 @@ FreeformFinSetCfg.lbl.Thickness = Thickness: FreeformFinSetConfig.lbl.doubleClick1 = Double-click FreeformFinSetConfig.lbl.doubleClick2 = to edit FreeformFinSetConfig.lbl.clickDrag = Click+drag: Add and move points -FreeformFinSetConfig.lbl.ctrlClick = Ctrl+click: Remove point +FreeformFinSetConfig.lbl.ctrlClick = Ctrl+click: Delete point FreeformFinSetConfig.lbl.scaleFin = Scale Fin @@ -942,7 +942,7 @@ MotorCfg.lbl.longA2 = Stages can be added by clicking \"New stage\". MotorCfg.lbl.longB1 = The current design has MotorCfg.lbl.longB2 = stages. MotorCfg.but.Selectmotor = Select motor -MotorCfg.but.Removemotor = Remove motor +MotorCfg.but.Deletemotor = Delete motor MotorCfg.lbl.motorLabel = None ! NoseConeConfig @@ -1697,10 +1697,10 @@ GeneralOptimizationDialog.btn.stop = Stop optimization GeneralOptimizationDialog.lbl.paramsToOptimize = Parameters to optimize: GeneralOptimizationDialog.btn.add = Add GeneralOptimizationDialog.btn.add.ttip = Add the selected parameter to the optimization -GeneralOptimizationDialog.btn.remove = Remove -GeneralOptimizationDialog.btn.remove.ttip = Remove the selected parameter from the optimization -GeneralOptimizationDialog.btn.removeAll = Remove all -GeneralOptimizationDialog.btn.removeAll.ttip = Remove all parameters from the optimization +GeneralOptimizationDialog.btn.delete = Delete +GeneralOptimizationDialog.btn.delete.ttip = Delete the selected parameter from the optimization +GeneralOptimizationDialog.btn.deleteAll = Delete all +GeneralOptimizationDialog.btn.deleteAll.ttip = Delete all parameters from the optimization GeneralOptimizationDialog.lbl.availableParams = Available parameters: GeneralOptimizationDialog.lbl.optimizationOpts = Optimization options GeneralOptimizationDialog.lbl.optimizeSim = Optimize simulation: @@ -1876,7 +1876,7 @@ EditDecalHelper.editPreferencesHelp = The editor used can be modified in the Pre MotorConfigurationPanel.lbl.motorMounts = Motor mounts MotorConfigurationPanel.lbl.motorConfiguration = Motor configurations -MotorConfigurationPanel.btn.removeMotor = Remove motor +MotorConfigurationPanel.btn.deleteMotor = Delete motor MotorConfigurationPanel.btn.selectMotor = Select motor MotorConfigurationPanel.btn.selectIgnition = Select ignition MotorConfigurationPanel.btn.resetIgnition = Reset ignition diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties index 9e9cfed05..5746a659d 100644 --- a/core/resources/l10n/messages_zh_CN.properties +++ b/core/resources/l10n/messages_zh_CN.properties @@ -405,10 +405,10 @@ GeneralOptimizationDialog.btn.close = \u5173\u95ED GeneralOptimizationDialog.btn.close.ttip = \u5173\u95ED\u7A97\u53E3\u4E0D\u6539\u53D8\u706B\u7BAD\u8BBE\u8BA1 GeneralOptimizationDialog.btn.plotPath = \u7ED8\u5236\u4F18\u5316\u8DEF\u5F84 GeneralOptimizationDialog.btn.plotPath.ttip = \u7ED8\u5236\u4F18\u5316\u8DEF\u5F84 (\u4EC5\u4F7F\u75281\u7EF4\u548C2\u7EF4\u4F18\u5316) -GeneralOptimizationDialog.btn.remove = \u79FB\u9664 -GeneralOptimizationDialog.btn.remove.ttip = \u79FB\u9664\u4F18\u5316\u5217\u8868\u4E2D\u7684\u53C2\u6570 -GeneralOptimizationDialog.btn.removeAll = \u79FB\u9664\u6240\u6709 -GeneralOptimizationDialog.btn.removeAll.ttip = \u79FB\u9664\u4F18\u5316\u5217\u8868\u4E2D\u7684\u6240\u6709\u53C2\u6570 +GeneralOptimizationDialog.btn.delete = \u79FB\u9664 +GeneralOptimizationDialog.btn.delete.ttip = \u79FB\u9664\u4F18\u5316\u5217\u8868\u4E2D\u7684\u53C2\u6570 +GeneralOptimizationDialog.btn.deleteAll = \u79FB\u9664\u6240\u6709 +GeneralOptimizationDialog.btn.deleteAll.ttip = \u79FB\u9664\u4F18\u5316\u5217\u8868\u4E2D\u7684\u6240\u6709\u53C2\u6570 GeneralOptimizationDialog.btn.reset = \u91CD\u7F6E GeneralOptimizationDialog.btn.reset.ttip = \u91CD\u7F6E\u706B\u7BAD\u8BBE\u8BA1\u4E3A\u5F53\u524D\u706B\u7BAD\u8BBE\u8BA1 GeneralOptimizationDialog.btn.save = \u4FDD\u5B58\u4F18\u5316\u8DEF\u5F84 @@ -569,7 +569,7 @@ MaximumVelocityParameter.name = \u6700\u5927\u901F\u5EA6 MotorCfg.but.FlightcfgEdit = \u7F16\u8F91 MotorCfg.but.New = \u65B0\u5EFA -MotorCfg.but.Removemotor = \u79FB\u9664\u53D1\u52A8\u673A +MotorCfg.but.Deletemotor = \u79FB\u9664\u53D1\u52A8\u673A MotorCfg.but.Selectmotor = \u9009\u62E9\u53D1\u52A8\u673A ! MotorConfig MotorCfg.checkbox.compmotormount = \u8BE5\u7EC4\u4EF6\u4E3A\u53D1\u52A8\u673A\u5EA7 @@ -588,7 +588,7 @@ MotorCfg.lbl.seconds = \u79D2 ! MotorChooserDialog MotorChooserDialog.title = \u9009\u62E9\u706B\u7BAD\u53D1\u52A8\u673A -MotorConfigurationPanel.btn.removeMotor = \u79FB\u9664\u53D1\u52A8\u673A +MotorConfigurationPanel.btn.deleteMotor = \u79FB\u9664\u53D1\u52A8\u673A MotorConfigurationPanel.btn.resetIgnition = \u91CD\u7F6E\u70B9\u706B MotorConfigurationPanel.btn.selectIgnition = \u9009\u62E9\u70B9\u706B MotorConfigurationPanel.btn.selectMotor = \u9009\u62E9\u53D1\u52A8\u673A @@ -1424,7 +1424,7 @@ customExpression.Units = \u5355\u4F4D customExpression.Units.but.ttip.Edit = \u7F16\u8F91\u8868\u8FBE\u5F0F customExpression.Units.but.ttip.MoveDown = \u5EF6\u540E\u8868\u8FBE\u5F0F\u8BA1\u7B97\u987A\u5E8F customExpression.Units.but.ttip.MoveUp = \u63D0\u524D\u8868\u8FBE\u5F0F\u8BA1\u7B97\u987A\u5E8F -customExpression.Units.but.ttip.Remove = \u79FB\u9664\u8868\u8FBE\u5F0F +customExpression.Units.but.ttip.Delete = \u79FB\u9664\u8868\u8FBE\u5F0F customExpressionPanel.but.Import = \u5BFC\u5165 ! Custom expression panel @@ -1461,7 +1461,7 @@ dlg.but.ok = OK edtmotorconfdlg.but.Copyconfiguration = \u590D\u5236 edtmotorconfdlg.but.Newconfiguration = \u65B0\u5EFA ! Edit Motor configuration dialog -edtmotorconfdlg.but.Removeconfiguration = \u79FB\u9664 +edtmotorconfdlg.but.Deleteconfiguration = \u79FB\u9664 edtmotorconfdlg.but.Renameconfiguration = \u91CD\u547D\u540D edtmotorconfdlg.but.Resetdeployment = \u91CD\u7F6E\u5230\u9ED8\u8BA4\u503C edtmotorconfdlg.but.Resetseparation = \u91CD\u7F6E\u5230\u9ED8\u8BA4\u503C @@ -1823,7 +1823,7 @@ simedtdlg.border.Launchrod = \u53D1\u5C04\u67B6 simedtdlg.border.SimExt = \u6A21\u62DF\u6269\u5C55 simedtdlg.border.Simopt = \u4EFF\u771F\u9009\u9879 simedtdlg.but.add = \u6DFB\u52A0 -simedtdlg.but.remove = \u79FB\u9664 +simedtdlg.but.delete = \u79FB\u9664 simedtdlg.but.resettodefault = \u6062\u590D\u9ED8\u8BA4 ! Simulation edit dialog simedtdlg.but.runsimulation = \u8FD0\u884C\u4EFF\u771F @@ -1944,7 +1944,7 @@ simplotpanel.RIGHT_NAME = \u53F3 simplotpanel.but.All = \u5168\u9009\u4E8B\u4EF6 simplotpanel.but.NewYaxisplottype = \u65B0\u5EFAY\u8F74\u7C7B\u522B simplotpanel.but.None = \u53D6\u6D88\u5168\u9009\u4E8B\u4EF6 -simplotpanel.but.ttip.Removethisplot = \u5220\u9664\u8BE5Y\u8F74\u7C7B\u522B +simplotpanel.but.ttip.Deletethisplot = \u5220\u9664\u8BE5Y\u8F74\u7C7B\u522B simplotpanel.lbl.Axis = \u8F74: simplotpanel.lbl.Flightevents = \u98DE\u884C\u4E8B\u4EF6: ! Simulation plot panel diff --git a/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java b/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java index a26222798..cf219dbda 100644 --- a/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java +++ b/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java @@ -236,7 +236,7 @@ public class CustomExpressionPanel extends JPanel { JButton deleteButton = new SelectColorButton(Icons.DELETE); //// Remove this expression - deleteButton.setToolTipText(trans.get("customExpression.Units.but.ttip.Remove")); + deleteButton.setToolTipText(trans.get("customExpression.Units.but.ttip.Delete")); deleteButton.setBorderPainted(false); deleteButton.addActionListener(new ActionListener() { @Override diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java index 2e37fb14d..42e337f57 100644 --- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java @@ -53,7 +53,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe private final JPopupMenu popupMenuConfig; private final AbstractAction newConfigAction; private final AbstractAction renameConfigAction; - private final AbstractAction removeConfigAction; + private final AbstractAction deleteConfigAction; private final AbstractAction duplicateConfigAction; private final static int MOTOR_TAB_INDEX = 0; @@ -72,11 +72,11 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe popupMenuConfig = new JPopupMenu(); newConfigAction = new NewConfigAction(); renameConfigAction = new RenameConfigAction(); - removeConfigAction = new RemoveConfigAction(); + deleteConfigAction = new DeleteConfigAction(); duplicateConfigAction = new DuplicateConfigAction(); popupMenuConfig.add(newConfigAction); popupMenuConfig.add(renameConfigAction); - popupMenuConfig.add(removeConfigAction); + popupMenuConfig.add(deleteConfigAction); popupMenuConfig.add(duplicateConfigAction); //// Tabs for advanced view. @@ -103,7 +103,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe this.add(renameConfButton,"gapright para"); //// Remove configuration - removeConfButton = new SelectColorButton(removeConfigAction); + removeConfButton = new SelectColorButton(deleteConfigAction); this.add(removeConfButton,"gapright para"); //// Duplicate configuration @@ -244,8 +244,8 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe return renameConfigAction; } - public AbstractAction getRemoveConfigAction() { - return removeConfigAction; + public AbstractAction getDeleteConfigAction() { + return deleteConfigAction; } public AbstractAction getDuplicateConfigAction() { @@ -345,9 +345,9 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe } } - private class RemoveConfigAction extends AbstractAction { - public RemoveConfigAction() { - putValue(NAME, trans.get("edtmotorconfdlg.but.Removeconfiguration")); + private class DeleteConfigAction extends AbstractAction { + public DeleteConfigAction() { + putValue(NAME, trans.get("edtmotorconfdlg.but.Deleteconfiguration")); } @Override diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java index f2e6a3f27..026ebee14 100644 --- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java @@ -53,7 +53,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel private static final String NONE = trans.get("edtmotorconfdlg.tbl.None"); - private final JButton selectMotorButton, removeMotorButton, selectIgnitionButton, resetIgnitionButton; + private final JButton selectMotorButton, deleteMotorButton, selectIgnitionButton, resetIgnitionButton; private final JPanel cards; private final static String HELP_LABEL = "help"; @@ -87,23 +87,23 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel // Get all the actions AbstractAction selectMotorAction = new SelectMotorAction(); - AbstractAction removeMotorAction = new RemoveMotorAction(); + AbstractAction deleteMotorAction = new DeleteMotorAction(); AbstractAction selectIgnitionAction = new SelectIgnitionAction(); AbstractAction resetIgnitionAction = new ResetIgnitionAction(); AbstractAction renameConfigAction = flightConfigurationPanel.getRenameConfigAction(); - AbstractAction removeConfigAction = flightConfigurationPanel.getRemoveConfigAction(); + AbstractAction deleteConfigAction = flightConfigurationPanel.getDeleteConfigAction(); AbstractAction duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction(); // Populate the popup menu popupMenuFull = new JPopupMenu(); popupMenuFull.add(selectMotorAction); - popupMenuFull.add(removeMotorAction); + popupMenuFull.add(deleteMotorAction); popupMenuFull.addSeparator(); popupMenuFull.add(selectIgnitionAction); popupMenuFull.add(resetIgnitionAction); popupMenuFull.addSeparator(); popupMenuFull.add(renameConfigAction); - popupMenuFull.add(removeConfigAction); + popupMenuFull.add(deleteConfigAction); popupMenuFull.add(duplicateConfigAction); JLabel helpText = new JLabel(trans.get("MotorConfigurationPanel.lbl.nomotors")); @@ -120,9 +120,9 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel selectMotorButton = new SelectColorButton(selectMotorAction); configurationPanel.add(selectMotorButton, "split, align right, sizegroup button"); - //// Remove motor button - removeMotorButton = new SelectColorButton(removeMotorAction); - configurationPanel.add(removeMotorButton, "sizegroup button"); + //// Delete motor button + deleteMotorButton = new SelectColorButton(deleteMotorAction); + configurationPanel.add(deleteMotorButton, "sizegroup button"); //// Select Ignition button selectIgnitionButton = new SelectColorButton(selectIgnitionAction); @@ -300,13 +300,13 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel boolean haveSelection = (null != getSelectedComponent()); selectMotorButton.setEnabled( haveSelection ); - removeMotorButton.setEnabled( haveSelection ); + deleteMotorButton.setEnabled( haveSelection ); selectIgnitionButton.setEnabled( haveSelection ); resetIgnitionButton.setEnabled( haveSelection ); } else { showEmptyText(); selectMotorButton.setEnabled(false); - removeMotorButton.setEnabled(false); + deleteMotorButton.setEnabled(false); selectIgnitionButton.setEnabled(false); resetIgnitionButton.setEnabled(false); } @@ -359,7 +359,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel } } - private void removeMotor() { + private void deleteMotor() { List mounts = getSelectedComponents(); List fcIds = getSelectedConfigurationIds(); if ((mounts == null) || (fcIds == null) || mounts.size() == 0 || fcIds.size() == 0) { @@ -463,14 +463,14 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel } } - private class RemoveMotorAction extends AbstractAction { - public RemoveMotorAction() { - putValue(NAME, trans.get("MotorConfigurationPanel.btn.removeMotor")); + private class DeleteMotorAction extends AbstractAction { + public DeleteMotorAction() { + putValue(NAME, trans.get("MotorConfigurationPanel.btn.deleteMotor")); } @Override public void actionPerformed(ActionEvent e) { - removeMotor(); + deleteMotor(); } } diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java index fb174692a..f34fb2a48 100644 --- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java @@ -50,7 +50,7 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel Date: Tue, 16 Aug 2022 23:20:40 +0200 Subject: [PATCH 2/2] Fix final remove dependencies --- .../dialogs/optimization/GeneralOptimizationDialog.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java index 755bab3d8..e28bf0ad9 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java @@ -278,8 +278,8 @@ public class GeneralOptimizationDialog extends JDialog { disableComponents.add(addButton); sub.add(addButton, "wrap para, sg button"); - removeButton = new SelectColorButton(" " + trans.get("btn.remove") + " " + Chars.RIGHT_ARROW); - removeButton.setToolTipText(trans.get("btn.remove.ttip")); + removeButton = new SelectColorButton(" " + trans.get("btn.delete") + " " + Chars.RIGHT_ARROW); + removeButton.setToolTipText(trans.get("btn.delete.ttip")); removeButton.addActionListener(e -> { SimulationModifier mod = getSelectedModifier(); if (mod == null) { @@ -297,8 +297,8 @@ public class GeneralOptimizationDialog extends JDialog { disableComponents.add(removeButton); sub.add(removeButton, "wrap para*2, sg button"); - removeAllButton = new SelectColorButton(trans.get("btn.removeAll")); - removeAllButton.setToolTipText(trans.get("btn.removeAll.ttip")); + removeAllButton = new SelectColorButton(trans.get("btn.deleteAll")); + removeAllButton.setToolTipText(trans.get("btn.deleteAll.ttip")); removeAllButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) {