Unverified Commit 7174a11d authored by dmMaze's avatar dmMaze Committed by GitHub
Browse files

Merge pull request #75 from dmMaze/ocr_selected_textblocks 

Ocr selected textblocks
parents e160e455 86d40a47

CHANGELOG.md

+4 −1
Original line number Diff line number Diff line 
# Changelogs



### 2022-12-30

[v1.3.18](https://github.com/dmMaze/BallonsTranslator/releases/tag/v1.3.18)发布

[v1.3.20](https://github.com/dmMaze/BallonsTranslator/releases/tag/v1.3.20)发布

1. 适应具有极端宽高比的图片比如条漫

2. 支持粘贴到多个选中的文本编辑框

3. 修bug

4. OCR/翻译/修复选中文字区域, 填字样式会继承选中的文字框自己的

   单行文本建议选用ctc_48px, 多行日文选mangocr, 目前对多行其它语言不太行, 需要重新训练检测模型

<img src="doc/src/ocrselected.gif" div align=center>



### 2022-11-29

[v1.3.15](https://github.com/dmMaze/BallonsTranslator/releases/tag/v1.3.15)发布

CHANGELOG_EN.md

+6 −2
Original line number Diff line number Diff line 
# Changelogs



### 2022-12-30

[v1.3.18](https://github.com/dmMaze/BallonsTranslator/releases/tag/v1.3.18) released

### 2022-12-31

[v1.3.20](https://github.com/dmMaze/BallonsTranslator/releases/tag/v1.3.20) released

1. Adapted to images with extreme aspect ratio such as webtoons

2. Support paste text to multiple selected Text blocks.

3. Bugfixes

4. OCR/Translate/Inpaint selected text blocks

   lettering style will inherit from corresponding selected block.

   ctc_48px is more recommended for single line text, mangocr for multi-line Japanese, need to retrain detection model to perform better

<img src="doc/src/ocrselected.gif" div align=center>



### 2022-11-29

[v1.3.15](https://github.com/dmMaze/BallonsTranslator/releases/tag/v1.3.15) released

ballontranslator/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ __appname__ = "BallonTranslator" 
# 1. MAJOR version when you make incompatible API changes;

# 2. MINOR version when you add functionality in a backwards-compatible manner;

# 3. PATCH version when you make backwards-compatible bug fixes.

__version__ = "1.3.19"
 
 No newline at end of file
 
__version__ = "1.3.20"
 
 No newline at end of file

ballontranslator/data/translate/zh_CN.qm

+638 B (11.3 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

ballontranslator/data/translate/zh_CN.ts

+106 −46
Original line number Diff line number Diff line
@@ -52,20 +52,50 @@ 
<context>

    <name>Canvas</name>

    <message>

        <location filename="../../ui/canvas.py" line="488"/>

        <location filename="../../ui/canvas.py" line="543"/>

        <source>Delete</source>

        <translation>删除</translation>

    </message>

    <message>

        <location filename="../../ui/canvas.py" line="489"/>

        <location filename="../../ui/canvas.py" line="545"/>

        <source>Apply font formatting</source>

        <translation>应用字体格式</translation>

    </message>

    <message>

        <location filename="../../ui/canvas.py" line="490"/>

        <location filename="../../ui/canvas.py" line="546"/>

        <source>Auto layout</source>

        <translation>自动排版</translation>

    </message>

    <message>

        <location filename="../../ui/canvas.py" line="541"/>

        <source>Copy</source>

        <translation>复制</translation>

    </message>

    <message>

        <location filename="../../ui/canvas.py" line="542"/>

        <source>Paste</source>

        <translation>粘贴</translation>

    </message>

    <message>

        <location filename="../../ui/canvas.py" line="548"/>

        <source>translate</source>

        <translation>翻译</translation>

    </message>

    <message>

        <location filename="../../ui/canvas.py" line="549"/>

        <source>OCR</source>

        <translation>OCR</translation>

    </message>

    <message>

        <location filename="../../ui/canvas.py" line="550"/>

        <source>OCR and translate</source>

        <translation>OCR并翻译</translation>

    </message>

    <message>

        <location filename="../../ui/canvas.py" line="551"/>

        <source>OCR, translate and inpaint</source>

        <translation>OCR，翻译并抹字</translation>

    </message>

</context>

<context>

    <name>ConfigPanel</name>
@@ -178,7 +208,7 @@ 
<context>

    <name>DLManager</name>

    <message>

        <location filename="../../ui/dl_manager.py" line="654"/>

        <location filename="../../ui/dl_manager.py" line="726"/>

        <source>Invalid</source>

        <translation>不可用</translation>

    </message>
@@ -186,7 +216,7 @@ 
<context>

    <name>DrawingPanel</name>

    <message>

        <location filename="../../ui/drawingpanel.py" line="305"/>

        <location filename="../../ui/drawingpanel.py" line="343"/>

        <source>Mask Transparency</source>

        <translation>掩膜透明度</translation>

    </message>
@@ -366,22 +396,22 @@ 
<context>

    <name>ImgtransProgressMessageBox</name>

    <message>

        <location filename="../../ui/stylewidgets.py" line="142"/>

        <location filename="../../ui/stylewidgets.py" line="120"/>

        <source>Detecting: </source>

        <translation>检测: </translation>

    </message>

    <message>

        <location filename="../../ui/stylewidgets.py" line="143"/>

        <location filename="../../ui/stylewidgets.py" line="121"/>

        <source>OCR: </source>

        <translation>OCR: </translation>

    </message>

    <message>

        <location filename="../../ui/stylewidgets.py" line="144"/>

        <location filename="../../ui/stylewidgets.py" line="122"/>

        <source>Inpainting: </source>

        <translation>修复: </translation>

    </message>

    <message>

        <location filename="../../ui/stylewidgets.py" line="145"/>

        <location filename="../../ui/stylewidgets.py" line="123"/>

        <source>Translating: </source>

        <translation>翻译: </translation>

    </message>
@@ -389,7 +419,7 @@ 
<context>

    <name>ImgtransThread</name>

    <message>

        <location filename="../../ui/dl_manager.py" line="325"/>

        <location filename="../../ui/dl_manager.py" line="365"/>

        <source>Translation Failed.</source>

        <translation>翻译失败.</translation>

    </message>
@@ -427,11 +457,26 @@ 
        <source>pen thickness </source>

        <translation>画笔大小 </translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="76"/>

        <source>Shape</source>

        <translation>形状</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="78"/>

        <source>Circle</source>

        <translation>圆形</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="78"/>

        <source>Rectangle</source>

        <translation>方形</translation>

    </message>

</context>

<context>

    <name>InpaintThread</name>

    <message>

        <location filename="../../ui/dl_manager.py" line="109"/>

        <location filename="../../ui/dl_manager.py" line="113"/>

        <source>Inpainting Failed.</source>

        <translation>修复失败.</translation>

    </message>
@@ -495,27 +540,27 @@ 
<context>

    <name>MainWindow</name>

    <message>

        <location filename="../../ui/mainwindow.py" line="298"/>

        <location filename="../../ui/mainwindow.py" line="308"/>

        <source>Failed to load project </source>

        <translation>项目加载失败 </translation>

    </message>

    <message>

        <location filename="../../ui/mainwindow.py" line="763"/>

        <location filename="../../ui/mainwindow.py" line="791"/>

        <source>unsaved</source>

        <translation>未保存</translation>

    </message>

    <message>

        <location filename="../../ui/mainwindow.py" line="763"/>

        <location filename="../../ui/mainwindow.py" line="791"/>

        <source>saved</source>

        <translation>已保存</translation>

    </message>

    <message>

        <location filename="../../ui/mainwindow.py" line="781"/>

        <location filename="../../ui/mainwindow.py" line="842"/>

        <source>Saving image...</source>

        <translation>保存中...</translation>

    </message>

    <message>

        <location filename="../../ui/mainwindow.py" line="823"/>

        <location filename="../../ui/mainwindow.py" line="884"/>

        <source>Export to </source>

        <translation>导出至 </translation>

    </message>
@@ -523,7 +568,7 @@ 
<context>

    <name>ModuleThread</name>

    <message>

        <location filename="../../ui/dl_manager.py" line="52"/>

        <location filename="../../ui/dl_manager.py" line="55"/>

        <source>Failed to set </source>

        <translation>无法设置 </translation>

    </message>
@@ -604,30 +649,45 @@ 
<context>

    <name>PenConfigPanel</name>

    <message>

        <location filename="../../ui/drawingpanel.py" line="106"/>

        <location filename="../../ui/drawingpanel.py" line="123"/>

        <source>alpha value</source>

        <translation>alpha值</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="113"/>

        <location filename="../../ui/drawingpanel.py" line="131"/>

        <source>Color</source>

        <translation>颜色</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="114"/>

        <location filename="../../ui/drawingpanel.py" line="132"/>

        <source>Alpha</source>

        <translation>Alpha</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="122"/>

        <location filename="../../ui/drawingpanel.py" line="140"/>

        <source>Thickness</source>

        <translation>大小</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="103"/>

        <location filename="../../ui/drawingpanel.py" line="120"/>

        <source>pen thickness </source>

        <translation>画笔大小 </translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="145"/>

        <source>Shape</source>

        <translation>形状</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="147"/>

        <source>Circle</source>

        <translation>圆形</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="147"/>

        <source>Rectangle</source>

        <translation>方形</translation>

    </message>

</context>

<context>

    <name>PresetListWidget</name>
@@ -716,52 +776,52 @@ 
<context>

    <name>RectPanel</name>

    <message>

        <location filename="../../ui/drawingpanel.py" line="166"/>

        <location filename="../../ui/drawingpanel.py" line="202"/>

        <source>method 1</source>

        <translation>方法1</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="166"/>

        <location filename="../../ui/drawingpanel.py" line="202"/>

        <source>method 2</source>

        <translation>方法2</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="167"/>

        <location filename="../../ui/drawingpanel.py" line="203"/>

        <source>Auto</source>

        <translation>自动</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="168"/>

        <location filename="../../ui/drawingpanel.py" line="204"/>

        <source>run inpainting automatically.</source>

        <translation>自动运行修复函数.</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="170"/>

        <location filename="../../ui/drawingpanel.py" line="206"/>

        <source>Inpaint</source>

        <translation>图像修复</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="173"/>

        <location filename="../../ui/drawingpanel.py" line="209"/>

        <source>Delete</source>

        <translation>删除</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="159"/>

        <location filename="../../ui/drawingpanel.py" line="195"/>

        <source>Dilate</source>

        <translation>膨胀</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="160"/>

        <location filename="../../ui/drawingpanel.py" line="196"/>

        <source>kernel size: </source>

        <translation>核大小: </translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="171"/>

        <location filename="../../ui/drawingpanel.py" line="207"/>

        <source>Space</source>

        <translation>空格</translation>

    </message>

    <message>

        <location filename="../../ui/drawingpanel.py" line="174"/>

        <location filename="../../ui/drawingpanel.py" line="210"/>

        <source>Ctrl+D</source>

        <translation></translation>

    </message>
@@ -769,57 +829,57 @@ 
<context>

    <name>TextEffectPanel</name>

    <message>

        <location filename="../../ui/text_graphical_effect.py" line="87"/>

        <location filename="../../ui/text_graphical_effect.py" line="86"/>

        <source>Effect</source>

        <translation>特效</translation>

    </message>

    <message>

        <location filename="../../ui/text_graphical_effect.py" line="96"/>

        <location filename="../../ui/text_graphical_effect.py" line="95"/>

        <source>Opacity</source>

        <translation>不透明度</translation>

    </message>

    <message>

        <location filename="../../ui/text_graphical_effect.py" line="102"/>

        <location filename="../../ui/text_graphical_effect.py" line="101"/>

        <source>Shadow</source>

        <translation>阴影</translation>

    </message>

    <message>

        <location filename="../../ui/text_graphical_effect.py" line="105"/>

        <location filename="../../ui/text_graphical_effect.py" line="104"/>

        <source>Change shadow color</source>

        <translation>修改阴影颜色</translation>

    </message>

    <message>

        <location filename="../../ui/text_graphical_effect.py" line="119"/>

        <location filename="../../ui/text_graphical_effect.py" line="118"/>

        <source>Apply</source>

        <translation>应用</translation>

    </message>

    <message>

        <location filename="../../ui/text_graphical_effect.py" line="121"/>

        <location filename="../../ui/text_graphical_effect.py" line="120"/>

        <source>Cancel</source>

        <translation>取消</translation>

    </message>

    <message>

        <location filename="../../ui/text_graphical_effect.py" line="97"/>

        <location filename="../../ui/text_graphical_effect.py" line="96"/>

        <source>Opacity: </source>

        <translation>不透明度: </translation>

    </message>

    <message>

        <location filename="../../ui/text_graphical_effect.py" line="106"/>

        <location filename="../../ui/text_graphical_effect.py" line="105"/>

        <source>radius: </source>

        <translation>半径: </translation>

    </message>

    <message>

        <location filename="../../ui/text_graphical_effect.py" line="109"/>

        <location filename="../../ui/text_graphical_effect.py" line="108"/>

        <source>strength: </source>

        <translation>强度: </translation>

    </message>

    <message>

        <location filename="../../ui/text_graphical_effect.py" line="112"/>

        <location filename="../../ui/text_graphical_effect.py" line="111"/>

        <source>x offset: </source>

        <translation>x偏移: </translation>

    </message>

    <message>

        <location filename="../../ui/text_graphical_effect.py" line="115"/>

        <location filename="../../ui/text_graphical_effect.py" line="114"/>

        <source>y offset: </source>

        <translation>y偏移: </translation>

    </message>
@@ -923,17 +983,17 @@ 
        <translation type="obsolete">支持语言列表: </translation>

    </message>

    <message>

        <location filename="../../ui/dl_manager.py" line="170"/>

        <location filename="../../ui/dl_manager.py" line="175"/>

        <source>Failed to set translator </source>

        <translation>翻译器设置失败 </translation>

    </message>

    <message>

        <location filename="../../ui/dl_manager.py" line="225"/>

        <location filename="../../ui/dl_manager.py" line="230"/>

        <source> is required for </source>

        <translation>是翻译器必填项</translation>

    </message>

    <message>

        <location filename="../../ui/dl_manager.py" line="223"/>

        <location filename="../../ui/dl_manager.py" line="228"/>

        <source>Translation Failed.</source>

        <translation>翻译失败.</translation>

    </message>