summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java1
-rw-r--r--enigma/src/main/resources/lang/en_us.json6
-rw-r--r--enigma/src/main/resources/lang/fr_fr.json5
-rw-r--r--enigma/src/main/resources/lang/ja_jp.json2
-rw-r--r--enigma/src/main/resources/lang/zh_cn.json2
5 files changed, 9 insertions, 7 deletions
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index 472ff609..39aaebb5 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -112,7 +112,6 @@ public class MenuBar {
112 this.scaleMenu.add(this.customScaleItem); 112 this.scaleMenu.add(this.customScaleItem);
113 this.viewMenu.add(this.scaleMenu); 113 this.viewMenu.add(this.scaleMenu);
114 this.viewMenu.add(this.fontItem); 114 this.viewMenu.add(this.fontItem);
115 this.viewMenu.addSeparator();
116 this.ui.add(this.viewMenu); 115 this.ui.add(this.viewMenu);
117 116
118 this.searchMenu.add(this.searchClassItem); 117 this.searchMenu.add(this.searchClassItem);
diff --git a/enigma/src/main/resources/lang/en_us.json b/enigma/src/main/resources/lang/en_us.json
index eebdb534..57b2ca8f 100644
--- a/enigma/src/main/resources/lang/en_us.json
+++ b/enigma/src/main/resources/lang/en_us.json
@@ -47,9 +47,9 @@
47 "menu.view.change.title": "Changes", 47 "menu.view.change.title": "Changes",
48 "menu.view.change.summary": "Changes will be applied after the next restart.", 48 "menu.view.change.summary": "Changes will be applied after the next restart.",
49 "menu.search": "Search", 49 "menu.search": "Search",
50 "menu.search.class": "Search Class", 50 "menu.search.class": "Search Classes",
51 "menu.search.method": "Search Method", 51 "menu.search.method": "Search Methods",
52 "menu.search.field": "Search Field", 52 "menu.search.field": "Search Fields",
53 "menu.collab": "Collab", 53 "menu.collab": "Collab",
54 "menu.collab.connect": "Connect to server", 54 "menu.collab.connect": "Connect to server",
55 "menu.collab.connect.error": "Error connecting to server", 55 "menu.collab.connect.error": "Error connecting to server",
diff --git a/enigma/src/main/resources/lang/fr_fr.json b/enigma/src/main/resources/lang/fr_fr.json
index 42edd6bb..5c46c87a 100644
--- a/enigma/src/main/resources/lang/fr_fr.json
+++ b/enigma/src/main/resources/lang/fr_fr.json
@@ -46,7 +46,10 @@
46 "menu.view.font": "Polices...", 46 "menu.view.font": "Polices...",
47 "menu.view.change.title": "Modifications", 47 "menu.view.change.title": "Modifications",
48 "menu.view.change.summary": "Les modifications seront appliquées lors du prochain redémarrage.", 48 "menu.view.change.summary": "Les modifications seront appliquées lors du prochain redémarrage.",
49 "menu.view.search": "Rechercher", 49 "menu.search": "Rechercher",
50 "menu.search.class": "Rechercher des classes",
51 "menu.search.method": "Rechercher des méthodes",
52 "menu.search.field": "Rechercher des champs",
50 "menu.collab": "Collab", 53 "menu.collab": "Collab",
51 "menu.collab.connect": "Se connecter à un serveur", 54 "menu.collab.connect": "Se connecter à un serveur",
52 "menu.collab.connect.error": "Erreur lors de la connexion au serveur", 55 "menu.collab.connect.error": "Erreur lors de la connexion au serveur",
diff --git a/enigma/src/main/resources/lang/ja_jp.json b/enigma/src/main/resources/lang/ja_jp.json
index 52f9486e..0ff162a1 100644
--- a/enigma/src/main/resources/lang/ja_jp.json
+++ b/enigma/src/main/resources/lang/ja_jp.json
@@ -45,7 +45,7 @@
45 "menu.view.font": "フォント...", 45 "menu.view.font": "フォント...",
46 "menu.view.change.title": "変更", 46 "menu.view.change.title": "変更",
47 "menu.view.change.summary": "変更は次の起動時に適用されます", 47 "menu.view.change.summary": "変更は次の起動時に適用されます",
48 "menu.view.search": "検索", 48 "menu.search": "検索",
49 "menu.collab": "コラボレーション", 49 "menu.collab": "コラボレーション",
50 "menu.collab.connect": "サーバーに接続する", 50 "menu.collab.connect": "サーバーに接続する",
51 "menu.collab.connect.error": "サーバーの接続でエラーが発生しました", 51 "menu.collab.connect.error": "サーバーの接続でエラーが発生しました",
diff --git a/enigma/src/main/resources/lang/zh_cn.json b/enigma/src/main/resources/lang/zh_cn.json
index 82f0c641..1d105b7a 100644
--- a/enigma/src/main/resources/lang/zh_cn.json
+++ b/enigma/src/main/resources/lang/zh_cn.json
@@ -37,7 +37,7 @@
37 "menu.view.languages": "语言", 37 "menu.view.languages": "语言",
38 "menu.view.languages.title": "更改语言", 38 "menu.view.languages.title": "更改语言",
39 "menu.view.languages.summary": "新语言将在下次重新启动后应用.", 39 "menu.view.languages.summary": "新语言将在下次重新启动后应用.",
40 "menu.view.search": "搜索", 40 "menu.search": "搜索",
41 "menu.help": "帮助", 41 "menu.help": "帮助",
42 "menu.help.about": "关于", 42 "menu.help.about": "关于",
43 "menu.help.about.title": "%s - 关于", 43 "menu.help.about.title": "%s - 关于",