summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/gui/image/SearchImage_GUI.java
diff options
context:
space:
mode:
authorMichael Wilson2014-08-22 10:50:27 +0200
committerMichael Wilson2014-08-22 10:50:27 +0200
commit6a92e0029876a8f66bda0c0e840c74378b87f332 (patch)
tree2be7c34d9266e663ba36bea6c380350eeda24f4a /Dozentenmodul/src/gui/image/SearchImage_GUI.java
parentnix (diff)
parentMerge branch 'master' of git.openslx.org:openslx-ng/tutor-module (diff)
downloadtutor-module-6a92e0029876a8f66bda0c0e840c74378b87f332.tar.gz
tutor-module-6a92e0029876a8f66bda0c0e840c74378b87f332.tar.xz
tutor-module-6a92e0029876a8f66bda0c0e840c74378b87f332.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts: Dozentenmodul/bin/gui/image/DeleteImage_GUI.class Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class Dozentenmodul/bin/gui/image/SearchImage_GUI.class
Diffstat (limited to 'Dozentenmodul/src/gui/image/SearchImage_GUI.java')
-rw-r--r--Dozentenmodul/src/gui/image/SearchImage_GUI.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index cb27e82a..a2ccfc41 100644
--- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
@@ -721,7 +721,7 @@ public class SearchImage_GUI extends JFrame {
lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
panel.add(lblLizenzpflichtigeSoftware);
- JLabel lblInternet = new JLabel("Internet:");
+ JLabel lblInternet = new JLabel("Internetsperre vorhanden:");
lblInternet.setBounds(10, 400, 130, 14);
panel.add(lblInternet);