Skip to content

Commit

Permalink
Add version string in about dialog and update translation
Browse files Browse the repository at this point in the history
Signed-off-by: Harry Chen <[email protected]>
  • Loading branch information
Harry-Chen committed Nov 11, 2017
1 parent c59527a commit fb628b4
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 52 deletions.
3 changes: 2 additions & 1 deletion src/DMMainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,10 @@ void DMMainWindow::on_new_alert(QString msg) {
void DMMainWindow::show_about_dialog() {
this->show();
QMessageBox::about(
this, "About",
this, tr("About"),
R"(
<strong>DanmaQ</strong>
<p>Version )" DANMAQ_VERSION R"( </p>
<p>Copyright &copy; 2015-2017 Justin Wong & TUNA members<br />
Tsinghua University TUNA Association</p>
<p> Source Code Available under GPLv3<br />
Expand Down
2 changes: 2 additions & 0 deletions src/common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include "Subscriber.hpp"
#include "DMMainWindow.hpp"

#define DANMAQ_VERSION "0.2.3"

#if defined _WIN32 || defined __CYGWIN__
#define myDebug (qDebug() << "[" << __FILE__ << ":" << __LINE__ << ":" << __FUNCTION__ << "]")
#else
Expand Down
39 changes: 22 additions & 17 deletions src/translations/ja_JP.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,83 +2,88 @@
<!DOCTYPE TS>
<TS version="2.1" language="ja_JP">
<context>
<name>DMApp</name>
<name>DMMainWindow</name>
<message>
<location filename="../danmaQ_app.cpp" line="41"/>
<location filename="../DMMainWindow.cpp" line="44"/>
<source>Server: </source>
<translation>サーバー:</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="47"/>
<location filename="../DMMainWindow.cpp" line="50"/>
<source>Channel: </source>
<translation>チャンネル:</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="53"/>
<location filename="../DMMainWindow.cpp" line="56"/>
<source>Password: </source>
<translation>パスワード:</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="60"/>
<location filename="../DMMainWindow.cpp" line="63"/>
<source>&amp;Hide</source>
<translation>隠す(&amp;H)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="61"/>
<location filename="../DMMainWindow.cpp" line="64"/>
<source>&amp;Config</source>
<translation>設定(&amp;C)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="63"/>
<location filename="../danmaQ_app.cpp" line="172"/>
<location filename="../DMMainWindow.cpp" line="66"/>
<location filename="../DMMainWindow.cpp" line="175"/>
<source>&amp;Subscribe</source>
<translation>登録する(&amp;S)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="165"/>
<location filename="../DMMainWindow.cpp" line="168"/>
<source>&amp;Unsubscribe</source>
<translation>登録をやめる(&amp;U)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="166"/>
<location filename="../DMMainWindow.cpp" line="169"/>
<source>Subscription Started</source>
<translation>登録済み</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="166"/>
<location filename="../DMMainWindow.cpp" line="169"/>
<source>Let&apos;s Go</source>
<translation>コメントしてみよう</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="177"/>
<location filename="../DMMainWindow.cpp" line="180"/>
<source>Ooops!</source>
<translation>おっと!</translation>
</message>
<message>
<location filename="../DMMainWindow.cpp" line="192"/>
<source>About</source>
<translation>danmaQ について</translation>
</message>
</context>
<context>
<name>DMTrayIcon</name>
<message>
<location filename="../danmaQ_app.cpp" line="209"/>
<location filename="../DMMainWindow.cpp" line="215"/>
<source>Toggle Subscription</source>
<translation>登録の切り替え</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="210"/>
<location filename="../DMMainWindow.cpp" line="216"/>
<source>Refresh Screen</source>
<translation>画面を更新</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="211"/>
<location filename="../DMMainWindow.cpp" line="217"/>
<source>Show Main Window</source>
<translation>主画面を表示</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="212"/>
<location filename="../DMMainWindow.cpp" line="218"/>
<source>About</source>
<translation>danmaQ について</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="213"/>
<location filename="../DMMainWindow.cpp" line="219"/>
<source>Exit</source>
<translation>終了</translation>
</message>
Expand Down
39 changes: 22 additions & 17 deletions src/translations/zh_CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,83 +2,88 @@
<!DOCTYPE TS>
<TS version="2.1" language="zh_CN">
<context>
<name>DMApp</name>
<name>DMMainWindow</name>
<message>
<location filename="../danmaQ_app.cpp" line="41"/>
<location filename="../DMMainWindow.cpp" line="44"/>
<source>Server: </source>
<translation>地址: </translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="47"/>
<location filename="../DMMainWindow.cpp" line="50"/>
<source>Channel: </source>
<translation>频道: </translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="53"/>
<location filename="../DMMainWindow.cpp" line="56"/>
<source>Password: </source>
<translation>密码: </translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="60"/>
<location filename="../DMMainWindow.cpp" line="63"/>
<source>&amp;Hide</source>
<translation>隐藏(&amp;H)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="61"/>
<location filename="../DMMainWindow.cpp" line="64"/>
<source>&amp;Config</source>
<translation>配置(&amp;C)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="63"/>
<location filename="../danmaQ_app.cpp" line="172"/>
<location filename="../DMMainWindow.cpp" line="66"/>
<location filename="../DMMainWindow.cpp" line="175"/>
<source>&amp;Subscribe</source>
<translation>订阅(&amp;S)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="165"/>
<location filename="../DMMainWindow.cpp" line="168"/>
<source>&amp;Unsubscribe</source>
<translation>停止(&amp;U)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="166"/>
<location filename="../DMMainWindow.cpp" line="169"/>
<source>Subscription Started</source>
<translation>订阅开始</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="166"/>
<location filename="../DMMainWindow.cpp" line="169"/>
<source>Let&apos;s Go</source>
<translation>快发条弹幕试试吧</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="177"/>
<location filename="../DMMainWindow.cpp" line="180"/>
<source>Ooops!</source>
<translation>哎呀!</translation>
</message>
<message>
<location filename="../DMMainWindow.cpp" line="192"/>
<source>About</source>
<translation>关于</translation>
</message>
</context>
<context>
<name>DMTrayIcon</name>
<message>
<location filename="../danmaQ_app.cpp" line="209"/>
<location filename="../DMMainWindow.cpp" line="215"/>
<source>Toggle Subscription</source>
<translation>切换订阅状态</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="210"/>
<location filename="../DMMainWindow.cpp" line="216"/>
<source>Refresh Screen</source>
<translation>刷新屏幕</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="211"/>
<location filename="../DMMainWindow.cpp" line="217"/>
<source>Show Main Window</source>
<translation>显示主窗口</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="212"/>
<location filename="../DMMainWindow.cpp" line="218"/>
<source>About</source>
<translation>关于</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="213"/>
<location filename="../DMMainWindow.cpp" line="219"/>
<source>Exit</source>
<translation>退出</translation>
</message>
Expand Down
39 changes: 22 additions & 17 deletions src/translations/zh_TW.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,83 +2,88 @@
<!DOCTYPE TS>
<TS version="2.1" language="zh_TW">
<context>
<name>DMApp</name>
<name>DMMainWindow</name>
<message>
<location filename="../danmaQ_app.cpp" line="41"/>
<location filename="../DMMainWindow.cpp" line="44"/>
<source>Server: </source>
<translation>地址: </translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="47"/>
<location filename="../DMMainWindow.cpp" line="50"/>
<source>Channel: </source>
<translation>頻道: </translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="53"/>
<location filename="../DMMainWindow.cpp" line="56"/>
<source>Password: </source>
<translation>密碼: </translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="60"/>
<location filename="../DMMainWindow.cpp" line="63"/>
<source>&amp;Hide</source>
<translation>隱藏(&amp;H)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="61"/>
<location filename="../DMMainWindow.cpp" line="64"/>
<source>&amp;Config</source>
<translation>配置(&amp;C)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="63"/>
<location filename="../danmaQ_app.cpp" line="172"/>
<location filename="../DMMainWindow.cpp" line="66"/>
<location filename="../DMMainWindow.cpp" line="175"/>
<source>&amp;Subscribe</source>
<translation>訂閱(&amp;S)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="165"/>
<location filename="../DMMainWindow.cpp" line="168"/>
<source>&amp;Unsubscribe</source>
<translation>停止(&amp;U)</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="166"/>
<location filename="../DMMainWindow.cpp" line="169"/>
<source>Subscription Started</source>
<translation>訂閱開始</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="166"/>
<location filename="../DMMainWindow.cpp" line="169"/>
<source>Let&apos;s Go</source>
<translation>快發條彈幕試試吧</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="177"/>
<location filename="../DMMainWindow.cpp" line="180"/>
<source>Ooops!</source>
<translation>哎呀!</translation>
</message>
<message>
<location filename="../DMMainWindow.cpp" line="192"/>
<source>About</source>
<translation>關於</translation>
</message>
</context>
<context>
<name>DMTrayIcon</name>
<message>
<location filename="../danmaQ_app.cpp" line="209"/>
<location filename="../DMMainWindow.cpp" line="215"/>
<source>Toggle Subscription</source>
<translation>切換訂閱狀態</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="210"/>
<location filename="../DMMainWindow.cpp" line="216"/>
<source>Refresh Screen</source>
<translation>刷新屏幕</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="211"/>
<location filename="../DMMainWindow.cpp" line="217"/>
<source>Show Main Window</source>
<translation>顯示主窗口</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="212"/>
<location filename="../DMMainWindow.cpp" line="218"/>
<source>About</source>
<translation>關於</translation>
</message>
<message>
<location filename="../danmaQ_app.cpp" line="213"/>
<location filename="../DMMainWindow.cpp" line="219"/>
<source>Exit</source>
<translation>退出</translation>
</message>
Expand Down

0 comments on commit fb628b4

Please sign in to comment.