summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src
diff options
context:
space:
mode:
authorStephan Schwär2020-12-16 09:53:02 +0100
committerStephan Schwär2020-12-16 09:53:02 +0100
commit4317666c0704e622bd78e9b3f646ee14ded1f845 (patch)
tree66e6832d926a5615113697069d7efe2e8b39c11e /dozentenmodul/src
parentMerge remote-tracking branch 'origin/feature/docker-integration-new' into fea... (diff)
downloadtutor-module-4317666c0704e622bd78e9b3f646ee14ded1f845.tar.gz
tutor-module-4317666c0704e622bd78e9b3f646ee14ded1f845.tar.xz
tutor-module-4317666c0704e622bd78e9b3f646ee14ded1f845.zip
[client] I18n of current docker integration state
- German and english translations for the current state of the docker intergration.
Diffstat (limited to 'dozentenmodul/src')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java7
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java6
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java10
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java2
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java32
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java11
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java2
-rw-r--r--dozentenmodul/src/main/properties/i18n/configurator.properties7
-rw-r--r--dozentenmodul/src/main/properties/i18n/configurator_de_DE.properties7
-rw-r--r--dozentenmodul/src/main/properties/i18n/page.properties7
-rw-r--r--dozentenmodul/src/main/properties/i18n/page_de_DE.properties7
-rw-r--r--dozentenmodul/src/main/properties/i18n/page_layout.properties13
-rw-r--r--dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties13
-rw-r--r--dozentenmodul/src/main/properties/i18n/window.properties3
-rw-r--r--dozentenmodul/src/main/properties/i18n/window_de_DE.properties3
-rw-r--r--dozentenmodul/src/main/properties/i18n/window_layout.properties2
-rw-r--r--dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties2
-rw-r--r--dozentenmodul/src/main/properties/i18n/wizard.properties1
-rw-r--r--dozentenmodul/src/main/properties/i18n/wizard_de_DE.properties1
19 files changed, 101 insertions, 35 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java
index 302f43c1..d7e73e3d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java
@@ -7,6 +7,7 @@ import org.openslx.dozmod.gui.control.QLabel;
import org.openslx.dozmod.gui.control.table.ContainerBindMountTable;
import org.openslx.dozmod.gui.control.table.QScrollPane;
import org.openslx.dozmod.gui.helper.GridManager;
+import org.openslx.dozmod.gui.helper.I18n;
import org.openslx.dozmod.gui.window.ContainerBindMountWindow;
import org.openslx.dozmod.model.ContainerBindMount;
@@ -27,7 +28,7 @@ public class ContainerBindMountConfigurator extends JPanel
super();
GridManager grid = new GridManager(this, 3, false);
- QLabel lblBindMount = new QLabel("Bind Mount Configuration");
+ QLabel lblBindMount = new QLabel(I18n.CONFIGURATOR.getString("ContainerBindMount.BindMount.text"));
bindMountTable = new ContainerBindMountTable();
QScrollPane scrollPaneTable = new QScrollPane(bindMountTable);
scrollPaneTable.setMinimumSize(Gui.getScaledDimension(0, 70));
@@ -41,8 +42,8 @@ public class ContainerBindMountConfigurator extends JPanel
buttonPanel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
- JButton btnAddBindMount = new JButton("Add Bind Mount");
- JButton btnDelBindMount = new JButton("Remove Bind Mount");
+ JButton btnAddBindMount = new JButton(I18n.CONFIGURATOR.getString("ContainerBindMount.Button.AddBindMount.text"));
+ JButton btnDelBindMount = new JButton(I18n.CONFIGURATOR.getString("ContainerBindMount.Button.DeleteBindMount.text"));
// add glue box to move Buttons to the right border.
buttonPanel.add(Box.createGlue());
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index d6019fea..10cedbec 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -955,11 +955,11 @@ import java.util.*;
bindMountConfigurator.setData(containerMeta.getBindMountConfig(), true);
changeMonitor.add(txtContainerRecipe).
- addConstraint(new TextNotEmptyConstraint("Empty Dockerfile not allowed!"));
+ addConstraint(new TextNotEmptyConstraint(I18n.WINDOW.getString("ImageDetails.Constraint.NoEmptyDockerfile.text")));
changeMonitor.add(txtContainerImageName)
- .addConstraint(new TextNotEmptyConstraint("Empty Name not allowed!"));
+ .addConstraint(new TextNotEmptyConstraint(I18n.WINDOW.getString("ImageDetails.Constraint.NoEmptyName.text")));
changeMonitor.add(txtContainerRun)
- .addConstraint(new TextNotEmptyConstraint("No Container Run Options provided!"));
+ .addConstraint(new TextNotEmptyConstraint(I18n.WINDOW.getString("ImageDetails.Constraint.NoEmptyRunOptions.text")));
changeMonitor.add(bindMountConfigurator);
}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
index 73425880..af73d32f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
@@ -42,9 +42,9 @@ import java.awt.*;
private static final int ICON_SIZE_Y = 24;
- private final String TAB_OVERVIEW_TITEL = "Übersicht";
- private final String TAB_VERSIONS_TITEL = "VM-Versionen";
- private final String TAB_PERMISSIONS_TITEL = "Berechtigungen";
+ private final String TAB_OVERVIEW_TITEL = I18n.WINDOW_LAYOUT.getString("ImageDetails.Tab.overview.title");
+ private final String TAB_VERSIONS_TITEL = I18n.WINDOW_LAYOUT.getString("ImageDetails.Tab.versions.title");
+ private final String TAB_PERMISSIONS_TITEL = I18n.WINDOW_LAYOUT.getString("ImageDetails.Tab.permissions.title");
protected final JTextField txtTitle;
protected final JEditorPane txtDescription;
@@ -355,13 +355,13 @@ import java.awt.*;
JPanel pnlContainerMeta = new JPanel();
GridManager grdContainerMeta = new GridManager(pnlContainerMeta, 3);
- grdContainerMeta.add(new QLabel("Image Name"));
+ grdContainerMeta.add(new QLabel(I18n.WINDOW_LAYOUT.getString("ImageDetails.Label.ImageName.text")));
txtContainerImageName = new JTextField();
txtContainerImageName.setDocument(txtTitle.getDocument());
grdContainerMeta.add(txtContainerImageName, 2).fill(true, false).expand(true, false);
grdContainerMeta.nextRow();
- grdContainerMeta.add(new QLabel("Container Run Options"));
+ grdContainerMeta.add(new QLabel(I18n.WINDOW_LAYOUT.getString("ImageDetails.Label.ContainerRunOptions.text")));
txtContainerRun = new JTextField();
grdContainerMeta.add(txtContainerRun, 2).fill(true, false).expand(true, false);
grdContainerMeta.nextRow();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
index 71a70b0e..cccabe00 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
@@ -122,7 +122,7 @@ import java.util.List;
ThriftError.showMessage(this, LOGGER, e.exception, e.displayMessage);
// return false;
} catch (IOException e) {
- Gui.showMessageBox(this, "Upload-Initialisierung fehlgeschlagen", MessageType.ERROR, LOGGER,
+ Gui.showMessageBox(this, I18n.WIZARD.getString("ImageCreation.Message.error.UploadInitializationFailure"), MessageType.ERROR, LOGGER,
e);
// return false;
}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java
index 291bc7fa..7d873264 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java
@@ -2,6 +2,7 @@ package org.openslx.dozmod.gui.wizard.layout;
import org.openslx.dozmod.gui.control.QLabel;
import org.openslx.dozmod.gui.helper.GridManager;
+import org.openslx.dozmod.gui.helper.I18n;
import org.openslx.dozmod.gui.wizard.Wizard;
import org.openslx.dozmod.gui.wizard.WizardPage;
import org.openslx.dozmod.model.ContainerBuildContextMethod;
@@ -32,17 +33,17 @@ public class ContainerUploadPageLayout extends WizardPage {
*/
public ContainerUploadPageLayout(Wizard wizard) {
- super(wizard, "Define a new Container Image");
- setDescription("Please provide an Input for a Docker Image");
+ super(wizard, I18n.PAGE_LAYOUT.getString("ContainerUploadPage.title"));
+ setDescription(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.description"));
GridManager grid = new GridManager(this, 3, false);
JPanel p1 = new JPanel();
p1.setVisible(true);
GridManager g1 = new GridManager(p1, 3, true, new Insets(5, 0, 5, 0));
- QLabel imageFileCaption = new QLabel("Docker File");
+ QLabel imageFileCaption = new QLabel(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.DockerFile.label"));
txtImageFile = new JTextField();
txtImageFile.setEditable(false);
- btnBrowseForImage = new JButton("Durchsuchen");
+ btnBrowseForImage = new JButton(I18n.PAGE_LAYOUT.getString("ImageUpload.Button.browseForImage.text"));
btnBrowseForImage.setMnemonic(KeyEvent.VK_B);
g1.add(imageFileCaption);
g1.add(txtImageFile).fill(true, false).expand(true, false);
@@ -52,12 +53,12 @@ public class ContainerUploadPageLayout extends WizardPage {
JPanel p2 = new JPanel();
p2.setVisible(false);
GridManager g2 = new GridManager(p2, 2, true, new Insets(5, 0, 5, 0));
- QLabel lblGitRepo = new QLabel("Git Repository");
- lblGitRepo.setToolTipText(
- "Set clone address of Git Repository [git@ | http://] [.git]. Currently no Checks!");
+ QLabel lblGitRepo = new QLabel(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.GitRepository.label"));
+ lblGitRepo.setToolTipText(I18n.PAGE_LAYOUT.getString(
+ "ContainerUploadPage.GitRepository.toolTipText"));
txtGitRepo = new JTextField();
- txtGitRepo.setToolTipText(
- "Set clone address of Git Repository [git@ | http://] [.git]. Currently no Checks!");
+ txtGitRepo.setToolTipText(I18n.PAGE_LAYOUT.getString(
+ "ContainerUploadPage.GitRepository.toolTipText"));
g2.add(lblGitRepo);
g2.add(txtGitRepo).fill(true, false).expand(true, false);
g2.finish(false);
@@ -72,21 +73,22 @@ public class ContainerUploadPageLayout extends WizardPage {
// Start as with Dockerfile as input!
tpInput.setSelectedIndex(0);
- lblImageName = new QLabel("Name");
+ lblImageName = new QLabel(I18n.PAGE_LAYOUT.getString(
+ "ContainerUploadPage.ImageName.text"));
txtImageName = new JTextField();
grid.add(lblImageName);
grid.add(txtImageName, 2, 1).fill(true, false).expand(true, false);
grid.nextRow();
// -- Software license changed - shown only in UploadWizard --
- chkLicenseRestricted = new JCheckBox("enthält lizenzpflichtige Software");
+ chkLicenseRestricted = new JCheckBox(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.CheckBox.ContainsLicenseRestricted.text"));
chkLicenseRestricted.setVisible(false);
grid.skip();
grid.add(chkLicenseRestricted, 2, 1).fill(false, false).expand(true, false);
grid.nextRow();
- lblContainerRun = new QLabel("Container Start Optionen");
- lblContainerRun.setToolTipText("Geben Sie die Container Run Optionen an (Port, Name, Env,...)");
+ lblContainerRun = new QLabel(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.ContainerStartOptions.label"));
+ lblContainerRun.setToolTipText(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.ContainerStartOptions.tooltip"));
txtContainerRun = new JTextField();
grid.add(lblContainerRun);
grid.add(txtContainerRun, 2, 1).fill(true, false).expand(true, false);
@@ -94,13 +96,13 @@ public class ContainerUploadPageLayout extends WizardPage {
grid.add(Box.createVerticalGlue(), 3).expand(true, true);
txtInfoText = new JTextArea();
- txtInfoText.setBorder(BorderFactory.createTitledBorder("Hinweis"));
+ txtInfoText.setBorder(BorderFactory.createTitledBorder(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.Infobox.label")));
txtInfoText.setLineWrap(true);
txtInfoText.setWrapStyleWord(true);
txtInfoText.setEditable(false);
txtInfoText.setFocusable(false);
txtInfoText.setOpaque(false);
- txtInfoText.setText("In dieser Maske sind alle Infromationen zur Definition eines Container Images anzugeben. ");
+ txtInfoText.setText(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.Infobox.text"));
grid.add(txtInfoText, 3).fill(true, false).expand(true, false);
grid.nextRow();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
index fb5a8b86..f784d844 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
@@ -4,6 +4,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
import org.openslx.dozmod.Config;
+import org.openslx.dozmod.gui.helper.I18n;
import org.openslx.dozmod.gui.helper.QFileChooser;
import org.openslx.dozmod.gui.helper.TextChangeListener;
import org.openslx.dozmod.gui.wizard.Wizard;
@@ -179,7 +180,7 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
private void reactOnUserInput() {
boolean completed = checkUserInput();
if (completed)
- setDescription("Container definition finished");
+ setDescription(I18n.PAGE.getString("ContainerUploadPage.Description.ContainerDefFinished"));
setPageComplete(completed);
}
@@ -189,25 +190,25 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
switch (method) {
case FILE:
if (txtImageFile.getText() == null || txtImageFile.getText().isEmpty()) {
- setWarningMessage("No Container Recipe provided!");
+ setWarningMessage(I18n.PAGE.getString("ContainerUploadPage.Warning.NoReceipt"));
return false;
}
break;
case GIT_REPOSITORY:
if (txtGitRepo.getText() == null || txtGitRepo.getText().isEmpty()) {
- setWarningMessage("No Git Repository provided!");
+ setWarningMessage(I18n.PAGE.getString("ContainerUploadPage.Warning.NoGitRepository"));
return false;
}
break;
}
if (txtImageName.getText() == null || txtImageName.getText().isEmpty()) {
- setWarningMessage("Set proper Image Name");
+ setWarningMessage(I18n.PAGE.getString("ContainerUploadPage.Warning.NoProperName"));
return false;
}
if (txtContainerRun.getText() == null || txtContainerRun.getText().isEmpty()) {
- setWarningMessage("set container run options");
+ setWarningMessage(I18n.PAGE.getString("ContainerUploadPage.Warning.NoRunOptions"));
return false;
}
return true;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index 306359e8..68beb655 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -146,7 +146,7 @@ import java.util.List;
} else {
txtDescription.setContentType("text/html");
txtDescription.setText(tmp);
- btnWysiwyg.setText("Html");
+ btnWysiwyg.setText("HTML");
btnBold.setEnabled(true);
btnUnderline.setEnabled(true);
diff --git a/dozentenmodul/src/main/properties/i18n/configurator.properties b/dozentenmodul/src/main/properties/i18n/configurator.properties
index 109a7ad5..f96b2558 100644
--- a/dozentenmodul/src/main/properties/i18n/configurator.properties
+++ b/dozentenmodul/src/main/properties/i18n/configurator.properties
@@ -123,4 +123,9 @@ Startup.ScriptVisibility.hidden=Hidden
# SoundState
Startup.SoundState.default=Default of the pool
Startup.SoundState.muted=Mute
-Startup.SoundState.unmuted=Unmute \ No newline at end of file
+Startup.SoundState.unmuted=Unmute
+
+# ContainerBindMountConfigurator
+ContainerBindMount.BindMount.text=Bind Mount Configuration
+ContainerBindMount.Button.AddBindMount.text=Add Bind Mount
+ContainerBindMount.Button.DeleteBindMount.text=Remove Bind Mount \ No newline at end of file
diff --git a/dozentenmodul/src/main/properties/i18n/configurator_de_DE.properties b/dozentenmodul/src/main/properties/i18n/configurator_de_DE.properties
index 187345f9..1a39a3e3 100644
--- a/dozentenmodul/src/main/properties/i18n/configurator_de_DE.properties
+++ b/dozentenmodul/src/main/properties/i18n/configurator_de_DE.properties
@@ -123,4 +123,9 @@ Startup.ScriptVisibility.hidden=Versteckt
# SoundState
Startup.SoundState.default=Vorgabe des Pools
Startup.SoundState.muted=Stummschalten
-Startup.SoundState.unmuted=Aktivieren \ No newline at end of file
+Startup.SoundState.unmuted=Aktivieren
+
+# ContainerBindMountConfigurator
+ContainerBindMount.BindMount.text=Bind Mount Configuration
+ContainerBindMount.Button.AddBindMount.text=Bind Mount hinzufügen
+ContainerBindMount.Button.DeleteBindMount.text=Bind Mount entfernen \ No newline at end of file
diff --git a/dozentenmodul/src/main/properties/i18n/page.properties b/dozentenmodul/src/main/properties/i18n/page.properties
index bb545488..205480cc 100644
--- a/dozentenmodul/src/main/properties/i18n/page.properties
+++ b/dozentenmodul/src/main/properties/i18n/page.properties
@@ -59,6 +59,13 @@ ImageOvfConversion.Dialog.RemoveTmpDirectory=A directory has been created for th
Should it be deleted including all contained files?
ImageOvfConversion.Dialog.RemoveTmpDirectory.title=Delete temporary directory?
+# ContainerUploadPage
+ContainerUploadPage.Description.ContainerDefFinished=Container definition finished
+ContainerUploadPage.Warning.NoReceipt=No Container Recipe provided!
+ContainerUploadPage.Warning.NoGitRepository=No Git Repository provided!
+ContainerUploadPage.Warning.NoProperName=Set proper Image Name
+ContainerUploadPage.Warning.NoRunOptions=Set container run options
+
# ImageUploadSummaryPage
ImageUploadSummary.UploadInitState.requesting=The upload process is negotiated with the server...
ImageUploadSummary.UploadInitState.waitingForSlot=The server is currently overloaded, because too many uploads are \
diff --git a/dozentenmodul/src/main/properties/i18n/page_de_DE.properties b/dozentenmodul/src/main/properties/i18n/page_de_DE.properties
index 1a5cf4aa..5d6e7ce1 100644
--- a/dozentenmodul/src/main/properties/i18n/page_de_DE.properties
+++ b/dozentenmodul/src/main/properties/i18n/page_de_DE.properties
@@ -55,6 +55,13 @@ ImageOvfConversion.Dialog.RemoveTmpDirectory=Für die abgebrochene Konvertierung
Soll dieses und dessen Inhalt wieder entfernt werden?
ImageOvfConversion.Dialog.RemoveTmpDirectory.title=Temporäres Verzeichnis löschen?
+# ContainerUploadPage
+ContainerUploadPage.Description.ContainerDefFinished=Container Definition vollständig
+ContainerUploadPage.Warning.NoReceipt=Keine Containeranweisungen angegeben!
+ContainerUploadPage.Warning.NoGitRepository=Kein Git Repository angegeben!
+ContainerUploadPage.Warning.NoProperName=Bitte Imagenamen setzen
+ContainerUploadPage.Warning.NoRunOptions=Bitte Container Start Optionen setzen
+
# ImageUploadSummaryPage
ImageUploadSummary.UploadInitState.requesting=Der Upload-Vorgang wird mit dem Server ausgehandelt...
ImageUploadSummary.UploadInitState.waitingForSlot=Der Server ist zur Zeit überlastet, da zu viele Uploads gleichzeitig \
diff --git a/dozentenmodul/src/main/properties/i18n/page_layout.properties b/dozentenmodul/src/main/properties/i18n/page_layout.properties
index cd8a76b4..ab5f74bd 100644
--- a/dozentenmodul/src/main/properties/i18n/page_layout.properties
+++ b/dozentenmodul/src/main/properties/i18n/page_layout.properties
@@ -46,6 +46,19 @@ ImageOvfConversion.Toolpath.defaultpath.text=Default path
ImageOvfConversion.Toolpath.BrowseButton.text=Select executable
ImageOvfConversion.Button.StartConversion.text=Start conversion
+# ContainerUploadPageLayout
+ContainerUploadPage.title=Define a new Container Image
+ContainerUploadPage.description=Please provide an Input for a Docker Image
+ContainerUploadPage.DockerFile.label=Docker File
+ContainerUploadPage.GitRepository.label=Git Repository
+ContainerUploadPage.GitRepository.toolTipText=Set clone address of Git Repository [git@ | http://] [.git]. Currently no Checks!
+ContainerUploadPage.ImageName.text=Name
+ContainerUploadPage.CheckBox.ContainsLicenseRestricted.text=Contains license restricted software
+ContainerUploadPage.ContainerStartOptions.label=Container Start Options
+ContainerUploadPage.ContainerStartOptions.tooltip=Please provide the Container Run Options (Port, Name, Env,...)
+ContainerUploadPage.Infobox.label=Information
+ContainerUploadPage.Infobox.text=Please provide all the information needed to define a container image.
+
# ImageUploadSummaryPageLayout
ImageUploadSummary.WizardPage.title=Done!
ImageUploadSummary.WizardPage.description=Wizard completed
diff --git a/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties b/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties
index 541715f9..170436b8 100644
--- a/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties
+++ b/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties
@@ -45,6 +45,19 @@ ImageOvfConversion.Toolpath.defaultpath.text=Standardpfad
ImageOvfConversion.Toolpath.BrowseButton.text=Durchsuchen
ImageOvfConversion.Button.StartConversion.text=Konvertierung starten
+# ContainerUploadPageLayout
+ContainerUploadPage.title=Neues Container Image definieren
+ContainerUploadPage.description=Bitte geben Sie Daten für das Docker Image an
+ContainerUploadPage.DockerFile.label=Docker File
+ContainerUploadPage.GitRepository.label=Git Repository
+ContainerUploadPage.GitRepository.toolTipText=Clone Addresse des Git Repositories setzen. [git@ | http://] [.git]. Momentan noch keine Checks!
+ContainerUploadPage.ImageName.text=Name
+ContainerUploadPage.CheckBox.ContainsLicenseRestricted.text=Enthält lizenzpflichtige Software
+ContainerUploadPage.ContainerStartOptions.label=Container Start Optionen
+ContainerUploadPage.ContainerStartOptions.tooltip=Bitte die Container Start Optionen angeben (Port, Name, Env,...)
+ContainerUploadPage.Infobox.label=Hinweis
+ContainerUploadPage.Infobox.text=In dieser Maske sind alle Infromationen zur Definition eines Container Images anzugeben.
+
# ImageUploadSummaryPageLayout
ImageUploadSummary.WizardPage.title=Fertig!
ImageUploadSummary.WizardPage.description=Assistent abgeschlossen
diff --git a/dozentenmodul/src/main/properties/i18n/window.properties b/dozentenmodul/src/main/properties/i18n/window.properties
index ed908af3..924e37fd 100644
--- a/dozentenmodul/src/main/properties/i18n/window.properties
+++ b/dozentenmodul/src/main/properties/i18n/window.properties
@@ -53,6 +53,9 @@ ImageDetails.Message.error.performImageDownload=Selected version is invalid
ImageDetails.Message.error.extendVersionExpiry=Could not extend expiry date of version {0}.
ImageDetails.Message.info.extendVersionExpiry=Successfully extended images: {0}
ImageDetails.Message.yesNo.safeClose=Changes will be discarded, do you really want to close?
+ImageDetails.Constraint.NoEmptyDockerfile.text=Empty Dockerfile not allowed!
+ImageDetails.Constraint.NoEmptyName.text=Empty Name not allowed!
+ImageDetails.Constraint.NoEmptyRunOptions.text=No Container Run Options provided!
# ImageListWindow
ImageList.MenuItem.newLecture.text=New lecture
diff --git a/dozentenmodul/src/main/properties/i18n/window_de_DE.properties b/dozentenmodul/src/main/properties/i18n/window_de_DE.properties
index 96c7efb1..181c140e 100644
--- a/dozentenmodul/src/main/properties/i18n/window_de_DE.properties
+++ b/dozentenmodul/src/main/properties/i18n/window_de_DE.properties
@@ -53,6 +53,9 @@ ImageDetails.Message.error.performImageDownload=Ausgewählte Version ist ungült
ImageDetails.Message.error.extendVersionExpiry=Konnte Ablaufdatum der Version {0} nicht verlängern.
ImageDetails.Message.info.extendVersionExpiry=Erfolgreich verlängerte Abbilder: {0}
ImageDetails.Message.yesNo.safeClose=Änderungen werden verworfen, wollen Sie wirklich schließen?
+ImageDetails.Constraint.NoEmptyDockerfile.text=Es muss ein Dockerfile angegeben werden!
+ImageDetails.Constraint.NoEmptyName.text=Es muss ein Name angegeben werden!
+ImageDetails.Constraint.NoEmptyRunOptions.text=Keine Container Start Optionen angegeben!
# ImageListWindow
ImageList.MenuItem.newLecture.text=Neue Veranstaltung
diff --git a/dozentenmodul/src/main/properties/i18n/window_layout.properties b/dozentenmodul/src/main/properties/i18n/window_layout.properties
index a3fcfcad..6590cd00 100644
--- a/dozentenmodul/src/main/properties/i18n/window_layout.properties
+++ b/dozentenmodul/src/main/properties/i18n/window_layout.properties
@@ -69,6 +69,8 @@ ImageDetails.Button.close.text=Close
ImageDetails.Tab.overview.title=Overview
ImageDetails.Tab.versions.title=VM-Versions
ImageDetails.Tab.permissions.title=Permissions
+ImageDetails.Label.ImageName.text=Image Name
+ImageDetails.Label.ContainerRunOptions.text=Container Run Options
# ImageListWindowLayout
ImageList.Label.title.text=Overview virtual machines
diff --git a/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties b/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties
index a8768bac..458d1f41 100644
--- a/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties
+++ b/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties
@@ -69,6 +69,8 @@ ImageDetails.Button.close.text=Schließen
ImageDetails.Tab.overview.title=Übersicht
ImageDetails.Tab.versions.title=VM-Versionen
ImageDetails.Tab.permissions.title=Berechtigungen
+ImageDetails.Label.ImageName.text=Image Name
+ImageDetails.Label.ContainerRunOptions.text=Container Start Optionen
# ImageListWindowLayout
ImageList.Label.title.text=Übersicht Virtuelle Maschinen
diff --git a/dozentenmodul/src/main/properties/i18n/wizard.properties b/dozentenmodul/src/main/properties/i18n/wizard.properties
index 00d3abcc..95422c3d 100644
--- a/dozentenmodul/src/main/properties/i18n/wizard.properties
+++ b/dozentenmodul/src/main/properties/i18n/wizard.properties
@@ -5,6 +5,7 @@ ImageCreation.Message.error.baseNotWritten=Could not save the metadata of the VM
ImageCreation.Message.error.permissionsNotWritten=Could not save the permissions on the satellite!
ImageCreation.Message.error.updateImageVersionFailed=Unexpected error while setting the option \
''Contains software requiring a license'' for this virtual machine.
+ImageCreation.Message.error.UploadInitializationFailure=Upload initialisation failed
ImageCreation.Message.yesNo.cancelRequest=Do you really want to cancel the process?
# ImageUpdateWizard
diff --git a/dozentenmodul/src/main/properties/i18n/wizard_de_DE.properties b/dozentenmodul/src/main/properties/i18n/wizard_de_DE.properties
index a64d20f1..4422ee9c 100644
--- a/dozentenmodul/src/main/properties/i18n/wizard_de_DE.properties
+++ b/dozentenmodul/src/main/properties/i18n/wizard_de_DE.properties
@@ -5,6 +5,7 @@ ImageCreation.Message.error.baseNotWritten=Konnte die Metadaten der VM nicht auf
ImageCreation.Message.error.permissionsNotWritten=Konnte die Berechtigungen nicht auf dem Satelliten speichern!
ImageCreation.Message.error.updateImageVersionFailed=Unerwarteter Fehler beim Setzen der Option \
''Enthält lizenzpflichtige Software'' für diese Virtuelle Maschine.
+ImageCreation.Message.error.UploadInitializationFailure=Upload-Initialisierung fehlgeschlagen
ImageCreation.Message.yesNo.cancelRequest=Möchten Sie den Vorgang wirklich abbrechen?
# ImageUpdateWizard