瀏覽代碼

Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons

Conflicts:
	src/ui/view/Languages.java
Edgardo Palza 7 年之前
父節點
當前提交
1499427d97
共有 1 個文件被更改,包括 7 次插入3 次删除
  1. 7 3
      src/ui/view/Languages.java

+ 7 - 3
src/ui/view/Languages.java

@@ -36,17 +36,21 @@ public class Languages {
 
 	static String[] arrayDE = {
 			// ToolBar (0-16)
-			"File", "New", "Open", "Save", "Edit", "Undo", "Redo", "Find/Replace", "Edit showed Information", "Options",
-			"Reset Categories", "View", "View Size", "Help", "About Us", "Edit Edges", "Language",
+			"Datei", "Neu", "Öffnen", "Speichern", "Bearbeiten", "Rückgängig", "Wiederherstellen", "Suchen/Ersetzen", "Gezeigte Informationen Ersetzen", "Optionen",
+			"Kategorien Zurücksetzen", "Ansicht", "Ansichtsgröße", "Hilfe", "Über Uns", "Kanten Bearbeiten", "Sprache",
 			// Tables (17-24)
-			"Object", "Nr.", "Device", "Energy", "Quantity", "Activated", "Field", "Information",
+			"Objekt", "Nr.", "Geräte", "Energie", "Quantität", "Aktiviert", "Feld", "Information",
 			// Graph (25-26)
+<<<<<<< HEAD
 			"None ", "Reset",
 			// Warning PopUps(27-30)
 			"Warning", "Do you want to save your current data?", "Do you really want to delete the Category ",
 			"Please select a Category or an Object in order to delete something.",
 			// Edit Edges Pop Up
 			"Edit Showed Informations", "Show Total Energy of Objects", "Show Connection Properties", "Cancel" };
+=======
+			"Nichts ", "Zurücksetzen" };
+>>>>>>> 2a5e2ab33446ce8ab32fe63a4729b69bf7fe2838
 
 	static String[] arrayCZ = {
 			// ToolBar (0-16)