diff --git a/LunaTranslator/LunaTranslator/gui/setting_display_ui.py b/LunaTranslator/LunaTranslator/gui/setting_display_ui.py index 60ed89c2..f2fa88dd 100644 --- a/LunaTranslator/LunaTranslator/gui/setting_display_ui.py +++ b/LunaTranslator/LunaTranslator/gui/setting_display_ui.py @@ -310,13 +310,6 @@ def uisetting(self): ), 2, ), - "", - ("圆角_合并", 4), - D_getsimpleswitch( - globalconfig, - "yuanjiao_merge", - callback=lambda _: gobject.baseobject.translation_ui.set_color_transparency(), - ), ], [], [ diff --git a/LunaTranslator/files/defaultconfig/config.json b/LunaTranslator/files/defaultconfig/config.json index bdc12b7a..355dc6ab 100644 --- a/LunaTranslator/files/defaultconfig/config.json +++ b/LunaTranslator/files/defaultconfig/config.json @@ -80,7 +80,7 @@ "maxBufferSize": 3000, "maxHistorySize": 1000000, "yuanjiao_r": 0, - "yuanjiao_merge": false, + "yuanjiao_merge": true, "transuigeo": [ 500, 500, diff --git a/LunaTranslator/files/lang/ar.json b/LunaTranslator/files/lang/ar.json index b4f35396..15cfa5db 100644 --- a/LunaTranslator/files/lang/ar.json +++ b/LunaTranslator/files/lang/ar.json @@ -766,7 +766,6 @@ "投影": "إسقاطات", "半径": "نصف قطر", "圆角": "فيليه", - "合并": "دمج", "立即应用": "التطبيق الفوري", "无法连接到anki": "غير قادر على الاتصال انكي", "例句": "على سبيل المثال", diff --git a/LunaTranslator/files/lang/cht.json b/LunaTranslator/files/lang/cht.json index 0d13ccfb..09861e4a 100644 --- a/LunaTranslator/files/lang/cht.json +++ b/LunaTranslator/files/lang/cht.json @@ -766,7 +766,6 @@ "投影": "投影", "半径": "半徑", "圆角": "圓角", - "合并": "合併", "立即应用": "立即應用", "无法连接到anki": "無法連接到anki", "例句": "例句", diff --git a/LunaTranslator/files/lang/en.json b/LunaTranslator/files/lang/en.json index 61c1dff3..f4a3e3f1 100644 --- a/LunaTranslator/files/lang/en.json +++ b/LunaTranslator/files/lang/en.json @@ -766,7 +766,6 @@ "投影": "projection", "半径": "radius", "圆角": "fillet", - "合并": "merge", "立即应用": "apply now", "无法连接到anki": "Unable to connect to Anki", "例句": "Example sentence", diff --git a/LunaTranslator/files/lang/es.json b/LunaTranslator/files/lang/es.json index 1181bea6..fecbffac 100644 --- a/LunaTranslator/files/lang/es.json +++ b/LunaTranslator/files/lang/es.json @@ -766,7 +766,6 @@ "投影": "Proyección", "半径": "Radio", "圆角": "Redondeado", - "合并": "Fusión", "立即应用": "Aplicar de inmediato", "无法连接到anki": "No se puede conectar a Anki", "例句": "Ejemplo", diff --git a/LunaTranslator/files/lang/fr.json b/LunaTranslator/files/lang/fr.json index 808b2559..29150e51 100644 --- a/LunaTranslator/files/lang/fr.json +++ b/LunaTranslator/files/lang/fr.json @@ -766,7 +766,6 @@ "投影": "Projection", "半径": "Rayon", "圆角": "Coins arrondis", - "合并": "Consolidation", "立即应用": "Appliquer maintenant", "无法连接到anki": "Impossible de se connecter à Anki", "例句": "Phrases d'exemple", diff --git a/LunaTranslator/files/lang/it.json b/LunaTranslator/files/lang/it.json index 7a0c98cd..2ae0b14e 100644 --- a/LunaTranslator/files/lang/it.json +++ b/LunaTranslator/files/lang/it.json @@ -766,7 +766,6 @@ "投影": "proiezione", "半径": "raggio", "圆角": "filetto", - "合并": "fusione", "立即应用": "Applica ora", "无法连接到anki": "Impossibile connettersi ad Anki", "例句": "Esempio di frase", diff --git a/LunaTranslator/files/lang/ja.json b/LunaTranslator/files/lang/ja.json index 66e8ddf4..dbf3edb8 100644 --- a/LunaTranslator/files/lang/ja.json +++ b/LunaTranslator/files/lang/ja.json @@ -766,7 +766,6 @@ "投影": "投影", "半径": "半径はんけい", "圆角": "フィレット", - "合并": "マージ", "立即应用": "今すぐ適用", "无法连接到anki": "ankiに接続できません", "例句": "例文", diff --git a/LunaTranslator/files/lang/ko.json b/LunaTranslator/files/lang/ko.json index 51af9238..efaeb946 100644 --- a/LunaTranslator/files/lang/ko.json +++ b/LunaTranslator/files/lang/ko.json @@ -766,7 +766,6 @@ "投影": "투영", "半径": "반지름", "圆角": "필렛", - "合并": "병합", "立即应用": "지금 적용", "无法连接到anki": "anki에 연결할 수 없음", "例句": "예문", diff --git a/LunaTranslator/files/lang/pl.json b/LunaTranslator/files/lang/pl.json index 4faa76ba..ba60e41d 100644 --- a/LunaTranslator/files/lang/pl.json +++ b/LunaTranslator/files/lang/pl.json @@ -766,7 +766,6 @@ "投影": "projekcja", "半径": "promień", "圆角": "filet", - "合并": "połączenie", "立即应用": "aplikuj teraz", "无法连接到anki": "Nie można połączyć się z Anki", "例句": "Zdanie przykładowe", diff --git a/LunaTranslator/files/lang/ru.json b/LunaTranslator/files/lang/ru.json index 6b04e9b0..af53d540 100644 --- a/LunaTranslator/files/lang/ru.json +++ b/LunaTranslator/files/lang/ru.json @@ -766,7 +766,6 @@ "投影": "Проекция", "半径": "Радиус", "圆角": "Круглый угол", - "合并": "Объединение", "立即应用": "Немедленное применение", "无法连接到anki": "Не удалось подключиться к ANKI", "例句": "Примеры", diff --git a/LunaTranslator/files/lang/th.json b/LunaTranslator/files/lang/th.json index 725f5853..559f35c9 100644 --- a/LunaTranslator/files/lang/th.json +++ b/LunaTranslator/files/lang/th.json @@ -766,7 +766,6 @@ "投影": "การฉายภาพ", "半径": "รัศมี", "圆角": "มุมกลม", - "合并": "การควบรวมกิจการ", "立即应用": "สมัครตอนนี้", "无法连接到anki": "ไม่สามารถเชื่อมต่อกับ anki ได้", "例句": "ตัวอย่างประโยค", diff --git a/LunaTranslator/files/lang/tr.json b/LunaTranslator/files/lang/tr.json index 2e093895..08abce94 100644 --- a/LunaTranslator/files/lang/tr.json +++ b/LunaTranslator/files/lang/tr.json @@ -766,7 +766,6 @@ "投影": "projection", "半径": "radius", "圆角": "fillet", - "合并": "birleştir", "立即应用": "şimdi uygulayın", "无法连接到anki": "Anki ile bağlanılamadı", "例句": "Örnek cümle", diff --git a/LunaTranslator/files/lang/uk.json b/LunaTranslator/files/lang/uk.json index ef3fa33f..713d6b91 100644 --- a/LunaTranslator/files/lang/uk.json +++ b/LunaTranslator/files/lang/uk.json @@ -766,7 +766,6 @@ "投影": "проекція", "半径": "радіус", "圆角": "філет", - "合并": "об’ єднати", "立即应用": "застосовувати зараз", "无法连接到anki": "Неможливо з' єднатися з Anki", "例句": "Приклад речення", diff --git a/LunaTranslator/files/lang/vi.json b/LunaTranslator/files/lang/vi.json index 82192015..1b0892d3 100644 --- a/LunaTranslator/files/lang/vi.json +++ b/LunaTranslator/files/lang/vi.json @@ -766,7 +766,6 @@ "投影": "Chiếu", "半径": "Bán kính", "圆角": "Góc tròn", - "合并": "Hợp nhất", "立即应用": "Áp dụng ngay", "无法连接到anki": "Không thể kết nối với Anki", "例句": "Câu ví dụ", diff --git a/LunaTranslator/files/lang/zh.json b/LunaTranslator/files/lang/zh.json index 5bfa01a5..742c4906 100644 --- a/LunaTranslator/files/lang/zh.json +++ b/LunaTranslator/files/lang/zh.json @@ -766,7 +766,6 @@ "最大缓存文本长度": "", "半径": "", "圆角": "", - "合并": "", "立即应用": "", "无法连接到anki": "", "例句": "",