From adf069617095d5c106917721eab747584b61c437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=81=8D=E5=85=AE=E6=83=9A=E5=85=AE?= <101191390+HIllya51@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:57:29 +0800 Subject: [PATCH] fix --- .../LunaTranslator/LunaTranslator.py | 70 +++++++++---------- LunaTranslator/LunaTranslator/gui/edittext.py | 1 - .../LunaTranslator/gui/setting_textinput.py | 20 +++++- .../LunaTranslator/gui/translatorUI.py | 17 +---- .../textsource/textsourcebase.py | 1 - .../files/defaultconfig/config.json | 4 +- LunaTranslator/files/lang/ar.json | 6 +- LunaTranslator/files/lang/cht.json | 4 +- LunaTranslator/files/lang/cs.json | 6 +- LunaTranslator/files/lang/de.json | 6 +- LunaTranslator/files/lang/en.json | 6 +- LunaTranslator/files/lang/es.json | 6 +- LunaTranslator/files/lang/fr.json | 6 +- LunaTranslator/files/lang/it.json | 6 +- LunaTranslator/files/lang/ja.json | 6 +- LunaTranslator/files/lang/ko.json | 6 +- LunaTranslator/files/lang/nl.json | 6 +- LunaTranslator/files/lang/pl.json | 6 +- LunaTranslator/files/lang/pt.json | 6 +- LunaTranslator/files/lang/ru.json | 6 +- LunaTranslator/files/lang/sv.json | 6 +- LunaTranslator/files/lang/th.json | 6 +- LunaTranslator/files/lang/tr.json | 6 +- LunaTranslator/files/lang/uk.json | 6 +- LunaTranslator/files/lang/vi.json | 6 +- LunaTranslator/files/lang/zh.json | 4 +- 26 files changed, 135 insertions(+), 94 deletions(-) diff --git a/LunaTranslator/LunaTranslator/LunaTranslator.py b/LunaTranslator/LunaTranslator/LunaTranslator.py index 86f29e44..fc83e967 100644 --- a/LunaTranslator/LunaTranslator/LunaTranslator.py +++ b/LunaTranslator/LunaTranslator/LunaTranslator.py @@ -262,12 +262,11 @@ class MAINUI: text, is_auto_run=True, waitforresultcallback=None, - onlytrans=False, donttrans=False, ): with self.solvegottextlock: succ = self.textgetmethod_1( - text, is_auto_run, waitforresultcallback, onlytrans, donttrans + text, is_auto_run, waitforresultcallback, donttrans ) if waitforresultcallback and not succ: waitforresultcallback("") @@ -277,7 +276,6 @@ class MAINUI: text, is_auto_run=True, waitforresultcallback=None, - onlytrans=False, donttrans=False, ): if not text: @@ -285,7 +283,7 @@ class MAINUI: if is_auto_run and text == self.currenttext: return currentsignature = uuid.uuid4() - if onlytrans == False: + if not waitforresultcallback: self.currentsignature = currentsignature try: origin = text @@ -316,7 +314,8 @@ class MAINUI: pass if donttrans: return - if onlytrans == False: + + if not waitforresultcallback: self.currenttext = text self.currenttranslate = "" if globalconfig["read_raw"]: @@ -329,16 +328,20 @@ class MAINUI: text = self.readcurrent(needresult=True) else: self.readcurrent() - self.dispatchoutputer(text) + if globalconfig["textoutput_origin"]: + self.dispatchoutputer(text) + _showrawfunction = functools.partial( + self.translation_ui.displayraw1.emit, + dict(text=text, color=globalconfig["rawtextcolor"]), + ) + else: + _showrawfunction = None self.transhis.getnewsentencesignal.emit(text) self.maybesetedittext(text) - _showrawfunction = functools.partial( - self.translation_ui.displayraw1.emit, - dict(text=text, color=globalconfig["rawtextcolor"], onlytrans=onlytrans), - ) if globalconfig["refresh_on_get_trans"] == False: - _showrawfunction() + if _showrawfunction: + _showrawfunction() _showrawfunction = None _showrawfunction_sig = 0 else: @@ -367,7 +370,6 @@ class MAINUI: self.create_translate_task( currentsignature, usefultranslators, - onlytrans, _colork, optimization_params, _showrawfunction, @@ -394,13 +396,12 @@ class MAINUI: if globalconfig["fix_translate_rank"]: self.ifuse_fix_translate_rank_preprare( - engine, onlytrans, waitforresultcallback + engine, waitforresultcallback ) self.create_translate_task( currentsignature, usefultranslators, - onlytrans, engine, optimization_params, _showrawfunction, @@ -416,18 +417,13 @@ class MAINUI: return return True - def ifuse_fix_translate_rank_preprare( - self, engine, onlytrans, waitforresultcallback - ): - if onlytrans: - return + def ifuse_fix_translate_rank_preprare(self, engine, waitforresultcallback): if waitforresultcallback: return displayreskwargs = dict( name="", color=globalconfig["fanyi"][engine]["color"], res="", - onlytrans=onlytrans, iter_context=(1, engine), ) self.translation_ui.displayres.emit(displayreskwargs) @@ -436,7 +432,6 @@ class MAINUI: self, currentsignature, usefultranslators, - onlytrans, engine, optimization_params, _showrawfunction, @@ -451,7 +446,6 @@ class MAINUI: self.GetTranslationCallback, usefultranslators, waitforresultcallback, - onlytrans, engine, currentsignature, optimization_params, @@ -477,7 +471,6 @@ class MAINUI: self, usefultranslators, waitforresultcallback, - onlytrans, classname, currentsignature, optimization_params, @@ -500,7 +493,7 @@ class MAINUI: self.translation_ui.displaystatus.emit( globalconfig["fanyi"][classname]["name"] + " " + res, "red", - onlytrans, + False, False, ) if len(usefultranslators) == 0: @@ -508,16 +501,10 @@ class MAINUI: return res = self.solveaftertrans(res, optimization_params) - if len(res) == 0: + if not res: + if len(usefultranslators) == 0: + safe_callback("") return - if onlytrans == False: - if ( - globalconfig["read_trans"] - and globalconfig["read_translator2"] == classname - ): - self.currentread = res - self.readcurrent() - needshowraw = ( _showrawfunction and self.refresh_on_get_trans_signature != _showrawfunction_sig @@ -526,16 +513,29 @@ class MAINUI: self.refresh_on_get_trans_signature = _showrawfunction_sig _showrawfunction() - if currentsignature == self.currentsignature: + if (currentsignature == self.currentsignature) and (iter_res_status in (0, 1)): displayreskwargs = dict( name=globalconfig["fanyi"][classname]["name"], color=globalconfig["fanyi"][classname]["color"], res=res, - onlytrans=onlytrans, iter_context=(iter_res_status, classname), ) self.translation_ui.displayres.emit(displayreskwargs) if iter_res_status in (0, 2): # 0为普通，1为iter，2为iter终止 + + self.transhis.getnewtranssignal.emit( + globalconfig["fanyi"][classname]["name"], res + ) + if not waitforresultcallback: + if ( + globalconfig["read_trans"] + and globalconfig["read_translator2"] == classname + ): + self.currentread = res + self.readcurrent() + + if globalconfig["textoutput_trans"]: + self.dispatchoutputer(res) try: self.textsource.sqlqueueput((contentraw, classname, res)) except: diff --git a/LunaTranslator/LunaTranslator/gui/edittext.py b/LunaTranslator/LunaTranslator/gui/edittext.py index cd1cdeab..9cdce14e 100644 --- a/LunaTranslator/LunaTranslator/gui/edittext.py +++ b/LunaTranslator/LunaTranslator/gui/edittext.py @@ -172,7 +172,6 @@ class edittrans(LMainWindow): name=globalconfig["fanyi"]["realtime_edit"]["name"], color=globalconfig["fanyi"]["realtime_edit"]["color"], res=text, - onlytrans=False, iter_context=(1, "realtime_edit_directvis_fakeclass"), ) gobject.baseobject.translation_ui.displayres.emit(displayreskwargs) diff --git a/LunaTranslator/LunaTranslator/gui/setting_textinput.py b/LunaTranslator/LunaTranslator/gui/setting_textinput.py index 4ce36a42..0a0c4598 100644 --- a/LunaTranslator/LunaTranslator/gui/setting_textinput.py +++ b/LunaTranslator/LunaTranslator/gui/setting_textinput.py @@ -462,7 +462,25 @@ def filetranslate(self): def outputgrid(self): grids = [ - ["自动输出提取的文本"], + [ + ( + dict( + title="输出的内容", + grid=( + [ + "原文", + D_getsimpleswitch(globalconfig, "textoutput_origin"), + ], + [ + "翻译", + D_getsimpleswitch(globalconfig, "textoutput_trans"), + ], + ), + ), + 0, + "group", + ) + ], [], [ ( diff --git a/LunaTranslator/LunaTranslator/gui/translatorUI.py b/LunaTranslator/LunaTranslator/gui/translatorUI.py index 5868bcf0..bb795114 100644 --- a/LunaTranslator/LunaTranslator/gui/translatorUI.py +++ b/LunaTranslator/LunaTranslator/gui/translatorUI.py @@ -300,24 +300,14 @@ class TranslatorWindow(resizableframeless): pass self.move_signal.emit(tracepos - lastpos.topLeft() + rect.topLeft()) - def showres(self, kwargs): # name,color,res,onlytrans,iter_context): + def showres(self, kwargs): try: name = kwargs.get("name", "") color = kwargs.get("color") res = kwargs.get("res") - onlytrans = kwargs.get("onlytrans", False) # 仅翻译，不显示 iter_context = kwargs.get("iter_context", None) clear = kwargs.get("clear", False) - iter_res_status, iter_context_class = iter_context - if iter_res_status in (0, 2): # iter结束 - gobject.baseobject.transhis.getnewtranssignal.emit(name, res) - if iter_res_status == 2: - return - - if onlytrans: - return - if globalconfig["showfanyisource"]: _showtext = name + " " + res else: @@ -333,14 +323,11 @@ class TranslatorWindow(resizableframeless): except: print_exc() - def showraw(self, kwargs): # res,color,onlytrans): + def showraw(self, kwargs): text = kwargs.get("text") color = kwargs.get("color") - onlytrans = kwargs.get("onlytrans") clear = True - if onlytrans: - return if globalconfig["isshowrawtext"]: self.showline(clear=clear, text=text, isshowrawtext=True, color=color) else: diff --git a/LunaTranslator/LunaTranslator/textsource/textsourcebase.py b/LunaTranslator/LunaTranslator/textsource/textsourcebase.py index bd0af593..f45953fe 100644 --- a/LunaTranslator/LunaTranslator/textsource/textsourcebase.py +++ b/LunaTranslator/LunaTranslator/textsource/textsourcebase.py @@ -57,7 +57,6 @@ class basetext: text, is_auto_run=True, waitforresultcallback=resultwaitor.put, - onlytrans=True, ) return resultwaitor.get() diff --git a/LunaTranslator/files/defaultconfig/config.json b/LunaTranslator/files/defaultconfig/config.json index 93e0d256..ee253198 100644 --- a/LunaTranslator/files/defaultconfig/config.json +++ b/LunaTranslator/files/defaultconfig/config.json @@ -2043,5 +2043,7 @@ }, "proxies": null, "labelset": [], - "viewlistpos": 0 + "viewlistpos": 0, + "textoutput_origin": true, + "textoutput_trans": false } \ No newline at end of file diff --git a/LunaTranslator/files/lang/ar.json b/LunaTranslator/files/lang/ar.json index e3babda0..cc69e23b 100644 --- a/LunaTranslator/files/lang/ar.json +++ b/LunaTranslator/files/lang/ar.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "إظهار / إخفاء التاريخ", "全屏/恢复游戏窗口": "كامل الشاشة / استعادة نافذة اللعبة", "文本输出": "النص الناتج", - "自动输出提取的文本": "التلقائي استخراج النص الناتج", "缩放": "تحجيم", "填充": "ملأ", "适应": "تكيف", @@ -849,5 +848,8 @@ "复制自": "نسخ من", "目标列表": "قائمة الأهداف", "使用翻译": "استخدام الترجمة", - "使用/跳过翻译": "استخدام / تخطي الترجمة" + "使用/跳过翻译": "استخدام / تخطي الترجمة", + "prompt格式（需要根据模型版本决定）": "Prompt الشكل ( يجب أن تكون مصممة على أساس نموذج الإصدار )", + "v0.10pre1（支持gpt词典）": "v0.10pre1 ( دعم GPT القاموس )", + "输出的内容": "المحتوى الناتج" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/cht.json b/LunaTranslator/files/lang/cht.json index fb020281..fae2a14b 100644 --- a/LunaTranslator/files/lang/cht.json +++ b/LunaTranslator/files/lang/cht.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "顯示／隱藏歷史翻譯", "全屏/恢复游戏窗口": "全螢幕／復原遊戲視窗", "文本输出": "文字輸出", - "自动输出提取的文本": "自動輸出提取的文字", "缩放": "縮放", "填充": "填充", "适应": "適應", @@ -851,5 +850,6 @@ "使用翻译": "使用翻譯", "使用/跳过翻译": "使用／跳過翻譯", "prompt格式（需要根据模型版本决定）": "prompt 格式（需要根據模型版本決定）", - "v0.10pre1（支持gpt词典）": "v0.10pre1（支援 gpt 詞典）" + "v0.10pre1（支持gpt词典）": "v0.10pre1（支援 gpt 詞典）", + "输出的内容": "輸出的內容" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/cs.json b/LunaTranslator/files/lang/cs.json index 1c28e97c..cca89ef5 100644 --- a/LunaTranslator/files/lang/cs.json +++ b/LunaTranslator/files/lang/cs.json @@ -587,7 +587,6 @@ "显示/隐藏历史翻译": "Zobrazit/skrýt historické překlady", "全屏/恢复游戏窗口": "Celá obrazovka/obnovení herního okna", "文本输出": "Textový výstup", - "自动输出提取的文本": "Automaticky výstup extrahovaného textu", "缩放": "zoom", "填充": "vyplnit", "适应": "přizpůsobit", @@ -849,5 +848,8 @@ "复制自": "Kopírovat z", "目标列表": "Seznam cílů", "使用翻译": "Použití překladu", - "使用/跳过翻译": "Použít/přeskočit překlad" + "使用/跳过翻译": "Použít/přeskočit překlad", + "prompt格式（需要根据模型版本决定）": "Formát výzvy (v závislosti na verzi modelu)", + "v0.10pre1（支持gpt词典）": "V0.10 pre1 (podporuje GPT slovník)", + "输出的内容": "Výstupní obsah" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/de.json b/LunaTranslator/files/lang/de.json index 35ceeba6..998ed148 100644 --- a/LunaTranslator/files/lang/de.json +++ b/LunaTranslator/files/lang/de.json @@ -587,7 +587,6 @@ "显示/隐藏历史翻译": "Historische Übersetzungen ein-/ausblenden", "全屏/恢复游戏窗口": "Vollbildmodus/Spielfenster wiederherstellen", "文本输出": "Textausgabe", - "自动输出提取的文本": "Extrahierter Text automatisch ausgeben", "缩放": "Zoom", "填充": "Füllen", "适应": "Anpassung", @@ -849,5 +848,8 @@ "复制自": "Kopieren von", "目标列表": "Zielliste", "使用翻译": "Verwendung der Übersetzung", - "使用/跳过翻译": "Übersetzung verwenden/überspringen" + "使用/跳过翻译": "Übersetzung verwenden/überspringen", + "prompt格式（需要根据模型版本决定）": "Aufforderungsformat (abhängig von der Modellversion)", + "v0.10pre1（支持gpt词典）": "V0.10 pre1 (unterstützt GPT Wörterbuch)", + "输出的内容": "Ausgabeinhalt" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/en.json b/LunaTranslator/files/lang/en.json index 5c480dc5..efa95308 100644 --- a/LunaTranslator/files/lang/en.json +++ b/LunaTranslator/files/lang/en.json @@ -578,7 +578,6 @@ "显示/隐藏历史翻译": "Show/Hide Translation History", "全屏/恢复游戏窗口": "Full Screen/Restore Game Window", "文本输出": "Text Output", - "自动输出提取的文本": "Automatically Output Extracted Text", "缩放": "Scale", "填充": "Fill", "适应": "Fit", @@ -849,5 +848,8 @@ "复制自": "Copy from", "目标列表": "Target List", "使用翻译": "Using translation", - "使用/跳过翻译": "Use/skip translation" + "使用/跳过翻译": "Use/skip translation", + "prompt格式（需要根据模型版本决定）": "Prompt format (depending on the model version)", + "v0.10pre1（支持gpt词典）": "V0.10 pre1 (supports GPT dictionary)", + "输出的内容": "Output content" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/es.json b/LunaTranslator/files/lang/es.json index 34b7f1bb..d3f072cd 100644 --- a/LunaTranslator/files/lang/es.json +++ b/LunaTranslator/files/lang/es.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "Mostrar / ocultar la traducción histórica", "全屏/恢复游戏窗口": "Pantalla completa / restaurar la ventana del juego", "文本输出": "Salida de texto", - "自动输出提取的文本": "Salida automática del Texto extraído", "缩放": "Zoom", "填充": "Relleno", "适应": "Adaptación", @@ -849,5 +848,8 @@ "复制自": "Copiado de", "目标列表": "Lista de objetivos", "使用翻译": "Uso de traductores", - "使用/跳过翻译": "Usar / saltar la traducción" + "使用/跳过翻译": "Usar / saltar la traducción", + "prompt格式（需要根据模型版本决定）": "Formato prompt (debe decidirse en función de la versión del modelo)", + "v0.10pre1（支持gpt词典）": "V0.10pre1 (admite diccionario gpt)", + "输出的内容": "Contenido exportado" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/fr.json b/LunaTranslator/files/lang/fr.json index 904ee2fe..351f9f1f 100644 --- a/LunaTranslator/files/lang/fr.json +++ b/LunaTranslator/files/lang/fr.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "Afficher / masquer les traductions historiques", "全屏/恢复游戏窗口": "Plein écran / restaurer la fenêtre de jeu", "文本输出": "Sortie de texte", - "自动输出提取的文本": "Sortie automatique du texte extrait", "缩放": "Zoom", "填充": "Remplissage", "适应": "Adaptation", @@ -849,5 +848,8 @@ "复制自": "Copié depuis", "目标列表": "Liste des objectifs", "使用翻译": "Utiliser la traduction", - "使用/跳过翻译": "Utiliser / sauter la traduction" + "使用/跳过翻译": "Utiliser / sauter la traduction", + "prompt格式（需要根据模型版本决定）": "Format prompt (à décider en fonction de la version du modèle)", + "v0.10pre1（支持gpt词典）": "V0.10pre1 (support du dictionnaire GPT)", + "输出的内容": "Contenu de la sortie" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/it.json b/LunaTranslator/files/lang/it.json index 201ae158..8600b216 100644 --- a/LunaTranslator/files/lang/it.json +++ b/LunaTranslator/files/lang/it.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "Mostra/nasconde traduzioni storiche", "全屏/恢复游戏窗口": "Finestra di gioco a schermo intero/ripristino", "文本输出": "Output testo", - "自动输出提取的文本": "Estrai automaticamente il testo estratto", "缩放": "zoom", "填充": "riempimento", "适应": "adattare", @@ -849,5 +848,8 @@ "复制自": "Copia da", "目标列表": "Elenco target", "使用翻译": "Uso della traduzione", - "使用/跳过翻译": "Usa/salta traduzione" + "使用/跳过翻译": "Usa/salta traduzione", + "prompt格式（需要根据模型版本决定）": "Formato di richiesta (a seconda della versione del modello)", + "v0.10pre1（支持gpt词典）": "V0.10 pre1 (supporta il dizionario GPT)", + "输出的内容": "Contenuto di output" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/ja.json b/LunaTranslator/files/lang/ja.json index 4a6bc297..8ac56c5d 100644 --- a/LunaTranslator/files/lang/ja.json +++ b/LunaTranslator/files/lang/ja.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "履歴翻訳の表示/非表示", "全屏/恢复游戏窗口": "フルスクリーン/リカバリゲームウィンドウ", "文本输出": "テキスト出力", - "自动输出提取的文本": "抽出されたテキストを自動的に出力", "缩放": "ズーム", "填充": "じゅうてん", "适应": "じゅんのう", @@ -849,5 +848,8 @@ "复制自": "コピー元", "目标列表": "ターゲットリスト", "使用翻译": "翻訳の使用", - "使用/跳过翻译": "翻訳の使用/スキップ" + "使用/跳过翻译": "翻訳の使用/スキップ", + "prompt格式（需要根据模型版本决定）": "promptフォーマット（モデルバージョンに基づいて決定する必要がある）", + "v0.10pre1（支持gpt词典）": "v 0.10 pre 1（gpt辞書対応）", + "输出的内容": "出力の内容" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/ko.json b/LunaTranslator/files/lang/ko.json index 795cb029..db45f25b 100644 --- a/LunaTranslator/files/lang/ko.json +++ b/LunaTranslator/files/lang/ko.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "히스토리 번역 표시 / 숨기기", "全屏/恢复游戏窗口": "전체 화면 / 게임 창 복원", "文本输出": "텍스트 출력", - "自动输出提取的文本": "추출된 텍스트 자동 내보내기", "缩放": "줌", "填充": "채우기", "适应": "적응", @@ -849,5 +848,8 @@ "复制自": "복사하기", "目标列表": "대상 목록", "使用翻译": "번역 사용", - "使用/跳过翻译": "번역 사용 / 건너뛰기" + "使用/跳过翻译": "번역 사용 / 건너뛰기", + "prompt格式（需要根据模型版本决定）": "prompt 형식 (모델 버전에 따라 결정)", + "v0.10pre1（支持gpt词典）": "v0.10pre1(gpt 사전 지원)", + "输出的内容": "내보낸 내용" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/nl.json b/LunaTranslator/files/lang/nl.json index a1894aec..20c7264b 100644 --- a/LunaTranslator/files/lang/nl.json +++ b/LunaTranslator/files/lang/nl.json @@ -587,7 +587,6 @@ "显示/隐藏历史翻译": "Historische vertalingen tonen/verbergen", "全屏/恢复游戏窗口": "Volledig scherm/spelvenster herstellen", "文本输出": "Tekst-uitvoer", - "自动输出提取的文本": "Uitgepakte tekst automatisch uitvoeren", "缩放": "zoomen", "填充": "vulling", "适应": "aanpassen", @@ -849,5 +848,8 @@ "复制自": "Kopiëren van", "目标列表": "Doellijst", "使用翻译": "Vertaling gebruiken", - "使用/跳过翻译": "Vertaling gebruiken/overslaan" + "使用/跳过翻译": "Vertaling gebruiken/overslaan", + "prompt格式（需要根据模型版本决定）": "Prompt formaat (afhankelijk van de modelversie)", + "v0.10pre1（支持gpt词典）": "V0.10 pre1 (ondersteunt GPT woordenboek)", + "输出的内容": "Uitvoerinhoud" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/pl.json b/LunaTranslator/files/lang/pl.json index 575f78b0..f549e718 100644 --- a/LunaTranslator/files/lang/pl.json +++ b/LunaTranslator/files/lang/pl.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "Pokaż/ukryj tłumaczenia historyczne", "全屏/恢复游戏窗口": "Pełny ekran/przywróć okno gry", "文本输出": "Wyjście tekstowe", - "自动输出提取的文本": "Automatycznie wyświetlać wyodrębniony tekst", "缩放": "powiększenie", "填充": "napełnienie", "适应": "dostosować się", @@ -849,5 +848,8 @@ "复制自": "Kopiuj z", "目标列表": "Lista docelowa", "使用翻译": "Korzystanie z tłumaczenia", - "使用/跳过翻译": "Użyj/pominąć tłumaczenie" + "使用/跳过翻译": "Użyj/pominąć tłumaczenie", + "prompt格式（需要根据模型版本决定）": "Format pytania (w zależności od wersji modelu)", + "v0.10pre1（支持gpt词典）": "V0.10 pre1 (obsługuje słownik GPT)", + "输出的内容": "Zawartość wyjściowa" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/pt.json b/LunaTranslator/files/lang/pt.json index 50d42767..61c15174 100644 --- a/LunaTranslator/files/lang/pt.json +++ b/LunaTranslator/files/lang/pt.json @@ -587,7 +587,6 @@ "显示/隐藏历史翻译": "Mostrar/ Esconder as Traduções Históricas", "全屏/恢复游戏窗口": "Janela de ecrã completo/restauração do jogo", "文本输出": "Saída de texto", - "自动输出提取的文本": "Saída automática do texto extraído", "缩放": "zoom", "填充": "preencher", "适应": "adaptar", @@ -849,5 +848,8 @@ "复制自": "Copiar de", "目标列表": "Lista de Destinos", "使用翻译": "Usar a tradução", - "使用/跳过翻译": "Usar/ignorar a tradução" + "使用/跳过翻译": "Usar/ignorar a tradução", + "prompt格式（需要根据模型版本决定）": "Formato do pedido (dependendo da versão do modelo)", + "v0.10pre1（支持gpt词典）": "V0. 10 pre1 (suporta dicionário GPT)", + "输出的内容": "Conteúdo de saída" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/ru.json b/LunaTranslator/files/lang/ru.json index f15c50a2..d8c7b8f5 100644 --- a/LunaTranslator/files/lang/ru.json +++ b/LunaTranslator/files/lang/ru.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "Показать / скрыть исторический перевод", "全屏/恢复游戏窗口": "Полноэкранное / Восстановление игрового окна", "文本输出": "Вывод текста", - "自动输出提取的文本": "Автоматический вывод извлеченного текста", "缩放": "Масштаб", "填充": "Заполнение", "适应": "Адаптация", @@ -849,5 +848,8 @@ "复制自": "Копировать из", "目标列表": "Список целей", "使用翻译": "Использование перевода", - "使用/跳过翻译": "Использовать / пропустить перевод" + "使用/跳过翻译": "Использовать / пропустить перевод", + "prompt格式（需要根据模型版本决定）": "Формат prompt (должен быть определен в соответствии с версией модели)", + "v0.10pre1（支持gpt词典）": "v0.10pre1 (Поддержка словаря gpt)", + "输出的内容": "Экспорт содержимого" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/sv.json b/LunaTranslator/files/lang/sv.json index 46d68820..c7f24cc5 100644 --- a/LunaTranslator/files/lang/sv.json +++ b/LunaTranslator/files/lang/sv.json @@ -587,7 +587,6 @@ "显示/隐藏历史翻译": "Visa/dölj historiska översättningar", "全屏/恢复游戏窗口": "Helskärms-/återställningsfönster", "文本输出": "Textutmatning", - "自动输出提取的文本": "Skriv ut extraherad text automatiskt", "缩放": "zooma", "填充": "Fyll", "适应": "anpassa", @@ -849,5 +848,8 @@ "复制自": "Kopiera från", "目标列表": "Mållista", "使用翻译": "Använda översättning", - "使用/跳过翻译": "Använd/hoppa över översättning" + "使用/跳过翻译": "Använd/hoppa över översättning", + "prompt格式（需要根据模型版本决定）": "Frågaformat (beroende på modellversion)", + "v0.10pre1（支持gpt词典）": "V0. 10 pre1 (stöder GPT ordbok)", + "输出的内容": "Utdatainnehåll" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/th.json b/LunaTranslator/files/lang/th.json index 75ab4dbf..0bf7bf93 100644 --- a/LunaTranslator/files/lang/th.json +++ b/LunaTranslator/files/lang/th.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "แสดง/ซ่อนการแปลประวัติ", "全屏/恢复游戏窗口": "เต็มหน้าจอ/กู้คืนหน้าต่างเกม", "文本输出": "ข้อความออก", - "自动输出提取的文本": "ส่งออกข้อความที่สกัดโดยอัตโนมัติ", "缩放": "ซูม", "填充": "เติม", "适应": "การปรับตัว", @@ -849,5 +848,8 @@ "复制自": "คัดลอกจาก", "目标列表": "รายการเป้าหมาย", "使用翻译": "ใช้การแปล", - "使用/跳过翻译": "ใช้ / ข้ามการแปล" + "使用/跳过翻译": "ใช้ / ข้ามการแปล", + "prompt格式（需要根据模型版本决定）": "รูปแบบ prompt (ต้องตัดสินใจตามรุ่น)", + "v0.10pre1（支持gpt词典）": "v0.10pre1 (สนับสนุนพจนานุกรม gpt)", + "输出的内容": "เนื้อหาที่ส่งออก" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/tr.json b/LunaTranslator/files/lang/tr.json index 4f91b9d3..8888f76b 100644 --- a/LunaTranslator/files/lang/tr.json +++ b/LunaTranslator/files/lang/tr.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "Tarihi çevirimleri göster/gizle", "全屏/恢复游戏窗口": "Full screen/restore game window", "文本输出": "Metin çıkış", - "自动输出提取的文本": "Automatically output extracted text", "缩放": "zoom", "填充": "dolduruyor", "适应": "adapt", @@ -849,5 +848,8 @@ "复制自": "Kopyalayın", "目标列表": "Hedef Listesi", "使用翻译": "Çeviri kullanılıyor", - "使用/跳过翻译": "Çeviri kullan/atla" + "使用/跳过翻译": "Çeviri kullan/atla", + "prompt格式（需要根据模型版本决定）": "Soru format ı (model versiyonuna bağlı)", + "v0.10pre1（支持gpt词典）": "V0. 10 pre1 (GPT sözlük destekliyor)", + "输出的内容": "Çıkış içeriği" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/uk.json b/LunaTranslator/files/lang/uk.json index 5d0ed808..fc2075bf 100644 --- a/LunaTranslator/files/lang/uk.json +++ b/LunaTranslator/files/lang/uk.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "Показувати/сховати історичні переклади", "全屏/恢复游戏窗口": "Повний екран / відновити вікно гри", "文本输出": "Вивід тексту", - "自动输出提取的文本": "Автоматично виводити вилучений текст", "缩放": "масштаб", "填充": "заповнення", "适应": "адаптувати", @@ -849,5 +848,8 @@ "复制自": "Копіювати з", "目标列表": "Список призначень", "使用翻译": "Використання перекладу", - "使用/跳过翻译": "Використовувати/пропустити переклад" + "使用/跳过翻译": "Використовувати/пропустити переклад", + "prompt格式（需要根据模型版本决定）": "Формат запиту (залежно від версії моделі)", + "v0.10pre1（支持gpt词典）": "V0. 10 pre1 (підтримує словник GPT)", + "输出的内容": "Вміст виводу" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/vi.json b/LunaTranslator/files/lang/vi.json index 36ccebb4..9da56d15 100644 --- a/LunaTranslator/files/lang/vi.json +++ b/LunaTranslator/files/lang/vi.json @@ -579,7 +579,6 @@ "显示/隐藏历史翻译": "Hiện/ẩn bản dịch lịch sử", "全屏/恢复游戏窗口": "Toàn màn hình/Khôi phục cửa sổ trò chơi", "文本输出": "Xuất văn bản", - "自动输出提取的文本": "Tự động xuất văn bản đã trích xuất", "缩放": "Phóng to", "填充": "Điền", "适应": "Điều chỉnh", @@ -849,5 +848,8 @@ "复制自": "Copy từ", "目标列表": "Danh sách mục tiêu", "使用翻译": "Sử dụng bản dịch", - "使用/跳过翻译": "Sử dụng/bỏ qua bản dịch" + "使用/跳过翻译": "Sử dụng/bỏ qua bản dịch", + "prompt格式（需要根据模型版本决定）": "Định dạng prompt (cần được quyết định dựa trên phiên bản model)", + "v0.10pre1（支持gpt词典）": "v0.10pre1 (hỗ trợ từ điển gpt)", + "输出的内容": "Nội dung xuất" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/zh.json b/LunaTranslator/files/lang/zh.json index cf52ccf3..06fdf17c 100644 --- a/LunaTranslator/files/lang/zh.json +++ b/LunaTranslator/files/lang/zh.json @@ -587,7 +587,6 @@ "显示/隐藏历史翻译": "", "全屏/恢复游戏窗口": "", "文本输出": "", - "自动输出提取的文本": "", "缩放": "", "填充": "", "适应": "", @@ -851,5 +850,6 @@ "使用翻译": "", "使用/跳过翻译": "", "prompt格式（需要根据模型版本决定）": "", - "v0.10pre1（支持gpt词典）": "" + "v0.10pre1（支持gpt词典）": "", + "输出的内容": "" } \ No newline at end of file