diff --git a/bin/locale/zh_TW.qm b/bin/locale/zh_TW.qm
index 9492bf2fb..064c2d3f2 100644
Binary files a/bin/locale/zh_TW.qm and b/bin/locale/zh_TW.qm differ
diff --git a/bin/themes/chrome/images/Thumbs.db b/bin/themes/chrome/images/Thumbs.db
new file mode 100644
index 000000000..725b7632f
Binary files /dev/null and b/bin/themes/chrome/images/Thumbs.db differ
diff --git a/bin/themes/linux/images/Thumbs.db b/bin/themes/linux/images/Thumbs.db
new file mode 100644
index 000000000..d5edb8623
Binary files /dev/null and b/bin/themes/linux/images/Thumbs.db differ
diff --git a/other/Thumbs.db b/other/Thumbs.db
new file mode 100644
index 000000000..544f0e852
Binary files /dev/null and b/other/Thumbs.db differ
diff --git a/translations/homepage/zh_TW.php b/translations/homepage/zh_TW.php
new file mode 100644
index 000000000..40f00f617
--- /dev/null
+++ b/translations/homepage/zh_TW.php
@@ -0,0 +1,73 @@
+"
+
+//Home Page
+$actual_version = "當前版本";
+$actual_version_text = "當前版本是來自 ". $qupzilla_version_date .
+ " 且它的版本為 " . $qupzilla_version . ". Changes in changelog.
Don't hesitate and download it right now!";
+$actual_version_button = "下載";
+$older_versions = "更新記錄";
+$older_versions_text = "想知道這次的版本又有什麼變動嗎?
你可以在Github的 changelog 上查看!";
+$older_versions_button = "更新記錄";
+$reportbug = "回報問題";
+$reportbug_text = "發現了錯誤或只是意見要給QupZilla?
+ 請開啟Github的Issue並幫助我們吧。";
+$reportbug_button = "現在回報";
+$technology = "技術";
+$technology_text = "QupZilla是一款基於WebKit核心以及Qt Framework的強大瀏覽器。WebKit提供了快速的
+ 瀏覽體驗且Qt使得此程式可以在各種主流平台上運行。";
+$technology_button = "WebKit & Qt";
+$looknfeel_header = "原生的外觀";
+$looknfeel_text = "QupZilla的原生視窗工具外觀是使用Linux環境底下的主題。同時桌面圖示也是可以變動的。如果你覺得主題太遜了或是使用上有問題,就換成其他主題吧!";
+$library_header = "統一的資料庫";
+$library_text = "QupZilla將書籤、記錄以及RSS閱讀器放在同一個管理工具。不需要在被一堆亂七八糟的視窗影響了,QupZilla只需要一個!
+有了完整的RSS閱讀器,您可以與最喜愛的網站持續更新。QupZilla也可以從其他瀏覽器中匯入書籤。";
+$adblock_header = "完整的廣告封鎖";
+$adblock_text = "覺得充滿廣告的網站很遜?這些網站正在浪費你的頻寬及時間?您只需要更新QupZilla的EasyList或甚至加入自己定義的規則,然後好好享受沒有廣告的瀏覽。";
+$speeddial_header = "快速撥號";
+$speeddial_text = "這個熱門的擴充功能也可以在QupZilla上使用了!您可以直接在新分頁中檢視並開啟您最喜歡的網頁。不需多說,它也支援拖曳功能及網頁預覽。";
+$devnews_header = "開發最新消息";
+$feed_loading = "讀取中...";
+
+// Download Page
+$other_linux = "其他的Linux";
+$source_code = "原始碼";
+$choose_os = "選擇您所使用的作業系統";
+$windows_text = "點擊下面的連結下載32位元及64位元的Windows的安裝包";
+$ubuntu_text = "Ubuntu的Oneiric、Natty以及Maverick使用者可以藉由下列指令安裝QupZilla";
+$for_development_version = "開發中版本:";
+$packages_text = "32位元以及64位元的套件包";
+$tarballs_text = "32位元以及64位元的預編譯tarballs";
+$can_be_downloaded = "點擊以下連結來下載它們。";
+$source_text = "您可以從Repo中取得原始碼(如果您已經安裝git的話)";
+$source_text2 = "您也可以在線上觀看並下載ZIP壓縮檔";
+$view_source = "在github.com觀看原始碼";
+$download_snapshot = "下載當前的快照";
+
+// Contribute Page
+$contribute_to = "幫助QupZilla";
+$contribute_text = "QupZilla是一個開放原始碼的計畫,所以我們很歡迎您的參與。我們會樂意接受您提供的補釘包。當然您想參與不一定要懂寫程式
+ 寫程式並不是幫助我們唯一的方法:您可以幫忙翻譯QupZilla成您所使用的語言或是將QupZilla介紹給朋友。記住!即使是小小地動作也可以給我們很大的幫助!";
+$getting_source = "取得原始碼";
+$getting_source_text1 = "取得QupZilla的原始碼最簡單的方法就是從Github上複製下來。您可以藉由這些步驟取得它們";
+$getting_source_text2 = "然後就可以開始改寫它們。您可以藉由電子郵件或是Github將補釘包提交給我們。";
+$translating = "翻譯成您所使用的語言";
+$translating_text = "另一個幫助我們的方法是提供我們QupZilla的翻譯或是協助改進翻譯。如果您想要增加新的語言,您可以手動新增翻譯文件,您也可以聯絡我們,我將協助您完成。您可以藉由電子郵見或是Github將翻譯文件提交給我們。";
+$translating_moreinfo = "更多關於翻譯的資訊:點擊這裡吧! [github上的wiki]";
+$creators = "誰創造了QupZilla?";
+$creators_text = "這個計畫的擁有者、維護者以及主要開發者為捷克的學生David Rosca(nowrep)。
+除了程式的撰寫之外,其他貢獻者也為此計畫翻譯或支持。完整的貢獻人員名單請參考這裡 [at github]。
您也可以加入IRC頻道#qupzilla at irc.freenode.net和參與此計畫的我們聊聊天。";
+$share_with_friends = "和您的朋友分享!";
+$share_with_friends_text = "喜歡QupZilla?那就跟你的朋友分享它吧!";
+?>
diff --git a/translations/zh_TW.ts b/translations/zh_TW.ts
index 7a4394913..5e9850c86 100644
--- a/translations/zh_TW.ts
+++ b/translations/zh_TW.ts
@@ -100,12 +100,12 @@
AdBlock Configuration
- AdBlock設定
+ 廣告封鎖設定
Enable AdBlock
- 允許 AdBlock
+ 允許廣告封鎖
@@ -131,7 +131,7 @@
AdBlock
-
+ 廣告封鎖
@@ -168,17 +168,17 @@
AdBlockIcon
AdBlock lets you block unwanted content on web-pages
- AdBlock可以幫你封鎖網頁上不想要的內容
+ 廣告封鎖可以幫你封鎖網頁上不想要的內容
AdBlock lets you block unwanted content on web pages
- AdBlock可以幫你封鎖網頁上不想要的內容
+ 廣告封鎖可以幫你封鎖網頁上不想要的內容
Show AdBlock &Settings
- 顯示AdBlock的設定 (&S)
+ 顯示廣告封鎖的設定 (&S)
@@ -3327,7 +3327,7 @@
&AdBlock
- AdBlock(&A)
+ 廣告封鎖(&A)
@@ -3374,6 +3374,11 @@
%1 - QupZilla
+
+
+ &Print...
+ 列印...
+
Open file...
@@ -4607,7 +4612,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
Inspect Element
-
+ 檢查元素
Open link in new &tab
@@ -4878,7 +4883,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
AdBlocked Content
- AdBlocked內容
+ 封鎖廣告內容內容
diff --git a/windows/languages.nsh b/windows/languages.nsh
index c9c320b9b..5aac86d66 100644
--- a/windows/languages.nsh
+++ b/windows/languages.nsh
@@ -178,6 +178,46 @@ LangString DESC_SecDesktop ${LANG_ITALIAN} "Aggiunge il lanciatore al desktop."
LangString DESC_SecExtensions ${LANG_ITALIAN} "Associa QupZilla ai file .htm and .html"
LangString DESC_SecThemes ${LANG_ITALIAN} "Temi aggiuntivi per QupZilla"
+;;;;Traditional Chinese
+LangString TITLE_SecMain ${LANG_TRADCHINESE} "主要組件"
+LangString TITLE_SecTranslations ${LANG_TRADCHINESE} "翻譯"
+LangString TITLE_SecPlugins ${LANG_TRADCHINESE} "外掛"
+LangString TITLE_SecExamplePlugin ${LANG_TRADCHINESE} "範例外掛"
+LangString TITLE_SecDesktop ${LANG_TRADCHINESE} "桌面圖示"
+LangString TITLE_SecExtensions ${LANG_TRADCHINESE} "檔案管理"
+LangString TITLE_SecThemes ${LANG_TRADCHINESE} "主題"
+;
+LangString FILE_Htm ${LANG_TRADCHINESE} "HTM 檔案"
+LangString FILE_Html ${LANG_TRADCHINESE} "HTML 檔案"
+;
+LangString DESC_SecMain ${LANG_TRADCHINESE} "程式主要組件。"
+LangString DESC_SecTranslations ${LANG_TRADCHINESE} "可以安裝其他翻譯,預設為英文。"
+LangString DESC_SecPlugins ${LANG_TRADCHINESE} "可以安裝其他外掛。"
+LangString DESC_SecExamplePlugin ${LANG_TRADCHINESE} "純粹做示範的範例外掛。"
+LangString DESC_SecDesktop ${LANG_TRADCHINESE} "在桌面新增啟動圖示。"
+LangString DESC_SecExtensions ${LANG_TRADCHINESE} "將 QupZilla 做為預設開啟 .htm 以及 .html 檔案的瀏覽器。"
+LangString DESC_SecThemes ${LANG_TRADCHINESE} "額外的QupZilla主題。"
+
+;;;;Simplified Chinese
+LangString TITLE_SecMain ${LANG_SIMPCHINESE} "主要组件"
+LangString TITLE_SecTranslations ${LANG_SIMPCHINESE} "翻译"
+LangString TITLE_SecPlugins ${LANG_SIMPCHINESE} "应用扩展"
+LangString TITLE_SecExamplePlugin ${LANG_SIMPCHINESE} "范例应用扩展"
+LangString TITLE_SecDesktop ${LANG_TRADCHINESE} "桌面图标"
+LangString TITLE_SecExtensions ${LANG_SIMPCHINESE} "文件管理"
+LangString TITLE_SecThemes ${LANG_SIMPCHINESE} "皮肤"
+
+LangString FILE_Htm ${LANG_SIMPCHINESE} "HTM 文件"
+LangString FILE_Html ${LANG_SIMPCHINESE} "HTML 文件"
+;
+LangString DESC_SecMain ${LANG_SIMPCHINESE} "程式主要组件。"
+LangString DESC_SecTranslations ${LANG_SIMPCHINESE} "可以安装其他翻译,默认为英文。"
+LangString DESC_SecPlugins ${LANG_SIMPCHINESE} "可以安装其他应用扩展。"
+LangString DESC_SecExamplePlugin ${LANG_SIMPCHINESE} "纯粹做示范的范例应用扩展。"
+LangString DESC_SecDesktop ${LANG_SIMPCHINESE} "在桌面新建启动图标。"
+LangString DESC_SecExtensions ${LANG_SIMPCHINESE} "將 QupZilla 做為默認打開 .htm 以及 .html 文件的瀏覽器。"
+LangString DESC_SecThemes ${LANG_SIMPCHINESE} "其他的QupZilla皮肤。"
+
;;;;;;;;;
;;;;;;;;;
; Unfinished translations
@@ -187,102 +227,70 @@ LangString TITLE_SecMain ${LANG_KOREAN} "Main Components"
LangString TITLE_SecMain ${LANG_RUSSIAN} "Main Components"
LangString TITLE_SecMain ${LANG_SPANISH} "Main Components"
LangString TITLE_SecMain ${LANG_SWEDISH} "Main Components"
-LangString TITLE_SecMain ${LANG_TRADCHINESE} "Main Components"
-LangString TITLE_SecMain ${LANG_SIMPCHINESE} "Main Components"
LangString DESC_SecMain ${LANG_KOREAN} "Main components of application."
LangString DESC_SecMain ${LANG_RUSSIAN} "Main components of application."
LangString DESC_SecMain ${LANG_SPANISH} "Main components of application."
LangString DESC_SecMain ${LANG_SWEDISH} "Main components of application."
-LangString DESC_SecMain ${LANG_TRADCHINESE} "Main components of application."
-LangString DESC_SecMain ${LANG_SIMPCHINESE} "Main components of application."
LangString TITLE_SecTranslations ${LANG_KOREAN} "Translations"
LangString TITLE_SecTranslations ${LANG_RUSSIAN} "Translations"
LangString TITLE_SecTranslations ${LANG_SPANISH} "Translations"
LangString TITLE_SecTranslations ${LANG_SWEDISH} "Translations"
-LangString TITLE_SecTranslations ${LANG_TRADCHINESE} "Translations"
-LangString TITLE_SecTranslations ${LANG_SIMPCHINESE} "Translations"
LangString DESC_SecTranslations ${LANG_KOREAN} "Other translations available to install. Default is English."
LangString DESC_SecTranslations ${LANG_RUSSIAN} "Other translations available to install. Default is English."
LangString DESC_SecTranslations ${LANG_SPANISH} "Other translations available to install. Default is English."
LangString DESC_SecTranslations ${LANG_SWEDISH} "Other translations available to install. Default is English."
-LangString DESC_SecTranslations ${LANG_TRADCHINESE} "Other translations available to install. Default is English."
-LangString DESC_SecTranslations ${LANG_SIMPCHINESE} "Other translations available to install. Default is English."
LangString TITLE_SecPlugins ${LANG_KOREAN} "Plugins"
LangString TITLE_SecPlugins ${LANG_RUSSIAN} "Plugins"
LangString TITLE_SecPlugins ${LANG_SPANISH} "Plugins"
LangString TITLE_SecPlugins ${LANG_SWEDISH} "Plugins"
-LangString TITLE_SecPlugins ${LANG_TRADCHINESE} "Plugins"
-LangString TITLE_SecPlugins ${LANG_SIMPCHINESE} "Plugins"
LangString DESC_SecPlugins ${LANG_KOREAN} "Other plugins available to install."
LangString DESC_SecPlugins ${LANG_RUSSIAN} "Other plugins available to install."
LangString DESC_SecPlugins ${LANG_SPANISH} "Other plugins available to install."
LangString DESC_SecPlugins ${LANG_SWEDISH} "Other plugins available to install."
-LangString DESC_SecPlugins ${LANG_TRADCHINESE} "Other plugins available to install."
-LangString DESC_SecPlugins ${LANG_SIMPCHINESE} "Other plugins available to install."
LangString TITLE_SecExamplePlugin ${LANG_KOREAN} "Example Plugin"
LangString TITLE_SecExamplePlugin ${LANG_RUSSIAN} "Example Plugin"
LangString TITLE_SecExamplePlugin ${LANG_SPANISH} "Example Plugin"
LangString TITLE_SecExamplePlugin ${LANG_SWEDISH} "Example Plugin"
-LangString TITLE_SecExamplePlugin ${LANG_TRADCHINESE} "Example Plugin"
-LangString TITLE_SecExamplePlugin ${LANG_SIMPCHINESE} "Example Plugin"
LangString DESC_SecExamplePlugin ${LANG_KOREAN} "Useless example plugin."
LangString DESC_SecExamplePlugin ${LANG_RUSSIAN} "Useless example plugin."
LangString DESC_SecExamplePlugin ${LANG_SPANISH} "Useless example plugin."
LangString DESC_SecExamplePlugin ${LANG_SWEDISH} "Useless example plugin."
-LangString DESC_SecExamplePlugin ${LANG_TRADCHINESE} "Useless example plugin."
-LangString DESC_SecExamplePlugin ${LANG_SIMPCHINESE} "Useless example plugin."
LangString TITLE_SecDesktop ${LANG_KOREAN} "Desktop Icon"
LangString TITLE_SecDesktop ${LANG_RUSSIAN} "Desktop Icon"
LangString TITLE_SecDesktop ${LANG_SPANISH} "Desktop Icon"
LangString TITLE_SecDesktop ${LANG_SWEDISH} "Desktop Icon"
-LangString TITLE_SecDesktop ${LANG_TRADCHINESE} "Desktop Icon"
-LangString TITLE_SecDesktop ${LANG_SIMPCHINESE} "Desktop Icon"
LangString DESC_SecDesktop ${LANG_KOREAN} "Add launcher to desktop."
LangString DESC_SecDesktop ${LANG_RUSSIAN} "Add launcher to desktop."
LangString DESC_SecDesktop ${LANG_SPANISH} "Add launcher to desktop."
LangString DESC_SecDesktop ${LANG_SWEDISH} "Add launcher to desktop."
-LangString DESC_SecDesktop ${LANG_TRADCHINESE} "Add launcher to desktop."
-LangString DESC_SecDesktop ${LANG_SIMPCHINESE} "Add launcher to desktop."
LangString TITLE_SecExtensions ${LANG_KOREAN} "File Associations"
LangString TITLE_SecExtensions ${LANG_RUSSIAN} "File Associations"
LangString TITLE_SecExtensions ${LANG_SPANISH} "File Associations"
LangString TITLE_SecExtensions ${LANG_SWEDISH} "File Associations"
-LangString TITLE_SecExtensions ${LANG_TRADCHINESE} "File Associations"
-LangString TITLE_SecExtensions ${LANG_SIMPCHINESE} "File Associations"
LangString DESC_SecExtensions ${LANG_KOREAN} "Associate QupZilla with .htm and .html files"
LangString DESC_SecExtensions ${LANG_RUSSIAN} "Associate QupZilla with .htm and .html files"
LangString DESC_SecExtensions ${LANG_SPANISH} "Associate QupZilla with .htm and .html files"
LangString DESC_SecExtensions ${LANG_SWEDISH} "Associate QupZilla with .htm and .html files"
-LangString DESC_SecExtensions ${LANG_TRADCHINESE} "Associate QupZilla with .htm and .html files"
-LangString DESC_SecExtensions ${LANG_SIMPCHINESE} "Associate QupZilla with .htm and .html files"
LangString FILE_Htm ${LANG_KOREAN} "HTM File"
LangString FILE_Htm ${LANG_RUSSIAN} "HTM File"
LangString FILE_Htm ${LANG_SPANISH} "HTM File"
LangString FILE_Htm ${LANG_SWEDISH} "HTM File"
-LangString FILE_Htm ${LANG_TRADCHINESE} "HTM File"
-LangString FILE_Htm ${LANG_SIMPCHINESE} "HTM File"
LangString FILE_Html ${LANG_KOREAN} "HTML File"
LangString FILE_Html ${LANG_RUSSIAN} "HTML File"
LangString FILE_Html ${LANG_SPANISH} "HTML File"
LangString FILE_Html ${LANG_SWEDISH} "HTML File"
-LangString FILE_Html ${LANG_TRADCHINESE} "HTML File"
-LangString FILE_Html ${LANG_SIMPCHINESE} "HTML File"
LangString TITLE_SecThemes ${LANG_KOREAN} "Themes"
LangString TITLE_SecThemes ${LANG_RUSSIAN} "Themes"
LangString TITLE_SecThemes ${LANG_SPANISH} "Themes"
LangString TITLE_SecThemes ${LANG_SWEDISH} "Themes"
-LangString TITLE_SecThemes ${LANG_TRADCHINESE} "Themes"
-LangString TITLE_SecThemes ${LANG_SIMPCHINESE} "Themes"
LangString DESC_SecThemes ${LANG_KOREAN} "Additional themes for QupZilla"
LangString DESC_SecThemes ${LANG_RUSSIAN} "Additional themes for QupZilla"
LangString DESC_SecThemes ${LANG_SPANISH} "Additional themes for QupZilla"
LangString DESC_SecThemes ${LANG_SWEDISH} "Additional themes for QupZilla"
-LangString DESC_SecThemes ${LANG_TRADCHINESE} "Additional themes for QupZilla"
-LangString DESC_SecThemes ${LANG_SIMPCHINESE} "Additional themes for QupZilla"