From 49b338b1f9ee17b09b9e82087ae9fee5b044d77c Mon Sep 17 00:00:00 2001
From: 910JQK <v910JQK@gmail.com>
Date: Sun, 2 Feb 2014 19:22:15 +0800
Subject: [PATCH 1/3] Add support for sH5V positioned comment

---
 danmaku2ass.py                          |  63 ++++++++++++++++++++-
 locale/en/LC_MESSAGES/danmaku2ass.mo    | Bin 1647 -> 1647 bytes
 locale/en/LC_MESSAGES/danmaku2ass.po    |  72 ++++++++++++------------
 locale/ja/LC_MESSAGES/danmaku2ass.mo    | Bin 1871 -> 1871 bytes
 locale/ja/LC_MESSAGES/danmaku2ass.po    |  72 ++++++++++++------------
 locale/zh_CN/LC_MESSAGES/danmaku2ass.mo | Bin 1617 -> 1617 bytes
 locale/zh_CN/LC_MESSAGES/danmaku2ass.po |  72 ++++++++++++------------
 locale/zh_TW/LC_MESSAGES/danmaku2ass.mo | Bin 1635 -> 1635 bytes
 locale/zh_TW/LC_MESSAGES/danmaku2ass.po |  72 ++++++++++++------------
 9 files changed, 204 insertions(+), 147 deletions(-)

diff --git a/danmaku2ass.py b/danmaku2ass.py
index 5b45147..1876566 100755
--- a/danmaku2ass.py
+++ b/danmaku2ass.py
@@ -219,7 +219,18 @@ def ReadCommentsSH5V(f, fontsize):
             c_color = str(comment['color'])
             c = str(comment['text'])
             size = fontsize
-            yield (float(c_at), int(c_date), i, c, {'0': 0, '1': 0, '4': 2, '5': 1}[c_type], int(c_color[1:], 16), size, (c.count('\n')+1)*size, CalculateLength(c)*size)
+            if c_type != '7':
+                yield (float(c_at), int(c_date), i, c, {'0': 0, '1': 0, '4': 2, '5': 1}[c_type], int(c_color[1:], 16), size, (c.count('\n')+1)*size, CalculateLength(c)*size)
+            else:
+                c_x = float(comment['x'])
+                c_y = float(comment['y'])
+                size = int(comment['size'])
+                dur = int(comment['dur'])
+                data1 = float(comment['data1'])
+                data2 = float(comment['data2'])
+                data3 = int(comment['data3'])
+                data4 = int(comment['data4'])
+                yield (float(c_at), int(c_date), i, c, 'sH5Vpos', int(c_color[1:], 16), size, 0, 0, c_x, c_y, dur, data1, data2, data3, data4)
         except (AssertionError, AttributeError, IndexError, TypeError, ValueError):
             logging.warning(_('Invalid comment: %r') % comment)
             continue
@@ -307,7 +318,6 @@ def WriteCommentBilibiliPositioned(f, c, width, height, styleid):
         except IndexError:
             logging.warning(_('Invalid comment: %r') % c)
 
-
 def WriteCommentAcfunPositioned(f, c, width, height, styleid):
     AcfunPlayerSize = (560, 400)
     ZoomFactor = GetZoomFactor(AcfunPlayerSize, (width, height))
@@ -425,6 +435,52 @@ def WriteCommentAcfunPositioned(f, c, width, height, styleid):
     except (IndexError, ValueError) as e:
         logging.warning(_('Invalid comment: %r') % c[3])
 
+def WriteCommentSH5VPositioned(f, c, width, height, styleid):
+
+    def GetTransformStyles(x=None, y=None, fsize=None, rotate_z=None, rotate_y=None, color=None, alpha=None):
+        styles = []
+        if x is not None and y is not None:
+            styles.append('\\pos(%s, %s)' % (x, y))
+        if fsize is not None:
+            styles.append('\\fs%s' % fsize)
+        if rotate_y is not None and rotate_z is not None:
+            styles.append('\\frz%s' % round(rotate_z))
+            if not (-1 < rotate_z < 1):
+                styles.append('\\frx%s' % round(rotate_y*math.sin(rotate_z*math.pi/180.0)))
+                styles.append('\\fry%s' % round(rotate_y*math.cos(rotate_z*math.pi/180.0)))
+            else:
+                styles.append('\\fry%s' % round(rotate_y))
+        if color is not None:
+            styles.append('\\c&H%02X%02X%02X&' % (color & 0xff, (color >> 8) & 0xff, (color >> 16) & 0xff))
+            if color == 0x000000:
+                styles.append('\\3c&HFFFFFF&')
+        if alpha is not None:
+            alpha = 255-round(alpha*255)
+            styles.append('\\alpha&H%02X' % alpha)
+        return styles
+
+    def FlushCommentLine(f, text, styles, start_time, end_time, styleid):
+        if end_time > start_time:
+            f.write('Dialogue: -1,%(start)s,%(end)s,%(styleid)s,,0,0,0,,{%(styles)s}%(text)s\n' % {'start': ConvertTimestamp(start_time), 'end': ConvertTimestamp(end_time), 'styles': ''.join(styles), 'text': text, 'styleid': styleid})
+
+    try:
+        text = ASSEscape(str(c[3]))
+        to_x = round(float(c[9])*width)
+        to_y = round(float(c[10])*height)
+        to_rotate_z = -int(c[14])
+        to_rotate_y = -int(c[15])
+        to_color = c[5]
+        to_alpha = float(c[12])
+        #Note: Alpha transition hasn't been worked out yet.
+        to_size = round(int(c[6])*math.sqrt(width*height/307200))
+        #Note: Because sH5V's data is the absolute size of font,temporarily solve by it at present.[*math.sqrt(width/640*height/480)]
+        #But it seems to be working fine...
+        from_time = float(c[0])
+        action_time = float(c[11])/1000
+        transform_styles = GetTransformStyles(to_x, to_y, to_size, to_rotate_z, to_rotate_y, to_color, to_alpha)
+        FlushCommentLine(f, text, transform_styles, from_time, from_time+action_time, styleid)
+    except (IndexError, ValueError) as e:
+        logging.warning(_('Invalid comment: %r') % c[3])
 
 # Result: (f, dx, dy)
 # To convert: NewX = f*x+dx, NewY = f*y+dy
@@ -451,7 +507,6 @@ def GetZoomFactor(SourceSize, TargetSize):
         GetZoomFactor.Cached_Result = (1, 0, 0)
         return GetZoomFactor.Cached_Result
 
-
 def ProcessComments(comments, f, width, height, bottomReserved, fontface, fontsize, alpha, lifetime, reduced, progress_callback):
     styleid = 'Danmaku2ASS_%04x' % random.randint(0, 0xffff)
     WriteASSHead(f, width, height, fontface, fontsize, alpha, styleid)
@@ -479,6 +534,8 @@ def ProcessComments(comments, f, width, height, bottomReserved, fontface, fontsi
             WriteCommentBilibiliPositioned(f, i, width, height, styleid)
         elif i[4] == 'acfunpos':
             WriteCommentAcfunPositioned(f, i, width, height, styleid)
+        elif i[4] == 'sH5Vpos':
+            WriteCommentSH5VPositioned(f, i, width, height, styleid)
         else:
             logging.warning(_('Invalid comment: %r') % i[3])
     if progress_callback:
diff --git a/locale/en/LC_MESSAGES/danmaku2ass.mo b/locale/en/LC_MESSAGES/danmaku2ass.mo
index c140bf94a51d7277cb4bd9a6b0c8ab58222f2895..27b3331372d2eb610532bbe18b95b9c0ee69de50 100644
GIT binary patch
delta 26
gcmaFQ^PXn|Hw&+cu7ME{DHvK<nHp}EU<qde0Ay_jW&i*H

delta 26
hcmaFQ^PXn|Hw&+^uA!l>k%@w#sg<$8W(k&XCIDn#24esK

diff --git a/locale/en/LC_MESSAGES/danmaku2ass.po b/locale/en/LC_MESSAGES/danmaku2ass.po
index 4bf2f4e..381f4e9 100644
--- a/locale/en/LC_MESSAGES/danmaku2ass.po
+++ b/locale/en/LC_MESSAGES/danmaku2ass.po
@@ -2,105 +2,105 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Danmaku2ASS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 15:30+0800\n"
+"POT-Creation-Date: 2014-02-02 18:51+0800\n"
 "Last-Translator: Star Brilliant <m13253@hotmail.com>\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: danmaku2ass.py:130 danmaku2ass.py:165 danmaku2ass.py:195
+#: danmaku2ass.py:139 danmaku2ass.py:178 danmaku2ass.py:208
 #, python-format
 msgid "Invalid comment: %s"
 msgstr "Invalid comment: %s"
 
-#: danmaku2ass.py:145 danmaku2ass.py:179 danmaku2ass.py:211 danmaku2ass.py:317
-#: danmaku2ass.py:319 danmaku2ass.py:348
+#: danmaku2ass.py:158 danmaku2ass.py:192 danmaku2ass.py:235 danmaku2ass.py:317
+#: danmaku2ass.py:319 danmaku2ass.py:436 danmaku2ass.py:483 danmaku2ass.py:540
 #, python-format
 msgid "Invalid comment: %r"
 msgstr "Invalid comment: %r"
 
-#: danmaku2ass.py:496 danmaku2ass.py:539
+#: danmaku2ass.py:690 danmaku2ass.py:738
 msgid "(FONT) sans-serif"
 msgstr "(FONT) Helvetica"
 
-#: danmaku2ass.py:522
+#: danmaku2ass.py:719
 #, python-format
 msgid "Unknown comment file format: %s"
 msgstr "Unknown comment file format: %s"
 
-#: danmaku2ass.py:537
+#: danmaku2ass.py:736
 msgid "OUTPUT"
 msgstr "OUTPUT"
 
-#: danmaku2ass.py:537
+#: danmaku2ass.py:736
 msgid "Output file"
 msgstr "Output file"
 
-#: danmaku2ass.py:538
-msgid "Stage size in pixels"
-msgstr "Stage size in pixels"
-
-#: danmaku2ass.py:538
+#: danmaku2ass.py:737
 msgid "WIDTHxHEIGHT"
 msgstr "WIDTHxHEIGHT"
 
-#: danmaku2ass.py:539
+#: danmaku2ass.py:737
+msgid "Stage size in pixels"
+msgstr "Stage size in pixels"
+
+#: danmaku2ass.py:738
 msgid "FONT"
 msgstr "FONT"
 
-#: danmaku2ass.py:539
+#: danmaku2ass.py:738
 #, python-format
 msgid "Specify font face [default: %s]"
 msgstr "Specify font face [default: %s]"
 
-#: danmaku2ass.py:540
+#: danmaku2ass.py:739
+msgid "SIZE"
+msgstr "SIZE"
+
+#: danmaku2ass.py:739
 #, python-format
 msgid "Default font size [default: %s]"
 msgstr "Default font size [default: %s]"
 
-#: danmaku2ass.py:540
-msgid "SIZE"
-msgstr "SIZE"
-
-#: danmaku2ass.py:541
+#: danmaku2ass.py:740
 msgid "ALPHA"
 msgstr "ALPHA"
 
-#: danmaku2ass.py:541
+#: danmaku2ass.py:740
 msgid "Text opaque"
 msgstr "Text opaque"
 
-#: danmaku2ass.py:542
+#: danmaku2ass.py:741
+msgid "SECONDS"
+msgstr "SECONDS"
+
+#: danmaku2ass.py:741
 #, python-format
 msgid "Duration of comment display [default: %s]"
 msgstr "Duration of comment display [default: %s]"
 
-#: danmaku2ass.py:542
-msgid "SECONDS"
-msgstr "SECONDS"
-
-#: danmaku2ass.py:543
+#: danmaku2ass.py:742
 msgid "HEIGHT"
 msgstr "HEIGHT"
 
-#: danmaku2ass.py:543
+#: danmaku2ass.py:742
 msgid "Reserve blank on the bottom of the stage"
 msgstr "Reserve blank on the bottom of the stage"
 
-#: danmaku2ass.py:544
+#: danmaku2ass.py:743
 msgid "Reduce the amount of comments if stage is full"
 msgstr "Reduce the amount of comments if stage is full"
 
-#: danmaku2ass.py:545
-msgid "Comment file to be processed"
-msgstr "Comment file to be processed"
-
-#: danmaku2ass.py:545
+#: danmaku2ass.py:744
 msgid "FILE"
 msgstr "FILE"
 
-#: danmaku2ass.py:552
+#: danmaku2ass.py:744
+msgid "Comment file to be processed"
+msgstr "Comment file to be processed"
+
+#: danmaku2ass.py:751
 #, python-format
 msgid "Invalid stage size: %r"
 msgstr "Invalid stage size: %r"
diff --git a/locale/ja/LC_MESSAGES/danmaku2ass.mo b/locale/ja/LC_MESSAGES/danmaku2ass.mo
index 5caef5ea31d1d0a67137a94471f7573e128bd5ff..e9df78be3663c46e93393087544c59148c9defea 100644
GIT binary patch
delta 26
gcmX@lcb;zpHw&+cu7ME{DHvK<nHp}EU@>O~0A5Z83jhEB

delta 26
hcmX@lcb;zpHw&+^uA!l>k%@w#sg<$8W(gK^W&mD51_%HE

diff --git a/locale/ja/LC_MESSAGES/danmaku2ass.po b/locale/ja/LC_MESSAGES/danmaku2ass.po
index 989fa6d..816d6ef 100644
--- a/locale/ja/LC_MESSAGES/danmaku2ass.po
+++ b/locale/ja/LC_MESSAGES/danmaku2ass.po
@@ -2,105 +2,105 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Danmaku2ASS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 15:30+0800\n"
+"POT-Creation-Date: 2014-02-02 18:51+0800\n"
 "Last-Translator: Star Brilliant <m13253@hotmail.com>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: danmaku2ass.py:130 danmaku2ass.py:165 danmaku2ass.py:195
+#: danmaku2ass.py:139 danmaku2ass.py:178 danmaku2ass.py:208
 #, python-format
 msgid "Invalid comment: %s"
 msgstr "無効なコメント：%s"
 
-#: danmaku2ass.py:145 danmaku2ass.py:179 danmaku2ass.py:211 danmaku2ass.py:317
-#: danmaku2ass.py:319 danmaku2ass.py:348
+#: danmaku2ass.py:158 danmaku2ass.py:192 danmaku2ass.py:235 danmaku2ass.py:317
+#: danmaku2ass.py:319 danmaku2ass.py:436 danmaku2ass.py:483 danmaku2ass.py:540
 #, python-format
 msgid "Invalid comment: %r"
 msgstr "無効なコメント：%r"
 
-#: danmaku2ass.py:496 danmaku2ass.py:539
+#: danmaku2ass.py:690 danmaku2ass.py:738
 msgid "(FONT) sans-serif"
 msgstr "(FONT) MS PGothic"
 
-#: danmaku2ass.py:522
+#: danmaku2ass.py:719
 #, python-format
 msgid "Unknown comment file format: %s"
 msgstr "未知のコメントファイル形式：%s"
 
-#: danmaku2ass.py:537
+#: danmaku2ass.py:736
 msgid "OUTPUT"
 msgstr "出力"
 
-#: danmaku2ass.py:537
+#: danmaku2ass.py:736
 msgid "Output file"
 msgstr "出力ファイル"
 
-#: danmaku2ass.py:538
-msgid "Stage size in pixels"
-msgstr "ピクセル単位でステージのサイズ"
-
-#: danmaku2ass.py:538
+#: danmaku2ass.py:737
 msgid "WIDTHxHEIGHT"
 msgstr "幅x高"
 
-#: danmaku2ass.py:539
+#: danmaku2ass.py:737
+msgid "Stage size in pixels"
+msgstr "ピクセル単位でステージのサイズ"
+
+#: danmaku2ass.py:738
 msgid "FONT"
 msgstr "フォント"
 
-#: danmaku2ass.py:539
+#: danmaku2ass.py:738
 #, python-format
 msgid "Specify font face [default: %s]"
 msgstr "フォントを指定する [デフォルト: %s]"
 
-#: danmaku2ass.py:540
+#: danmaku2ass.py:739
+msgid "SIZE"
+msgstr "サイズ"
+
+#: danmaku2ass.py:739
 #, python-format
 msgid "Default font size [default: %s]"
 msgstr "デフォルトのフォントサイズ [デフォルト: %s]"
 
-#: danmaku2ass.py:540
-msgid "SIZE"
-msgstr "サイズ"
-
-#: danmaku2ass.py:541
+#: danmaku2ass.py:740
 msgid "ALPHA"
 msgstr "アルファ"
 
-#: danmaku2ass.py:541
+#: danmaku2ass.py:740
 msgid "Text opaque"
 msgstr "テキストの不透明度"
 
-#: danmaku2ass.py:542
+#: danmaku2ass.py:741
+msgid "SECONDS"
+msgstr "秒数"
+
+#: danmaku2ass.py:741
 #, python-format
 msgid "Duration of comment display [default: %s]"
 msgstr "コメント表示の時間 [デフォルト: %s]"
 
-#: danmaku2ass.py:542
-msgid "SECONDS"
-msgstr "秒数"
-
-#: danmaku2ass.py:543
+#: danmaku2ass.py:742
 msgid "HEIGHT"
 msgstr "高度"
 
-#: danmaku2ass.py:543
+#: danmaku2ass.py:742
 msgid "Reserve blank on the bottom of the stage"
 msgstr "ステージの下にブランクを予備する"
 
-#: danmaku2ass.py:544
+#: danmaku2ass.py:743
 msgid "Reduce the amount of comments if stage is full"
 msgstr "ステージがいっぱいになったのときにコメントの量を減らす"
 
-#: danmaku2ass.py:545
-msgid "Comment file to be processed"
-msgstr "ファイルが処理されるコメント"
-
-#: danmaku2ass.py:545
+#: danmaku2ass.py:744
 msgid "FILE"
 msgstr "ファイル"
 
-#: danmaku2ass.py:552
+#: danmaku2ass.py:744
+msgid "Comment file to be processed"
+msgstr "ファイルが処理されるコメント"
+
+#: danmaku2ass.py:751
 #, python-format
 msgid "Invalid stage size: %r"
 msgstr "無効なステージサイズ：%r"
diff --git a/locale/zh_CN/LC_MESSAGES/danmaku2ass.mo b/locale/zh_CN/LC_MESSAGES/danmaku2ass.mo
index 371db40a5636c7babd40b27d45d5b61588f8b68c..742735ab8072f1ac4200f5f5f213f5237cb5582e 100644
GIT binary patch
delta 26
gcmcb}bCG8QHw&+cu7ME{DHvK<nHp}EV6kKZ0A5uF3;+NC

delta 26
hcmcb}bCG8QHw&+^uA!l>k%@w#sg<$8W(gKcCIDVX1_=NF

diff --git a/locale/zh_CN/LC_MESSAGES/danmaku2ass.po b/locale/zh_CN/LC_MESSAGES/danmaku2ass.po
index 6f2db4c..20afdfb 100644
--- a/locale/zh_CN/LC_MESSAGES/danmaku2ass.po
+++ b/locale/zh_CN/LC_MESSAGES/danmaku2ass.po
@@ -2,105 +2,105 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Danmaku2ASS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 15:30+0800\n"
+"POT-Creation-Date: 2014-02-02 18:51+0800\n"
 "Last-Translator: Star Brilliant <m13253@hotmail.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: danmaku2ass.py:130 danmaku2ass.py:165 danmaku2ass.py:195
+#: danmaku2ass.py:139 danmaku2ass.py:178 danmaku2ass.py:208
 #, python-format
 msgid "Invalid comment: %s"
 msgstr "无效弹幕：%s"
 
-#: danmaku2ass.py:145 danmaku2ass.py:179 danmaku2ass.py:211 danmaku2ass.py:317
-#: danmaku2ass.py:319 danmaku2ass.py:348
+#: danmaku2ass.py:158 danmaku2ass.py:192 danmaku2ass.py:235 danmaku2ass.py:317
+#: danmaku2ass.py:319 danmaku2ass.py:436 danmaku2ass.py:483 danmaku2ass.py:540
 #, python-format
 msgid "Invalid comment: %r"
 msgstr "无效弹幕：%r"
 
-#: danmaku2ass.py:496 danmaku2ass.py:539
+#: danmaku2ass.py:690 danmaku2ass.py:738
 msgid "(FONT) sans-serif"
 msgstr "(FONT) SimHei"
 
-#: danmaku2ass.py:522
+#: danmaku2ass.py:719
 #, python-format
 msgid "Unknown comment file format: %s"
 msgstr "未知的弹幕文件格式：%s"
 
-#: danmaku2ass.py:537
+#: danmaku2ass.py:736
 msgid "OUTPUT"
 msgstr "输出"
 
-#: danmaku2ass.py:537
+#: danmaku2ass.py:736
 msgid "Output file"
 msgstr "输出文件"
 
-#: danmaku2ass.py:538
-msgid "Stage size in pixels"
-msgstr "舞台尺寸的像素数目"
-
-#: danmaku2ass.py:538
+#: danmaku2ass.py:737
 msgid "WIDTHxHEIGHT"
 msgstr "宽x高"
 
-#: danmaku2ass.py:539
+#: danmaku2ass.py:737
+msgid "Stage size in pixels"
+msgstr "舞台尺寸的像素数目"
+
+#: danmaku2ass.py:738
 msgid "FONT"
 msgstr "字体"
 
-#: danmaku2ass.py:539
+#: danmaku2ass.py:738
 #, python-format
 msgid "Specify font face [default: %s]"
 msgstr "指定字体名称 [默认: %s]"
 
-#: danmaku2ass.py:540
+#: danmaku2ass.py:739
+msgid "SIZE"
+msgstr "尺寸"
+
+#: danmaku2ass.py:739
 #, python-format
 msgid "Default font size [default: %s]"
 msgstr "默认字号 [默认: %s]"
 
-#: danmaku2ass.py:540
-msgid "SIZE"
-msgstr "尺寸"
-
-#: danmaku2ass.py:541
+#: danmaku2ass.py:740
 msgid "ALPHA"
 msgstr "ALPHA"
 
-#: danmaku2ass.py:541
+#: danmaku2ass.py:740
 msgid "Text opaque"
 msgstr "文字不透明度"
 
-#: danmaku2ass.py:542
+#: danmaku2ass.py:741
+msgid "SECONDS"
+msgstr "秒数"
+
+#: danmaku2ass.py:741
 #, python-format
 msgid "Duration of comment display [default: %s]"
 msgstr "弹幕显示时长 [默认: %s]"
 
-#: danmaku2ass.py:542
-msgid "SECONDS"
-msgstr "秒数"
-
-#: danmaku2ass.py:543
+#: danmaku2ass.py:742
 msgid "HEIGHT"
 msgstr "高度"
 
-#: danmaku2ass.py:543
+#: danmaku2ass.py:742
 msgid "Reserve blank on the bottom of the stage"
 msgstr "在舞台底部预留空位"
 
-#: danmaku2ass.py:544
+#: danmaku2ass.py:743
 msgid "Reduce the amount of comments if stage is full"
 msgstr "在舞台满时减少弹幕数量"
 
-#: danmaku2ass.py:545
-msgid "Comment file to be processed"
-msgstr "将要处理的弹幕文件"
-
-#: danmaku2ass.py:545
+#: danmaku2ass.py:744
 msgid "FILE"
 msgstr "文件"
 
-#: danmaku2ass.py:552
+#: danmaku2ass.py:744
+msgid "Comment file to be processed"
+msgstr "将要处理的弹幕文件"
+
+#: danmaku2ass.py:751
 #, python-format
 msgid "Invalid stage size: %r"
 msgstr "无效舞台尺寸：%r"
diff --git a/locale/zh_TW/LC_MESSAGES/danmaku2ass.mo b/locale/zh_TW/LC_MESSAGES/danmaku2ass.mo
index 0bfcf1ed8e9c66cd2b31a559694904a532fd1445..6a22c73920a2c17212db702947cd0f41e2c0adc3 100644
GIT binary patch
delta 26
gcmaFN^O$D?Hw&+cu7ME{DHvK<nHp}EVDV-G0Ac+GLI3~&

delta 26
hcmaFN^O$D?Hw&+^uA!l>k%@w#sg<$8W(gK=CIDgY20s7*

diff --git a/locale/zh_TW/LC_MESSAGES/danmaku2ass.po b/locale/zh_TW/LC_MESSAGES/danmaku2ass.po
index cd46491..124d802 100644
--- a/locale/zh_TW/LC_MESSAGES/danmaku2ass.po
+++ b/locale/zh_TW/LC_MESSAGES/danmaku2ass.po
@@ -2,105 +2,105 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Danmaku2ASS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 15:30+0800\n"
+"POT-Creation-Date: 2014-02-02 18:51+0800\n"
 "Last-Translator: Star Brilliant <m13253@hotmail.com>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: danmaku2ass.py:130 danmaku2ass.py:165 danmaku2ass.py:195
+#: danmaku2ass.py:139 danmaku2ass.py:178 danmaku2ass.py:208
 #, python-format
 msgid "Invalid comment: %s"
 msgstr "無效彈幕：%s"
 
-#: danmaku2ass.py:145 danmaku2ass.py:179 danmaku2ass.py:211 danmaku2ass.py:317
-#: danmaku2ass.py:319 danmaku2ass.py:348
+#: danmaku2ass.py:158 danmaku2ass.py:192 danmaku2ass.py:235 danmaku2ass.py:317
+#: danmaku2ass.py:319 danmaku2ass.py:436 danmaku2ass.py:483 danmaku2ass.py:540
 #, python-format
 msgid "Invalid comment: %r"
 msgstr "無效彈幕：%r"
 
-#: danmaku2ass.py:496 danmaku2ass.py:539
+#: danmaku2ass.py:690 danmaku2ass.py:738
 msgid "(FONT) sans-serif"
 msgstr "(FONT) Microsoft JhengHei"
 
-#: danmaku2ass.py:522
+#: danmaku2ass.py:719
 #, python-format
 msgid "Unknown comment file format: %s"
 msgstr "未知的彈幕檔案格式：%s"
 
-#: danmaku2ass.py:537
+#: danmaku2ass.py:736
 msgid "OUTPUT"
 msgstr "輸出"
 
-#: danmaku2ass.py:537
+#: danmaku2ass.py:736
 msgid "Output file"
 msgstr "輸出檔案"
 
-#: danmaku2ass.py:538
-msgid "Stage size in pixels"
-msgstr "舞臺尺寸的畫素數目"
-
-#: danmaku2ass.py:538
+#: danmaku2ass.py:737
 msgid "WIDTHxHEIGHT"
 msgstr "寬x高"
 
-#: danmaku2ass.py:539
+#: danmaku2ass.py:737
+msgid "Stage size in pixels"
+msgstr "舞臺尺寸的畫素數目"
+
+#: danmaku2ass.py:738
 msgid "FONT"
 msgstr "字型"
 
-#: danmaku2ass.py:539
+#: danmaku2ass.py:738
 #, python-format
 msgid "Specify font face [default: %s]"
 msgstr "指定字型名稱 [默認: %s]"
 
-#: danmaku2ass.py:540
+#: danmaku2ass.py:739
+msgid "SIZE"
+msgstr "尺寸"
+
+#: danmaku2ass.py:739
 #, python-format
 msgid "Default font size [default: %s]"
 msgstr "默認字型大小 [默認: %s]"
 
-#: danmaku2ass.py:540
-msgid "SIZE"
-msgstr "尺寸"
-
-#: danmaku2ass.py:541
+#: danmaku2ass.py:740
 msgid "ALPHA"
 msgstr "ALPHA"
 
-#: danmaku2ass.py:541
+#: danmaku2ass.py:740
 msgid "Text opaque"
 msgstr "文字不透明度"
 
-#: danmaku2ass.py:542
+#: danmaku2ass.py:741
+msgid "SECONDS"
+msgstr "秒數"
+
+#: danmaku2ass.py:741
 #, python-format
 msgid "Duration of comment display [default: %s]"
 msgstr "彈幕顯示時長 [默認: %s]"
 
-#: danmaku2ass.py:542
-msgid "SECONDS"
-msgstr "秒數"
-
-#: danmaku2ass.py:543
+#: danmaku2ass.py:742
 msgid "HEIGHT"
 msgstr "高度"
 
-#: danmaku2ass.py:543
+#: danmaku2ass.py:742
 msgid "Reserve blank on the bottom of the stage"
 msgstr "在舞臺底部預留空位"
 
-#: danmaku2ass.py:544
+#: danmaku2ass.py:743
 msgid "Reduce the amount of comments if stage is full"
 msgstr "在舞臺滿時減少彈幕數量"
 
-#: danmaku2ass.py:545
-msgid "Comment file to be processed"
-msgstr "將要處理的彈幕檔案"
-
-#: danmaku2ass.py:545
+#: danmaku2ass.py:744
 msgid "FILE"
 msgstr "檔案"
 
-#: danmaku2ass.py:552
+#: danmaku2ass.py:744
+msgid "Comment file to be processed"
+msgstr "將要處理的彈幕檔案"
+
+#: danmaku2ass.py:751
 #, python-format
 msgid "Invalid stage size: %r"
 msgstr "無效舞臺尺寸：%r"

From 0aad472e48db72e784b12d99808a2acfc5313345 Mon Sep 17 00:00:00 2001
From: 910JQK <v910JQK@gmail.com>
Date: Mon, 3 Feb 2014 16:54:30 +0800
Subject: [PATCH 2/3] Solve rotate problem and re-add space line

---
 danmaku2ass.py                          |   8 ++---
 locale/en/LC_MESSAGES/danmaku2ass.mo    | Bin 1647 -> 1647 bytes
 locale/en/LC_MESSAGES/danmaku2ass.po    |  44 ++++++++++++------------
 locale/ja/LC_MESSAGES/danmaku2ass.mo    | Bin 1871 -> 1871 bytes
 locale/ja/LC_MESSAGES/danmaku2ass.po    |  44 ++++++++++++------------
 locale/zh_CN/LC_MESSAGES/danmaku2ass.mo | Bin 1617 -> 1617 bytes
 locale/zh_CN/LC_MESSAGES/danmaku2ass.po |  44 ++++++++++++------------
 locale/zh_TW/LC_MESSAGES/danmaku2ass.mo | Bin 1635 -> 1635 bytes
 locale/zh_TW/LC_MESSAGES/danmaku2ass.po |  44 ++++++++++++------------
 9 files changed, 91 insertions(+), 93 deletions(-)

diff --git a/danmaku2ass.py b/danmaku2ass.py
index 1876566..93f8943 100755
--- a/danmaku2ass.py
+++ b/danmaku2ass.py
@@ -318,6 +318,7 @@ def WriteCommentBilibiliPositioned(f, c, width, height, styleid):
         except IndexError:
             logging.warning(_('Invalid comment: %r') % c)
 
+
 def WriteCommentAcfunPositioned(f, c, width, height, styleid):
     AcfunPlayerSize = (560, 400)
     ZoomFactor = GetZoomFactor(AcfunPlayerSize, (width, height))
@@ -445,11 +446,7 @@ def WriteCommentSH5VPositioned(f, c, width, height, styleid):
             styles.append('\\fs%s' % fsize)
         if rotate_y is not None and rotate_z is not None:
             styles.append('\\frz%s' % round(rotate_z))
-            if not (-1 < rotate_z < 1):
-                styles.append('\\frx%s' % round(rotate_y*math.sin(rotate_z*math.pi/180.0)))
-                styles.append('\\fry%s' % round(rotate_y*math.cos(rotate_z*math.pi/180.0)))
-            else:
-                styles.append('\\fry%s' % round(rotate_y))
+            styles.append('\\fry%s' % round(rotate_y))
         if color is not None:
             styles.append('\\c&H%02X%02X%02X&' % (color & 0xff, (color >> 8) & 0xff, (color >> 16) & 0xff))
             if color == 0x000000:
@@ -507,6 +504,7 @@ def GetZoomFactor(SourceSize, TargetSize):
         GetZoomFactor.Cached_Result = (1, 0, 0)
         return GetZoomFactor.Cached_Result
 
+
 def ProcessComments(comments, f, width, height, bottomReserved, fontface, fontsize, alpha, lifetime, reduced, progress_callback):
     styleid = 'Danmaku2ASS_%04x' % random.randint(0, 0xffff)
     WriteASSHead(f, width, height, fontface, fontsize, alpha, styleid)
diff --git a/locale/en/LC_MESSAGES/danmaku2ass.mo b/locale/en/LC_MESSAGES/danmaku2ass.mo
index 27b3331372d2eb610532bbe18b95b9c0ee69de50..23849ca883810b93ac835096f3a50f446f8c5343 100644
GIT binary patch
delta 20
bcmaFQ^PXpeAPc*(f}xp}sljFmmT)EjLSh9(

delta 20
bcmaFQ^PXpeAPc*Zf}w?#so`b`mT)EjLT&{{

diff --git a/locale/en/LC_MESSAGES/danmaku2ass.po b/locale/en/LC_MESSAGES/danmaku2ass.po
index 381f4e9..5ad507a 100644
--- a/locale/en/LC_MESSAGES/danmaku2ass.po
+++ b/locale/en/LC_MESSAGES/danmaku2ass.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Danmaku2ASS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 18:51+0800\n"
+"POT-Creation-Date: 2014-02-03 16:50+0800\n"
 "Last-Translator: Star Brilliant <m13253@hotmail.com>\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
@@ -15,92 +15,92 @@ msgid "Invalid comment: %s"
 msgstr "Invalid comment: %s"
 
 #: danmaku2ass.py:158 danmaku2ass.py:192 danmaku2ass.py:235 danmaku2ass.py:317
-#: danmaku2ass.py:319 danmaku2ass.py:436 danmaku2ass.py:483 danmaku2ass.py:540
+#: danmaku2ass.py:319 danmaku2ass.py:437 danmaku2ass.py:480 danmaku2ass.py:538
 #, python-format
 msgid "Invalid comment: %r"
 msgstr "Invalid comment: %r"
 
-#: danmaku2ass.py:690 danmaku2ass.py:738
+#: danmaku2ass.py:688 danmaku2ass.py:736
 msgid "(FONT) sans-serif"
 msgstr "(FONT) Helvetica"
 
-#: danmaku2ass.py:719
+#: danmaku2ass.py:717
 #, python-format
 msgid "Unknown comment file format: %s"
 msgstr "Unknown comment file format: %s"
 
-#: danmaku2ass.py:736
+#: danmaku2ass.py:734
 msgid "OUTPUT"
 msgstr "OUTPUT"
 
-#: danmaku2ass.py:736
+#: danmaku2ass.py:734
 msgid "Output file"
 msgstr "Output file"
 
-#: danmaku2ass.py:737
+#: danmaku2ass.py:735
 msgid "WIDTHxHEIGHT"
 msgstr "WIDTHxHEIGHT"
 
-#: danmaku2ass.py:737
+#: danmaku2ass.py:735
 msgid "Stage size in pixels"
 msgstr "Stage size in pixels"
 
-#: danmaku2ass.py:738
+#: danmaku2ass.py:736
 msgid "FONT"
 msgstr "FONT"
 
-#: danmaku2ass.py:738
+#: danmaku2ass.py:736
 #, python-format
 msgid "Specify font face [default: %s]"
 msgstr "Specify font face [default: %s]"
 
-#: danmaku2ass.py:739
+#: danmaku2ass.py:737
 msgid "SIZE"
 msgstr "SIZE"
 
-#: danmaku2ass.py:739
+#: danmaku2ass.py:737
 #, python-format
 msgid "Default font size [default: %s]"
 msgstr "Default font size [default: %s]"
 
-#: danmaku2ass.py:740
+#: danmaku2ass.py:738
 msgid "ALPHA"
 msgstr "ALPHA"
 
-#: danmaku2ass.py:740
+#: danmaku2ass.py:738
 msgid "Text opaque"
 msgstr "Text opaque"
 
-#: danmaku2ass.py:741
+#: danmaku2ass.py:739
 msgid "SECONDS"
 msgstr "SECONDS"
 
-#: danmaku2ass.py:741
+#: danmaku2ass.py:739
 #, python-format
 msgid "Duration of comment display [default: %s]"
 msgstr "Duration of comment display [default: %s]"
 
-#: danmaku2ass.py:742
+#: danmaku2ass.py:740
 msgid "HEIGHT"
 msgstr "HEIGHT"
 
-#: danmaku2ass.py:742
+#: danmaku2ass.py:740
 msgid "Reserve blank on the bottom of the stage"
 msgstr "Reserve blank on the bottom of the stage"
 
-#: danmaku2ass.py:743
+#: danmaku2ass.py:741
 msgid "Reduce the amount of comments if stage is full"
 msgstr "Reduce the amount of comments if stage is full"
 
-#: danmaku2ass.py:744
+#: danmaku2ass.py:742
 msgid "FILE"
 msgstr "FILE"
 
-#: danmaku2ass.py:744
+#: danmaku2ass.py:742
 msgid "Comment file to be processed"
 msgstr "Comment file to be processed"
 
-#: danmaku2ass.py:751
+#: danmaku2ass.py:749
 #, python-format
 msgid "Invalid stage size: %r"
 msgstr "Invalid stage size: %r"
diff --git a/locale/ja/LC_MESSAGES/danmaku2ass.mo b/locale/ja/LC_MESSAGES/danmaku2ass.mo
index e9df78be3663c46e93393087544c59148c9defea..dbba55a4db22d040c5a72a5b82160d9d811faf7d 100644
GIT binary patch
delta 20
bcmX@lcb;#9APc*(f}xp}sljFm7IS6*J*x!i

delta 20
bcmX@lcb;#9APc*Zf}w?#so`b`7IS6*J+}nw

diff --git a/locale/ja/LC_MESSAGES/danmaku2ass.po b/locale/ja/LC_MESSAGES/danmaku2ass.po
index 816d6ef..9c3b0cc 100644
--- a/locale/ja/LC_MESSAGES/danmaku2ass.po
+++ b/locale/ja/LC_MESSAGES/danmaku2ass.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Danmaku2ASS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 18:51+0800\n"
+"POT-Creation-Date: 2014-02-03 16:50+0800\n"
 "Last-Translator: Star Brilliant <m13253@hotmail.com>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -15,92 +15,92 @@ msgid "Invalid comment: %s"
 msgstr "無効なコメント：%s"
 
 #: danmaku2ass.py:158 danmaku2ass.py:192 danmaku2ass.py:235 danmaku2ass.py:317
-#: danmaku2ass.py:319 danmaku2ass.py:436 danmaku2ass.py:483 danmaku2ass.py:540
+#: danmaku2ass.py:319 danmaku2ass.py:437 danmaku2ass.py:480 danmaku2ass.py:538
 #, python-format
 msgid "Invalid comment: %r"
 msgstr "無効なコメント：%r"
 
-#: danmaku2ass.py:690 danmaku2ass.py:738
+#: danmaku2ass.py:688 danmaku2ass.py:736
 msgid "(FONT) sans-serif"
 msgstr "(FONT) MS PGothic"
 
-#: danmaku2ass.py:719
+#: danmaku2ass.py:717
 #, python-format
 msgid "Unknown comment file format: %s"
 msgstr "未知のコメントファイル形式：%s"
 
-#: danmaku2ass.py:736
+#: danmaku2ass.py:734
 msgid "OUTPUT"
 msgstr "出力"
 
-#: danmaku2ass.py:736
+#: danmaku2ass.py:734
 msgid "Output file"
 msgstr "出力ファイル"
 
-#: danmaku2ass.py:737
+#: danmaku2ass.py:735
 msgid "WIDTHxHEIGHT"
 msgstr "幅x高"
 
-#: danmaku2ass.py:737
+#: danmaku2ass.py:735
 msgid "Stage size in pixels"
 msgstr "ピクセル単位でステージのサイズ"
 
-#: danmaku2ass.py:738
+#: danmaku2ass.py:736
 msgid "FONT"
 msgstr "フォント"
 
-#: danmaku2ass.py:738
+#: danmaku2ass.py:736
 #, python-format
 msgid "Specify font face [default: %s]"
 msgstr "フォントを指定する [デフォルト: %s]"
 
-#: danmaku2ass.py:739
+#: danmaku2ass.py:737
 msgid "SIZE"
 msgstr "サイズ"
 
-#: danmaku2ass.py:739
+#: danmaku2ass.py:737
 #, python-format
 msgid "Default font size [default: %s]"
 msgstr "デフォルトのフォントサイズ [デフォルト: %s]"
 
-#: danmaku2ass.py:740
+#: danmaku2ass.py:738
 msgid "ALPHA"
 msgstr "アルファ"
 
-#: danmaku2ass.py:740
+#: danmaku2ass.py:738
 msgid "Text opaque"
 msgstr "テキストの不透明度"
 
-#: danmaku2ass.py:741
+#: danmaku2ass.py:739
 msgid "SECONDS"
 msgstr "秒数"
 
-#: danmaku2ass.py:741
+#: danmaku2ass.py:739
 #, python-format
 msgid "Duration of comment display [default: %s]"
 msgstr "コメント表示の時間 [デフォルト: %s]"
 
-#: danmaku2ass.py:742
+#: danmaku2ass.py:740
 msgid "HEIGHT"
 msgstr "高度"
 
-#: danmaku2ass.py:742
+#: danmaku2ass.py:740
 msgid "Reserve blank on the bottom of the stage"
 msgstr "ステージの下にブランクを予備する"
 
-#: danmaku2ass.py:743
+#: danmaku2ass.py:741
 msgid "Reduce the amount of comments if stage is full"
 msgstr "ステージがいっぱいになったのときにコメントの量を減らす"
 
-#: danmaku2ass.py:744
+#: danmaku2ass.py:742
 msgid "FILE"
 msgstr "ファイル"
 
-#: danmaku2ass.py:744
+#: danmaku2ass.py:742
 msgid "Comment file to be processed"
 msgstr "ファイルが処理されるコメント"
 
-#: danmaku2ass.py:751
+#: danmaku2ass.py:749
 #, python-format
 msgid "Invalid stage size: %r"
 msgstr "無効なステージサイズ：%r"
diff --git a/locale/zh_CN/LC_MESSAGES/danmaku2ass.mo b/locale/zh_CN/LC_MESSAGES/danmaku2ass.mo
index 742735ab8072f1ac4200f5f5f213f5237cb5582e..77584441e343654e5f49af338dba65137729bc67 100644
GIT binary patch
delta 20
bcmcb}bCG9*APc*(f}xp}sljFm7E2}oJ+cJq

delta 20
bcmcb}bCG9*APc*Zf}w?#so`b`7E2}oJ-!6&

diff --git a/locale/zh_CN/LC_MESSAGES/danmaku2ass.po b/locale/zh_CN/LC_MESSAGES/danmaku2ass.po
index 20afdfb..dcfb399 100644
--- a/locale/zh_CN/LC_MESSAGES/danmaku2ass.po
+++ b/locale/zh_CN/LC_MESSAGES/danmaku2ass.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Danmaku2ASS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 18:51+0800\n"
+"POT-Creation-Date: 2014-02-03 16:50+0800\n"
 "Last-Translator: Star Brilliant <m13253@hotmail.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -15,92 +15,92 @@ msgid "Invalid comment: %s"
 msgstr "无效弹幕：%s"
 
 #: danmaku2ass.py:158 danmaku2ass.py:192 danmaku2ass.py:235 danmaku2ass.py:317
-#: danmaku2ass.py:319 danmaku2ass.py:436 danmaku2ass.py:483 danmaku2ass.py:540
+#: danmaku2ass.py:319 danmaku2ass.py:437 danmaku2ass.py:480 danmaku2ass.py:538
 #, python-format
 msgid "Invalid comment: %r"
 msgstr "无效弹幕：%r"
 
-#: danmaku2ass.py:690 danmaku2ass.py:738
+#: danmaku2ass.py:688 danmaku2ass.py:736
 msgid "(FONT) sans-serif"
 msgstr "(FONT) SimHei"
 
-#: danmaku2ass.py:719
+#: danmaku2ass.py:717
 #, python-format
 msgid "Unknown comment file format: %s"
 msgstr "未知的弹幕文件格式：%s"
 
-#: danmaku2ass.py:736
+#: danmaku2ass.py:734
 msgid "OUTPUT"
 msgstr "输出"
 
-#: danmaku2ass.py:736
+#: danmaku2ass.py:734
 msgid "Output file"
 msgstr "输出文件"
 
-#: danmaku2ass.py:737
+#: danmaku2ass.py:735
 msgid "WIDTHxHEIGHT"
 msgstr "宽x高"
 
-#: danmaku2ass.py:737
+#: danmaku2ass.py:735
 msgid "Stage size in pixels"
 msgstr "舞台尺寸的像素数目"
 
-#: danmaku2ass.py:738
+#: danmaku2ass.py:736
 msgid "FONT"
 msgstr "字体"
 
-#: danmaku2ass.py:738
+#: danmaku2ass.py:736
 #, python-format
 msgid "Specify font face [default: %s]"
 msgstr "指定字体名称 [默认: %s]"
 
-#: danmaku2ass.py:739
+#: danmaku2ass.py:737
 msgid "SIZE"
 msgstr "尺寸"
 
-#: danmaku2ass.py:739
+#: danmaku2ass.py:737
 #, python-format
 msgid "Default font size [default: %s]"
 msgstr "默认字号 [默认: %s]"
 
-#: danmaku2ass.py:740
+#: danmaku2ass.py:738
 msgid "ALPHA"
 msgstr "ALPHA"
 
-#: danmaku2ass.py:740
+#: danmaku2ass.py:738
 msgid "Text opaque"
 msgstr "文字不透明度"
 
-#: danmaku2ass.py:741
+#: danmaku2ass.py:739
 msgid "SECONDS"
 msgstr "秒数"
 
-#: danmaku2ass.py:741
+#: danmaku2ass.py:739
 #, python-format
 msgid "Duration of comment display [default: %s]"
 msgstr "弹幕显示时长 [默认: %s]"
 
-#: danmaku2ass.py:742
+#: danmaku2ass.py:740
 msgid "HEIGHT"
 msgstr "高度"
 
-#: danmaku2ass.py:742
+#: danmaku2ass.py:740
 msgid "Reserve blank on the bottom of the stage"
 msgstr "在舞台底部预留空位"
 
-#: danmaku2ass.py:743
+#: danmaku2ass.py:741
 msgid "Reduce the amount of comments if stage is full"
 msgstr "在舞台满时减少弹幕数量"
 
-#: danmaku2ass.py:744
+#: danmaku2ass.py:742
 msgid "FILE"
 msgstr "文件"
 
-#: danmaku2ass.py:744
+#: danmaku2ass.py:742
 msgid "Comment file to be processed"
 msgstr "将要处理的弹幕文件"
 
-#: danmaku2ass.py:751
+#: danmaku2ass.py:749
 #, python-format
 msgid "Invalid stage size: %r"
 msgstr "无效舞台尺寸：%r"
diff --git a/locale/zh_TW/LC_MESSAGES/danmaku2ass.mo b/locale/zh_TW/LC_MESSAGES/danmaku2ass.mo
index 6a22c73920a2c17212db702947cd0f41e2c0adc3..994a84898882cc302319a52f7d92546dfca63bb8 100644
GIT binary patch
delta 20
bcmaFN^O$FYAPc*(f}xp}sljFm7H=j1K!ODz

delta 20
bcmaFN^O$FYAPc*Zf}w?#so`b`7H=j1K#m0>

diff --git a/locale/zh_TW/LC_MESSAGES/danmaku2ass.po b/locale/zh_TW/LC_MESSAGES/danmaku2ass.po
index 124d802..17dd8f3 100644
--- a/locale/zh_TW/LC_MESSAGES/danmaku2ass.po
+++ b/locale/zh_TW/LC_MESSAGES/danmaku2ass.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Danmaku2ASS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 18:51+0800\n"
+"POT-Creation-Date: 2014-02-03 16:50+0800\n"
 "Last-Translator: Star Brilliant <m13253@hotmail.com>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -15,92 +15,92 @@ msgid "Invalid comment: %s"
 msgstr "無效彈幕：%s"
 
 #: danmaku2ass.py:158 danmaku2ass.py:192 danmaku2ass.py:235 danmaku2ass.py:317
-#: danmaku2ass.py:319 danmaku2ass.py:436 danmaku2ass.py:483 danmaku2ass.py:540
+#: danmaku2ass.py:319 danmaku2ass.py:437 danmaku2ass.py:480 danmaku2ass.py:538
 #, python-format
 msgid "Invalid comment: %r"
 msgstr "無效彈幕：%r"
 
-#: danmaku2ass.py:690 danmaku2ass.py:738
+#: danmaku2ass.py:688 danmaku2ass.py:736
 msgid "(FONT) sans-serif"
 msgstr "(FONT) Microsoft JhengHei"
 
-#: danmaku2ass.py:719
+#: danmaku2ass.py:717
 #, python-format
 msgid "Unknown comment file format: %s"
 msgstr "未知的彈幕檔案格式：%s"
 
-#: danmaku2ass.py:736
+#: danmaku2ass.py:734
 msgid "OUTPUT"
 msgstr "輸出"
 
-#: danmaku2ass.py:736
+#: danmaku2ass.py:734
 msgid "Output file"
 msgstr "輸出檔案"
 
-#: danmaku2ass.py:737
+#: danmaku2ass.py:735
 msgid "WIDTHxHEIGHT"
 msgstr "寬x高"
 
-#: danmaku2ass.py:737
+#: danmaku2ass.py:735
 msgid "Stage size in pixels"
 msgstr "舞臺尺寸的畫素數目"
 
-#: danmaku2ass.py:738
+#: danmaku2ass.py:736
 msgid "FONT"
 msgstr "字型"
 
-#: danmaku2ass.py:738
+#: danmaku2ass.py:736
 #, python-format
 msgid "Specify font face [default: %s]"
 msgstr "指定字型名稱 [默認: %s]"
 
-#: danmaku2ass.py:739
+#: danmaku2ass.py:737
 msgid "SIZE"
 msgstr "尺寸"
 
-#: danmaku2ass.py:739
+#: danmaku2ass.py:737
 #, python-format
 msgid "Default font size [default: %s]"
 msgstr "默認字型大小 [默認: %s]"
 
-#: danmaku2ass.py:740
+#: danmaku2ass.py:738
 msgid "ALPHA"
 msgstr "ALPHA"
 
-#: danmaku2ass.py:740
+#: danmaku2ass.py:738
 msgid "Text opaque"
 msgstr "文字不透明度"
 
-#: danmaku2ass.py:741
+#: danmaku2ass.py:739
 msgid "SECONDS"
 msgstr "秒數"
 
-#: danmaku2ass.py:741
+#: danmaku2ass.py:739
 #, python-format
 msgid "Duration of comment display [default: %s]"
 msgstr "彈幕顯示時長 [默認: %s]"
 
-#: danmaku2ass.py:742
+#: danmaku2ass.py:740
 msgid "HEIGHT"
 msgstr "高度"
 
-#: danmaku2ass.py:742
+#: danmaku2ass.py:740
 msgid "Reserve blank on the bottom of the stage"
 msgstr "在舞臺底部預留空位"
 
-#: danmaku2ass.py:743
+#: danmaku2ass.py:741
 msgid "Reduce the amount of comments if stage is full"
 msgstr "在舞臺滿時減少彈幕數量"
 
-#: danmaku2ass.py:744
+#: danmaku2ass.py:742
 msgid "FILE"
 msgstr "檔案"
 
-#: danmaku2ass.py:744
+#: danmaku2ass.py:742
 msgid "Comment file to be processed"
 msgstr "將要處理的彈幕檔案"
 
-#: danmaku2ass.py:751
+#: danmaku2ass.py:749
 #, python-format
 msgid "Invalid stage size: %r"
 msgstr "無效舞臺尺寸：%r"

From c7a8cdeaab03387c708a3b0ef851d8358393363e Mon Sep 17 00:00:00 2001
From: 910JQK <v910JQK@gmail.com>
Date: Mon, 3 Feb 2014 18:54:40 +0800
Subject: [PATCH 3/3] README and Help - "opaque" -> "opacity"

---
 README.md                               |   2 +-
 danmaku2ass.py                          |   2 +-
 locale/en/LC_MESSAGES/danmaku2ass.mo    | Bin 1647 -> 1649 bytes
 locale/en/LC_MESSAGES/danmaku2ass.po    |   4 ++--
 locale/ja/LC_MESSAGES/danmaku2ass.mo    | Bin 1871 -> 1872 bytes
 locale/ja/LC_MESSAGES/danmaku2ass.po    |   2 +-
 locale/zh_CN/LC_MESSAGES/danmaku2ass.mo | Bin 1617 -> 1618 bytes
 locale/zh_CN/LC_MESSAGES/danmaku2ass.po |   2 +-
 locale/zh_TW/LC_MESSAGES/danmaku2ass.mo | Bin 1635 -> 1636 bytes
 locale/zh_TW/LC_MESSAGES/danmaku2ass.po |   2 +-
 10 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 1e69602..6011577 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ optional arguments:
   -fs SIZE, --fontsize SIZE
                         Default font size [default: 25]
   -a ALPHA, --alpha ALPHA
-                        Text opaque
+                        Text opacity
   -l SECONDS, --lifetime SECONDS
                         Duration of comment display [default: 5]
   -p HEIGHT, --protect HEIGHT
diff --git a/danmaku2ass.py b/danmaku2ass.py
index 93f8943..0cf51f4 100755
--- a/danmaku2ass.py
+++ b/danmaku2ass.py
@@ -735,7 +735,7 @@ def main():
     parser.add_argument('-s', '--size', metavar=_('WIDTHxHEIGHT'), required=True, help=_('Stage size in pixels'))
     parser.add_argument('-fn', '--font', metavar=_('FONT'), help=_('Specify font face [default: %s]') % _('(FONT) sans-serif')[7:], default=_('(FONT) sans-serif')[7:])
     parser.add_argument('-fs', '--fontsize', metavar=_('SIZE'), help=(_('Default font size [default: %s]') % 25), type=float, default=25.0)
-    parser.add_argument('-a', '--alpha', metavar=_('ALPHA'), help=_('Text opaque'), type=float, default=1.0)
+    parser.add_argument('-a', '--alpha', metavar=_('ALPHA'), help=_('Text opacity'), type=float, default=1.0)
     parser.add_argument('-l', '--lifetime', metavar=_('SECONDS'), help=_('Duration of comment display [default: %s]') % 5, type=float, default=5.0)
     parser.add_argument('-p', '--protect', metavar=_('HEIGHT'), help=_('Reserve blank on the bottom of the stage'), type=int, default=0)
     parser.add_argument('-r', '--reduce', action='store_true', help=_('Reduce the amount of comments if stage is full'))
diff --git a/locale/en/LC_MESSAGES/danmaku2ass.mo b/locale/en/LC_MESSAGES/danmaku2ass.mo
index 23849ca883810b93ac835096f3a50f446f8c5343..fe0f8332d38ce466eb5174dc14615baf2204f003 100644
GIT binary patch
delta 269
zcmX}my$%6E6o%n5`$NJOD}J_-NN8xbm1sn=oy09DXw)<+8U+=$b_p8WC^p;xmADQR
zIuh?B8<R|)`OZwvnTPXo*73{{k%cKz!7b{1zz?3$#n=+D@rq@<p??3w2D)5wlvZLJ
zQ{({i*iGzXi9Am3SGM#dOJPI7#~s%3f@yrCZu~_((4cDptEfNPL|qS(JPenrrX<`e
eFXvI$!}Q9qi_u*jl{FYmreP=LM<;V`{L>FJvLQ$S

delta 263
zcmXZWI|{-;5P;!XV-z%?;v<b9Vxvt;!Nx*63y)wScmM@!D~ogqX}yAiq!AP^pq1b`
zf?%1#e<a27&0}|FKThHVw_RC8_LfKoLv-+rDc-S)*Sv_0Pi*50^?rf_tk5KsQRWy6
z<WsEUEOUV^@=ezFZJCRHAfVvk0sHvCB7RW^r>F}JQybVteK$m{Pf$O;jC|8G&FE;{
b8tH$TTH?6z+gyyb-mc=%I^{HoLd*LBV)Y-B

diff --git a/locale/en/LC_MESSAGES/danmaku2ass.po b/locale/en/LC_MESSAGES/danmaku2ass.po
index 5ad507a..ed20d8d 100644
--- a/locale/en/LC_MESSAGES/danmaku2ass.po
+++ b/locale/en/LC_MESSAGES/danmaku2ass.po
@@ -68,8 +68,8 @@ msgid "ALPHA"
 msgstr "ALPHA"
 
 #: danmaku2ass.py:738
-msgid "Text opaque"
-msgstr "Text opaque"
+msgid "Text opacity"
+msgstr "Text opacity"
 
 #: danmaku2ass.py:739
 msgid "SECONDS"
diff --git a/locale/ja/LC_MESSAGES/danmaku2ass.mo b/locale/ja/LC_MESSAGES/danmaku2ass.mo
index dbba55a4db22d040c5a72a5b82160d9d811faf7d..9aa99a32bc840b761784dc6b3844659288c83011 100644
GIT binary patch
delta 256
zcmXZVJqp4=5QgDd5+nW)h@b&eSfmpLJ%F8smEZxatn5XwvJeX!35r;H0-L0<2;>C*
z6;__Y&O*?4G0V<Ae6!5%)xOz5JTHpK(h#ZP26Ybcg9$nqoB#d=>*ObP(8`Fkv5R_c
znz}%X9AFjqsUiC0b9(>ENMA}c-ZTbSV5)^f)DNsVa=1hN(E*!yM-RW)Krbu8mfm)y
dd?nkXavhgkq4dgA<>;YK${dX+vnVhU;|Gl}AQ}Jw

delta 255
zcmXZWu?oU45P;zewTe{=3R<XxLpM>-2XJz56Wm>W0Ef<k;NT!yDvrK^L+K(Y`T~kw
zTzm>Q7ZLwpLvkN?$0bSZyS+Y53nDT%MCuq|5hMKI8B2J~{OdPtkUz1DrYX|F9_l$i
zb%t5;6}q@hjnE^%ru~;G11VE@Qy8MfR2xUAFIW=txIz8U4qKRD4Zqk#Hz&fDez;Jc
bs)T#x=zmL92bRTg;)gmYW8#nFz_=JcUhE%|

diff --git a/locale/ja/LC_MESSAGES/danmaku2ass.po b/locale/ja/LC_MESSAGES/danmaku2ass.po
index 9c3b0cc..af48765 100644
--- a/locale/ja/LC_MESSAGES/danmaku2ass.po
+++ b/locale/ja/LC_MESSAGES/danmaku2ass.po
@@ -68,7 +68,7 @@ msgid "ALPHA"
 msgstr "アルファ"
 
 #: danmaku2ass.py:738
-msgid "Text opaque"
+msgid "Text opacity"
 msgstr "テキストの不透明度"
 
 #: danmaku2ass.py:739
diff --git a/locale/zh_CN/LC_MESSAGES/danmaku2ass.mo b/locale/zh_CN/LC_MESSAGES/danmaku2ass.mo
index 77584441e343654e5f49af338dba65137729bc67..b2053f08dbc581da9f60215b9414c68ca5d4cfeb 100644
GIT binary patch
delta 256
zcmcb}bBSldo_Zbz28LE<1_pT`JqbvI_?v+Ae;~adNb`bd76t}ZAbl1{O9Sc4Kw1(=
zzX#GFeVjl^HXyADr4698Igl0virYcy03a<6<R?Mpt5_NQz!o+F1r&i2eLxyy!3L;;
zGf?_6kOo<F3o8E$NDBe^VnACJfV3u%W(U$<lRFue85t(8WfT_#StJI;AixF0qMNTW
R?qFm|&Mc|iJc0Qj697GW9gP40

delta 255
zcmcb_bCGAlo_cNu28LE<1_pT`JrPLr0O^fD`ah7~2c&sHGz$X*E08_|q@{uMB_J&c
zq~8H)kUkEeBpZ;{fYSO<+6+hw0>y2iv_Fs*2l5l4@|CO%eqak5fC7p@iC!QLvS2+_
z!D%Rc2}px1x(Sv438aO9d{LmS3P4%|NV5ZJ&&i#P%8a6u*D{KO>}3!G5kSBN#NwN;
RGVWkxE-X#mJdybz695s!9R&aY

diff --git a/locale/zh_CN/LC_MESSAGES/danmaku2ass.po b/locale/zh_CN/LC_MESSAGES/danmaku2ass.po
index dcfb399..1d0a7ad 100644
--- a/locale/zh_CN/LC_MESSAGES/danmaku2ass.po
+++ b/locale/zh_CN/LC_MESSAGES/danmaku2ass.po
@@ -68,7 +68,7 @@ msgid "ALPHA"
 msgstr "ALPHA"
 
 #: danmaku2ass.py:738
-msgid "Text opaque"
+msgid "Text opacity"
 msgstr "文字不透明度"
 
 #: danmaku2ass.py:739
diff --git a/locale/zh_TW/LC_MESSAGES/danmaku2ass.mo b/locale/zh_TW/LC_MESSAGES/danmaku2ass.mo
index 994a84898882cc302319a52f7d92546dfca63bb8..af2fb2e50a8eb158623a77e7f43d7a6792c47237 100644
GIT binary patch
delta 256
zcmaFN^Mq%@o_Zbz28LE<1_pT`JqbvI_?v+Ae;~adNK1lf76t}ZAbk@^O9ScqKpLd}
zH<XqJO0og@)==6BN_zrnL7;d5luiQD;y`{0RKACm!4GWVWT1c|P+|d)23c?js^A`!
zehQ>P7QTVX^8jrV0`fJ0v;vT}2GZ<6I%aYwqcS7I<h6|Af*^~;fEWb0fLL_%RmL5R
PEXkQAm76CpUuFUT)^i>{

delta 255
zcmaFD^O$GCo_cNu28LE<1_pT`JrPLr0O^fD`ah7~2c#uIGz$X*E0Decq@{uMJs=HI
z{|ib>0VUahd@CsJ2&FxMv>;I2A4(?zX>lOG7%Jb*%HRjKa1u~J5hyVqNP{dm2vu+w
zN<RV8APZkZ<+*{j2?6=)Kw1GvTLEcyARRrqlTn#bbn;q8age<XVjuztxPVxE^Hs(j
PjLe0lshcM<UuFUTsvaG-

diff --git a/locale/zh_TW/LC_MESSAGES/danmaku2ass.po b/locale/zh_TW/LC_MESSAGES/danmaku2ass.po
index 17dd8f3..dcc23a1 100644
--- a/locale/zh_TW/LC_MESSAGES/danmaku2ass.po
+++ b/locale/zh_TW/LC_MESSAGES/danmaku2ass.po
@@ -68,7 +68,7 @@ msgid "ALPHA"
 msgstr "ALPHA"
 
 #: danmaku2ass.py:738
-msgid "Text opaque"
+msgid "Text opacity"
 msgstr "文字不透明度"
 
 #: danmaku2ass.py:739