From 9557ed7168816f915c4415a1ef01e8e68848d53e Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 4 Feb 2016 20:22:23 +0100 Subject: [client] Improve some texts (image -> vm mostly) --- .../openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java | 6 +++--- .../org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java | 2 +- .../openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java | 2 +- .../dozmod/gui/window/layout/LectureDetailsWindowLayout.java | 4 ++-- .../openslx/dozmod/gui/window/layout/LectureListWindowLayout.java | 2 +- .../org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout') 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 de120a81..1fca5e07 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 @@ -171,7 +171,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog { // id txtId = new JTextField(); txtId.setEditable(false); - grid.add(new QLabel("Image-ID")); + grid.add(new QLabel("VM-ID")); grid.add(txtId, 2).expand(true, false).fill(true, false); grid.nextRow(); @@ -206,7 +206,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog { buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS)); btnSaveChanges = new JButton("Speichern"); btnClose = new JButton("Schließen"); - btnUpdateImage = new JButton("Neue Image-Version hochladen", Gui.getScaledIconResource("/img/upload-icon.png", "New VM", ICON_SIZE_Y, buttonPanel)); + btnUpdateImage = new JButton("Neue VM-Version hochladen", Gui.getScaledIconResource("/img/upload-icon.png", "New VM", ICON_SIZE_Y, buttonPanel)); buttonPanel.add(btnUpdateImage); buttonPanel.add(Box.createGlue()); // user feedback slot @@ -221,7 +221,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog { JPanel versionTablePanel = new JPanel(); versionTablePanel.setLayout(new BorderLayout()); versionTablePanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - QLabel lblVersion = new QLabel("Image-Versionen"); + QLabel lblVersion = new QLabel("VM-Versionen"); lblVersion.setFont(lblVersion.getFont().deriveFont(Font.BOLD)); versionTablePanel.add(lblVersion, BorderLayout.PAGE_START); tblVersions = new ImageVersionTable(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java index f401dba9..53bfc2f1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java @@ -34,7 +34,7 @@ public abstract class ImageListWindowLayout extends CompositePage { protected final static String editButtonLabel = "Detailansicht / Bearbeiten"; protected final static String downloadButtonLabel = "Download"; protected final static String deleteButtonLabel = "Löschen"; - protected final static String switchViewButtonLabel = "Zu 'Veranstaltungen' wechseln"; + protected final static String switchViewButtonLabel = "Veranstaltungen zeigen"; // -------------------------------------- // search field, table and buttons diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java index 4bad25e1..d24db283 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java @@ -37,7 +37,7 @@ public class LectureChangeImageLayout extends JDialog { /** * The title of the window. */ - private static String title = "Image zum Verlinken auswählen"; + private static String title = "VM zum Verlinken auswählen"; protected LectureChangeImageLayout(Window modalParent) { super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java index 913a26e6..b0cf0eb8 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java @@ -144,7 +144,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { // linked image // name txtImageName = new QLabel(); - grid.add(new QLabel("Verknüpftes Image")); + grid.add(new QLabel("Verknüpfte VM")); grid.add(txtImageName).expand(true, false); // link button for image btnLinkImage = new JButton("Ändern"); @@ -173,7 +173,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { JPanel versionPanel = new JPanel(new BorderLayout()); versionPanel.add(cboVersions, BorderLayout.CENTER); versionPanel.add(chkAutoUpdate, BorderLayout.SOUTH); - grid.add(new QLabel("Image-Version")); + grid.add(new QLabel("VM-Version")); grid.add(versionPanel); grid.add(btnDownloadImage).fill(true, false); grid.nextRow(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java index a2c1e46a..bf602c9d 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java @@ -33,7 +33,7 @@ public abstract class LectureListWindowLayout extends CompositePage { private static final String newButtonLabel = "Neue Veranstaltung"; private static final String editButtonLabel = "Detailansicht / Bearbeiten"; private static final String deleteButtonLabel = "Löschen"; - private static final String switchViewButtonLabel = "Zu 'Images' wechseln"; + private static final String switchViewButtonLabel = "VMs zeigen"; private static final String filterPanelLabel = "Suchen"; private static final String infoTextString = "Hier können Sie Veranstaltungen anlegen, bearbeiten und löschen."; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java index 002a3fc1..325e4b14 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java @@ -40,7 +40,7 @@ public abstract class MainMenuWindowLayout extends CompositePage { lblLectureLogo = new JLabel(ResourceLoader.getIcon("/img/lecture.png", "Veranstaltungen")); JLabel lecturesInfoLabel = new JLabel(lecturesInfo); lecturesInfoLabel.setVerticalAlignment(JLabel.TOP); - btnShowVirtualMachines = new JButton("Zu den Images"); + btnShowVirtualMachines = new JButton("Zu den VMs"); btnShowLectures = new JButton("Zu den Veranstaltungen"); grid.add(lblVirtualMachinesLogo).fill(true, false).expand(true, false); grid.add(lblLectureLogo).fill(true, false).expand(true, false); -- cgit v1.2.3-55-g7522