SVN: [10111] branches/rewrite/scripts/i18n - Pywikipedia-svn

15 Apr 2012

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10111
Revision: 10111
Author:   siebrand
Date:     2012-04-15 12:14:14 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Revert r10110. For some reason, the source language was removed.
Modified Paths:
--------------
    branches/rewrite/scripts/i18n/add_text.py
    branches/rewrite/scripts/i18n/archivebot.py
    branches/rewrite/scripts/i18n/basic.py
    branches/rewrite/scripts/i18n/capitalize_redirects.py
    branches/rewrite/scripts/i18n/catall.py
    branches/rewrite/scripts/i18n/category.py
    branches/rewrite/scripts/i18n/category_redirect.py
    branches/rewrite/scripts/i18n/clean_sandbox.py
    branches/rewrite/scripts/i18n/commons.py
    branches/rewrite/scripts/i18n/cosmetic_changes.py
    branches/rewrite/scripts/i18n/delete.py
    branches/rewrite/scripts/i18n/djvutext.py
    branches/rewrite/scripts/i18n/editarticle.py
    branches/rewrite/scripts/i18n/featured.py
    branches/rewrite/scripts/i18n/fixing_redirects.py
    branches/rewrite/scripts/i18n/interwiki.py
    branches/rewrite/scripts/i18n/isbn.py
    branches/rewrite/scripts/i18n/movepages.py
    branches/rewrite/scripts/i18n/noreferences.py
    branches/rewrite/scripts/i18n/redirect.py
    branches/rewrite/scripts/i18n/replace.py
    branches/rewrite/scripts/i18n/solve_disambiguation.py
    branches/rewrite/scripts/i18n/table2wiki.py
    branches/rewrite/scripts/i18n/template.py
    branches/rewrite/scripts/i18n/thirdparty.py
    branches/rewrite/scripts/i18n/unlink.py
    branches/rewrite/scripts/i18n/welcome.py
Modified: branches/rewrite/scripts/i18n/add_text.py
===================================================================

--- branches/rewrite/scripts/i18n/add_text.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/add_text.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -123,6 +123,9 @@
    'eml': {
    	'add_text-adding': u'Robot A Śònt %(adding)s',
    },
+	'en': {
+		'add_text-adding': u'Robot: Adding %(adding)s',
+	},
    'eo': {
    	'add_text-adding': u'robota aldono de %(adding)s',
    },
@@ -579,15 +582,11 @@
    },
    # Author: Yfdyh000
    'zh': {
-		'add_text-adding': u'机器人：添加 %(adding)s',
+		'add_text-adding': u'机器人: 添加 %(adding)s',
    },
    'zh-hant': {
    	'add_text-adding': u'機器人新增：%(adding)s',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'add_text-adding': u'機械人新增：%(adding)s',
-	},
    'zh-min-nan': {
    	'add_text-adding': u'bot ka-thiam %(adding)s',
    },
Modified: branches/rewrite/scripts/i18n/archivebot.py
===================================================================
--- branches/rewrite/scripts/i18n/archivebot.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/archivebot.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -117,6 +117,13 @@
    	'archivebot-archiveheader': u'{{talkarchive}}',
    	'archivebot-older-than': u'παλαιότερο από',
    },
+	'en': {
+		'archivebot-archive-full': u'(ARCHIVE FULL)',
+		'archivebot-archive-summary': u'Archiving %(count)d {{PLURAL:%(count)d|thread|threads}} from [[%(from)s]].',
+		'archivebot-archiveheader': u'{{talkarchive}}',
+		'archivebot-older-than': u'older than',
+		'archivebot-page-summary': u'Archiving %(count)d {{PLURAL:%(count)d|thread|threads}} (%(why)s) to %(archives)s.',
+	},
    # Author: Vivaelcelta
    # Author: Armando-Martin
    'es': {
@@ -545,20 +552,11 @@
    	'archivebot-page-summary': u'正在存档%(count)d个%(why)s到%(archives)s。',
    },
    # Author: Waihorace
-	# Author: Justincheng12345
    'zh-hant': {
    	'archivebot-archive-full': u'(存檔已滿)',
-		'archivebot-archive-summary': u'正在儲存%(count)d個來自[[%(from)s]]的執行緒。',
+		'archivebot-archive-summary': u'正在存檔%(count)d個來自[[%(from)s]]的討論。',
    	'archivebot-archiveheader': u'{{talkarchive}}',
    	'archivebot-older-than': u'早於',
-		'archivebot-page-summary': u'正在將%(count)d個執行緒(%(why)s)儲存至%(archives)s。',
+		'archivebot-page-summary': u'正在存檔%(count)d個%(why)s到%(archives)s。',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'archivebot-archive-full': u'(存檔已滿)',
-		'archivebot-archive-summary': u'正在儲存%(count)d個來自[[%(from)s]]的執行緒。',
-		'archivebot-archiveheader': u'{{talkarchive}}',
-		'archivebot-older-than': u'早於',
-		'archivebot-page-summary': u'正在將%(count)d個執行緒(%(why)s)儲存至%(archives)s。',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/basic.py
===================================================================
--- branches/rewrite/scripts/i18n/basic.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/basic.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -76,6 +76,9 @@
    'el': {
    	'basic-changing': u'Bot: Αλλάζει ...',
    },
+	'en': {
+		'basic-changing': u'Robot: Changing ...',
+	},
    # Author: Airon90
    'eo': {
    	'basic-changing': u'Roboto: Ŝanĝanta ...',
@@ -374,16 +377,12 @@
    'yi': {
    	'basic-changing': u'באָט: ענדערן ...',
    },
-	# Author: Yfdyh000
+	# Author: Shizhao
    'zh': {
-		'basic-changing': u'机器人：修改...',
+		'basic-changing': u'机器人： 修改...',
    },
    # Author: Waihorace
    'zh-hant': {
    	'basic-changing': u'機械人：修改中...',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'basic-changing': u'機械人修改中...',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/capitalize_redirects.py
===================================================================
--- branches/rewrite/scripts/i18n/capitalize_redirects.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/capitalize_redirects.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -62,6 +62,9 @@
    'el': {
    	'capitalize_redirects-create-redirect': u'Ρομπότ: Δημιουργία ανακατεύθυνσης [[%(to)s]]',
    },
+	'en': {
+		'capitalize_redirects-create-redirect': u'Robot: Create redirect to [[%(to)s]]',
+	},
    # Author: Vivaelcelta
    'es': {
    	'capitalize_redirects-create-redirect': u'Bot: Creo una redirección hacia "[[%(to)s]]"',
@@ -259,8 +262,4 @@
    'zh-hant': {
    	'capitalize_redirects-create-redirect': u'機械人：創建重定向至[[%(to)s]]',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'capitalize_redirects-create-redirect': u'機械人創建重定向至[[%(to)s]]',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/catall.py
===================================================================
--- branches/rewrite/scripts/i18n/catall.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/catall.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -42,6 +42,9 @@
    'de': {
    	'catall-changing': u'Bot: Wechsele Kategorien',
    },
+	'en': {
+		'catall-changing': u'Robot: Changing categories',
+	},
    # Author: Armando-Martin
    'es': {
    	'catall-changing': u'Robot: Cambiando categorías',
@@ -212,12 +215,7 @@
    	'catall-changing': u'机器人：修改分类',
    },
    # Author: Breawycker
-	# Author: Justincheng12345
    'zh-hant': {
-		'catall-changing': u'機器人：更改分類',
+		'catall-changing': u'機器人： 更改類別',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'catall-changing': u'機械人更改分類',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/category.py
===================================================================
--- branches/rewrite/scripts/i18n/category.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/category.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -323,6 +323,19 @@
    'eml': {
    	'category-adding': u'Robot: A Śònt category [[:Category:%(newcat)s|%(newcat)s]]',
    },
+	# Author: Xqt
+	'en': {
+		'category-adding': u'Robot: Adding category [[:Category:%(newcat)s|%(newcat)s]]',
+		'category-also-in': u'(also in %(alsocat)s)',
+		'category-changing': u'Robot: Changing %(oldcat)s to %(newcat)s',
+		'category-listifying': u'Robot: Listifying from %(fromcat)s ({{PLURAL:%(num)d|1 entry|%(num)d entries}})',
+		'category-removing': u'Robot: Removing from %(oldcat)s',
+		'category-replacing': u'Robot: Replacing category %(oldcat)s with %(newcat)s',
+		'category-section-title': u'Page history of former %(oldcat)s',
+		'category-version-history': u'Robot: Saving version history of former %(oldcat)s',
+		'category-was-disbanded': u'Robot: Category was disbanded',
+		'category-was-moved': u'Robot: Category was moved to [[:Category:%(newcat)s|%(title)s]]',
+	},
    # Author: Mihxil
    # Author: Airon90
    'eo': {
@@ -1446,19 +1459,20 @@
    	'category-adding': u'僕: 增 category [[:Category:%(newcat)s|%(newcat)s]]',
    },
    # Author: Anakmalaysia
+	# Author: Hydra
    # Author: Shizhao
    # Author: Yfdyh000
    # Author: 阿pp
    'zh': {
-		'category-adding': u'机器人：添加分类[[:Category:%(newcat)s|%(newcat)s]]',
+		'category-adding': u'机器人：添加分类 [[:Category:%(newcat)s|%(newcat)s]]',
    	'category-also-in': u'(同样在%(alsocat)s)',
-		'category-changing': u'机器人：更改%(newcat)s至%(oldcat)s',
+		'category-changing': u'机器人： 更改 %(newcat)s 至 %(oldcat)s',
    	'category-listifying': u'机器人：从%(fromcat)s提取列表(%(num)d个项目)',
-		'category-removing': u'机器人：从[[%(oldcat)s]]中移除',
-		'category-replacing': u'机器人：变更分类[[%(oldcat)s]]为[[%(newcat)s]]',
+		'category-removing': u'机器人：移除目录[[%(oldcat)s]]',
+		'category-replacing': u'机器人：变更类别[[%(oldcat)s]]为[[%(newcat)s]]',
    	'category-section-title': u'前%(oldcat)s的页面历史',
    	'category-version-history': u'机器人：保存之前%(oldcat)s的历史版本记录',
-		'category-was-disbanded': u'机器人：分类已被解散',
+		'category-was-disbanded': u'机器人：类别已被解散',
    	'category-was-moved': u'机器人：移动分类至[[:Category:%(newcat)s|%(title)s]]',
    },
    # Author: Andrew971218
@@ -1468,27 +1482,13 @@
    	'category-adding': u'機器人：添加分類[[:Category:%(newcat)s|%(newcat)s]]',
    	'category-also-in': u'（也在%(alsocat)s）',
    	'category-changing': u'機器人：更換%(oldcat)s至%(newcat)s',
-		'category-listifying': u'機械人：從%(fromcat)s提取列表(%(num)d個紀錄)',
-		'category-removing': u'機械人：從[[%(oldcat)s]]中移除',
-		'category-replacing': u'機械人：分類由[[%(oldcat)s]]替換成[[%(newcat)s]]',
-		'category-section-title': u'%(oldcat)s的頁面歷史',
-		'category-version-history': u'機械人：正在儲存%(oldcat)s的歷史記錄',
-		'category-was-disbanded': u'機械人：分類已放棄使用',
-		'category-was-moved': u'機械人：分類轉移到[[:Category:%(newcat)s|%(title)s]]',
+		'category-listifying': u'機器人: 重%(fromcat)s提取列表(%(num)d個紀錄)',
+		'category-removing': u'機器人：從[[%(oldcat)s]]中移除',
+		'category-replacing': u'機器人：類別由[[%(oldcat)s]]更改至[[%(newcat)s]]',
+		'category-version-history': u'機械人： 正在儲存%(oldcat)s的歷史記錄',
+		'category-was-disbanded': u'機器人：分類被解散',
+		'category-was-moved': u'機器人：分類被轉移到[[:Category:%(newcat)s|%(title)s]]',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'category-adding': u'機械人添加分類[[:Category:%(newcat)s|%(newcat)s]]',
-		'category-also-in': u'（也在%(alsocat)s）',
-		'category-changing': u'機械人更換%(oldcat)s至%(newcat)s',
-		'category-listifying': u'機械人從%(fromcat)s提取列表(%(num)d個紀錄)',
-		'category-removing': u'機械人從[[%(oldcat)s]]中移除',
-		'category-replacing': u'機械人將分類由[[%(oldcat)s]]替換成[[%(newcat)s]]',
-		'category-section-title': u'%(oldcat)s的頁面歷史',
-		'category-version-history': u'機械人正在儲存%(oldcat)s的歷史記錄',
-		'category-was-disbanded': u'機械人：分類已放棄使用',
-		'category-was-moved': u'機械人將分類轉移到[[:Category:%(newcat)s|%(title)s]]',
-	},
    'zh-min-nan': {
    	'category-adding': u'bot: ka-thiam category [[:Category:%(newcat)s|%(newcat)s]]',
    },
Modified: branches/rewrite/scripts/i18n/category_redirect.py
===================================================================
--- branches/rewrite/scripts/i18n/category_redirect.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/category_redirect.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -163,6 +163,14 @@
    	'category_redirect-edit-request-item': u'Το %(title)s είναι στην %(oldcat)s, η οποία είναι ανακατεύθυνση στην %(newcat)s',
    	'category_redirect-fix-double': u'Bot: επιδιόρθωση  διπλής-ανακατεύθυνσης',
    },
+	'en': {
+		'category_redirect-add-template': u'Robot: Adding category redirect template for maintenance',
+		'category_redirect-change-category': u'Robot: Change redirected category [[:%(oldCatLink)s|%(oldCatTitle)s]] to [[:%(newCatLink)s|%(newCatTitle)s]]',
+		'category_redirect-comment': u'Category redirect maintenance robot',
+		'category_redirect-edit-request': u'The following protected pages have been detected as requiring updates to category links: %(itemlist)s',
+		'category_redirect-edit-request-item': u'* %(title)s is in %(oldcat)s, which is a redirect to %(newcat)s',
+		'category_redirect-fix-double': u'Robot: Fixing double-redirect',
+	},
    # Author: Airon90
    'eo': {
    	'category_redirect-add-template': u'Roboto: aldonanta ŝablonon pri alidirekta kategorio por prizorgado',
@@ -720,24 +728,14 @@
    	'category_redirect-fix-double': u'机器人：修正双重重定向',
    },
    # Author: Waihorace
-	# Author: Justincheng12345
    'zh-hant': {
    	'category_redirect-add-template': u'機械人：增加分類重定向模板供維護',
    	'category_redirect-change-category': u'機械人：更改分類重定向由[[:%(oldCatLink)s|%(oldCatTitle)s]]至[[:%(newCatLink)s|%(newCatTitle)s]]',
-		'category_redirect-comment': u'分類重定向機械人',
+		'category_redirect-comment': u'分類重定向維護機械人',
    	'category_redirect-edit-request': u'以下被保護頁面已經被檢測到要更新分類連結：%(itemlist)s',
    	'category_redirect-edit-request-item': u'%(title)s是在%(oldcat)s，那是一個連結到%(newcat)s的重定向',
    	'category_redirect-fix-double': u'機械人：修復雙重重定向',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'category_redirect-add-template': u'機械人增加分類重定向模板以供維護',
-		'category_redirect-change-category': u'機械人將分類[[:%(oldCatLink)s|%(oldCatTitle)s]]重定向至[[:%(newCatLink)s|%(newCatTitle)s]]',
-		'category_redirect-comment': u'分類重定向機械人',
-		'category_redirect-edit-request': u'以下被保護頁面檢測到要更新分類連結：%(itemlist)s',
-		'category_redirect-edit-request-item': u'%(title)s的分類%(oldcat)s已重定向至%(newcat)s',
-		'category_redirect-fix-double': u'機械人修復雙重重定向',
-	},
    'zh-yue': {
    	'category_redirect-fix-double': u'機械人：拉直連串跳轉',
    },
Modified: branches/rewrite/scripts/i18n/clean_sandbox.py
===================================================================
--- branches/rewrite/scripts/i18n/clean_sandbox.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/clean_sandbox.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -57,6 +57,9 @@
    'el': {
    	'clean_sandbox-cleaned': u'Ρομπότ: Καθαρίστηκε αυτόματα',
    },
+	'en': {
+		'clean_sandbox-cleaned': u'Robot: Automatically cleaned',
+	},
    # Author: Airon90
    'eo': {
    	'clean_sandbox-cleaned': u'Roboto: Aŭtomate viŝita',
@@ -268,8 +271,4 @@
    'zh-hant': {
    	'clean_sandbox-cleaned': u'機械人：自動清除',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'clean_sandbox-cleaned': u'機械人自動清除',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/commons.py
===================================================================
--- branches/rewrite/scripts/i18n/commons.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/commons.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -74,6 +74,10 @@
    	'commons-file-moved': u'Το [[:File:%(localfile)s|αρχείο]] μετακινήθηκε στα [[:commons:File:%(commonsfile)s|commons]].',
    	'commons-file-now-available': u'Το αρχείο είναι τώρα διαθέσιμο στα [[:commons:File:%(commonsfile)s|Wikimedia Commons]].',
    },
+	'en': {
+		'commons-file-moved': u'[[:File:%(localfile)s|File]] moved to [[:commons:File:%(commonsfile)s|commons]].',
+		'commons-file-now-available': u'File is now available on [[:commons:File:%(commonsfile)s|Wikimedia Commons]].',
+	},
    # Author: Airon90
    'eo': {
    	'commons-file-moved': u'[[:File:%(localfile)s|Dosiero]] movita al [[:commons:File:%(commonsfile)s|Komunejon]].',
@@ -345,14 +349,4 @@
    	'commons-file-moved': u'[[:File:%(localfile)s|文件]] 已移动到 [[:commons:File:%(commonsfile)s|维基媒体共享资源]]。',
    	'commons-file-now-available': u'文件现已在 [[:commons:File:%(commonsfile)s|维基媒体共享资源]]。',
    },
-	# Author: Justincheng12345
-	'zh-hant': {
-		'commons-file-moved': u'[[:File:%(localfile)s|檔案]]已移動到[[:commons:File:%(commonsfile)s|維基共享資源]]。',
-		'commons-file-now-available': u'[[:commons:File:%(commonsfile)s|維基共享資源]]已有此檔案。',
-	},
-	# Author: Justincheng12345
-	'zh-hk': {
-		'commons-file-moved': u'[[:File:%(localfile)s|檔案]]已移動到[[:commons:File:%(commonsfile)s|維基共享資源]]。',
-		'commons-file-now-available': u'[[:commons:File:%(commonsfile)s|維基共享資源]]已有此檔案。',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/cosmetic_changes.py
===================================================================
--- branches/rewrite/scripts/i18n/cosmetic_changes.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/cosmetic_changes.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -89,6 +89,10 @@
    	'cosmetic_changes-append': u'; διακοσμητικές αλλαγές',
    	'cosmetic_changes-standalone': u'Ρομπότ: διακοσμητικές αλλαγές',
    },
+	'en': {
+		'cosmetic_changes-append': u'; cosmetic changes',
+		'cosmetic_changes-standalone': u'Robot: Cosmetic changes',
+	},
    'es': {
    	'cosmetic_changes-append': u'; cambios triviales',
    	'cosmetic_changes-standalone': u'Robot: Cambios triviales',
@@ -423,20 +427,14 @@
    	'cosmetic_changes-append': u'; קאסמעטישע ענדערונגען',
    	'cosmetic_changes-standalone': u'באט: קאסמעטישע ענדערונגען',
    },
-	# Author: Yfdyh000
+	# Author: Hydra
    'zh': {
-		'cosmetic_changes-append': u';整洁的变更',
-		'cosmetic_changes-standalone': u'机器人：整洁的变更',
+		'cosmetic_changes-append': u';化妆品的变化',
+		'cosmetic_changes-standalone': u'机器人： 化妆品的变化',
    },
    # Author: Breawycker
-	# Author: Justincheng12345
    'zh-hant': {
-		'cosmetic_changes-append': u';整潔化更改',
-		'cosmetic_changes-standalone': u'機械人：整潔化',
+		'cosmetic_changes-append': u';化妝品的變化',
+		'cosmetic_changes-standalone': u'機器人： 化妝品改變',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'cosmetic_changes-append': u'; 整潔化更改',
-		'cosmetic_changes-standalone': u'機械人整潔化',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/delete.py
===================================================================
--- branches/rewrite/scripts/i18n/delete.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/delete.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -97,6 +97,13 @@
    	'delete-linked-pages': u'Ρομπότ: Διαγραφή όλων των σελίδων που συνδέονται από την %(page)s',
    	'delete-referring-pages': u'Ρομπότ: Διαγραφή όλων των σελίδων που αναφέρονται από την %(page)s',
    },
+	'en': {
+		'delete-from-category': u'Robot: Deleting all pages from category %(page)s',
+		'delete-from-file': u'Robot: Deleting a list of files.',
+		'delete-images': u'Robot: Deleting all images on page %(page)s',
+		'delete-linked-pages': u'Robot: Deleting all pages linked from %(page)s',
+		'delete-referring-pages': u'Robot: Deleting all pages referring from %(page)s',
+	},
    # Author: Vivaelcelta
    'es': {
    	'delete-from-category': u'Bot: Elimino todas las páginas de la categoría "%(page)s"',
@@ -453,20 +460,11 @@
    },
    # Author: Breawycker
    # Author: Lauhenry
-	# Author: Justincheng12345
    'zh-hant': {
-		'delete-from-category': u'機械人：刪除所有来自%(page)s分類的頁面',
-		'delete-from-file': u'機械人：刪除列表中的檔案。',
+		'delete-from-category': u'機器人： 刪除類別 （頁） %s 中的所有頁面',
+		'delete-from-file': u'機器人： 刪除的檔的清單。',
    	'delete-images': u'機器人： 刪除「%(page)s」頁上的所有圖像',
-		'delete-linked-pages': u'機械人：删除所有從%(page)s鏈接的頁面',
-		'delete-referring-pages': u'機械人：删除所有從%(page)s指向的頁面',
+		'delete-linked-pages': u'機器人： 刪除所有頁面連結從 （頁） %s',
+		'delete-referring-pages': u'機器人： 刪除所有頁，指的從 %（頁） s',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'delete-from-category': u'機械人刪除所有来自%(page)s分類的頁面',
-		'delete-from-file': u'機械人正在刪除列表中的檔案。',
-		'delete-images': u'機械人刪除%(page)s中所有圖像',
-		'delete-linked-pages': u'機械人删除所有從%(page)s鏈接的頁面',
-		'delete-referring-pages': u'機械人删除所有從%(page)s指向的頁面',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/djvutext.py
===================================================================
--- branches/rewrite/scripts/i18n/djvutext.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/djvutext.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -39,6 +39,9 @@
    'de': {
    	'djvutext-creating': u'Robot: Erstelle eine Seite mit aus DjVu extrahiertem Text',
    },
+	'en': {
+		'djvutext-creating': u'Robot: Creating page with text extracted from DjVu',
+	},
    # Author: Armando-Martin
    'es': {
    	'djvutext-creating': u'Robot: Creando página con texto extraído de DjVu',
@@ -196,12 +199,7 @@
    	'djvutext-creating': u'机器人：创建文本由DjVu提取的页面',
    },
    # Author: Breawycker
-	# Author: Justincheng12345
    'zh-hant': {
-		'djvutext-creating': u'機械人：為從DjVu中提取頁面創建檔案',
+		'djvutext-creating': u'機器人： 創建頁，從 DjVu 中提取文本',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'djvutext-creating': u'機械人為從DjVu中提取頁面創建檔案',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/editarticle.py
===================================================================
--- branches/rewrite/scripts/i18n/editarticle.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/editarticle.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -54,6 +54,9 @@
    'el': {
    	'editarticle-edit': u'Μη αυτόματη επεξεργασία με ρομπότ: %(description)s',
    },
+	'en': {
+		'editarticle-edit': u'Manual edit with robot: %(description)s',
+	},
    # Author: Airon90
    'eo': {
    	'editarticle-edit': u'Permana redakto per roboto: %(description)s',
@@ -252,12 +255,4 @@
    'zh': {
    	'editarticle-edit': u'利用机器方式手动编辑：%(description)s',
    },
-	# Author: Justincheng12345
-	'zh-hant': {
-		'editarticle-edit': u'手動控制機械人進行更改：%(description)s',
-	},
-	# Author: Justincheng12345
-	'zh-hk': {
-		'editarticle-edit': u'手動控制機械人進行更改：%(description)s',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/featured.py
===================================================================
--- branches/rewrite/scripts/i18n/featured.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/featured.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -95,6 +95,12 @@
    	'featured-good': u'Ρομπότ: το %(page)s είναι καλό άρθρο',
    	'featured-list': u'Ρομπότ: το %(page)s είναι ένας αξιόλογος κατάλογος',
    },
+	'en': {
+		'featured-featured': u'Robot: %(page)s is a featured article',
+		'featured-former': u'Robot: %(page)s is a former featured article',
+		'featured-good': u'Robot: %(page)s is a good article',
+		'featured-list': u'Robot: %(page)s is a featured list',
+	},
    'eo': {
    	'featured-featured': u'roboto: %(page)s estas artikolo elstara',
    	'featured-good': u'roboto: %(page)s estas artikolo leginda',
@@ -438,18 +444,4 @@
    	'featured-good': u'机器人：%(page)s是一篇优良条目',
    	'featured-list': u'机器人：%(page)s是一篇特色列表',
    },
-	# Author: Justincheng12345
-	'zh-hant': {
-		'featured-featured': u'機械人：%(page)s為特色條目',
-		'featured-former': u'機械人：%(page)s曾經是一特色條目',
-		'featured-good': u'機械人：%(page)s為優良條目',
-		'featured-list': u'機械人：%(page)s為特色列表',
-	},
-	# Author: Justincheng12345
-	'zh-hk': {
-		'featured-featured': u'機械人將%(page)s列為特色條目',
-		'featured-former': u'機械人將%(page)s列為曾經的特色條目',
-		'featured-good': u'機械人將%(page)s列為優良條目',
-		'featured-list': u'機械人將%(page)s列為特色列表',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/fixing_redirects.py
===================================================================
--- branches/rewrite/scripts/i18n/fixing_redirects.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/fixing_redirects.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -34,6 +34,9 @@
    'de': {
    	'fixing_redirects-fixing': u'Bot: Reparieren von Umleitungen',
    },
+	'en': {
+		'fixing_redirects-fixing': u'Bot: Fixing redirects',
+	},
    # Author: Armando-Martin
    'es': {
    	'fixing_redirects-fixing': u'Bot: Arreglando redirecciones',
@@ -191,12 +194,7 @@
    	'fixing_redirects-fixing': u'机器人：修理重定向',
    },
    # Author: Breawycker
-	# Author: Justincheng12345
    'zh-hant': {
-		'fixing_redirects-fixing': u'機械人：修補重定向',
+		'fixing_redirects-fixing': u'Bot： 固定的重定向',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'fixing_redirects-fixing': u'機械人修補重定向',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/interwiki.py
===================================================================
--- branches/rewrite/scripts/i18n/interwiki.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/interwiki.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -367,6 +367,15 @@
    	'interwiki-removing': u'Robot A Tir via: %(removing)s',
    	'interwiki-removing-modifying': u'Robot A Tir via: %(removing)s A Cambi: %(modifying)s',
    },
+	'en': {
+		'interwiki-adding': u'Robot: Adding %(adding)s',
+		'interwiki-adding-modifying': u'Robot: Adding %(adding)s; modifying %(modifying)s',
+		'interwiki-adding-removing': u'Robot: Adding %(adding)s; removing: %(removing)s',
+		'interwiki-adding-removing-modifying': u'Robot: Adding %(adding)s; removing %(removing)s; modifying %(modifying)s',
+		'interwiki-modifying': u'Robot: Modifying %(modifying)s',
+		'interwiki-removing': u'Robot: Removing %(removing)s',
+		'interwiki-removing-modifying': u'Robot: Removing %(removing)s; modifying %(modifying)s',
+	},
    'eo': {
    	'interwiki-adding': u'robota aldono de: %(adding)s',
    	'interwiki-adding-modifying': u'robota aldono de: %(adding)s modifo de: %(modifying)s',
@@ -1770,26 +1779,15 @@
    },
    # Author: Alexsh
    # Author: Andrew971218
-	# Author: Justincheng12345
    'zh-hant': {
-		'interwiki-adding': u'機械人：新增%(adding)s',
-		'interwiki-adding-modifying': u'機械人：增加%(adding)s、修改%(modifying)s',
-		'interwiki-adding-removing': u'機械人：新增%(adding)s、刪除%(removing)s',
-		'interwiki-adding-removing-modifying': u'機械人：添加%(adding)s、刪除%(removing)s、修改%(modifying)s',
-		'interwiki-modifying': u'機械人：修改%(modifying)s',
-		'interwiki-removing': u'機械人：刪除%(removing)s',
-		'interwiki-removing-modifying': u'機械人：刪除%(removing)s、修改%(modifying)s',
+		'interwiki-adding': u'機器人新增：%(adding)s',
+		'interwiki-adding-modifying': u'機器人添加：%(adding)s 修改：%(modifying)s',
+		'interwiki-adding-removing': u'機器人新增：%(adding)s 刪除：%(removing)s',
+		'interwiki-adding-removing-modifying': u'機器人添加：%(adding)s 刪除：%(removing)s 修改：%(modifying)s',
+		'interwiki-modifying': u'機器人修改：%(modifying)s',
+		'interwiki-removing': u'機器人移除： %(removing)s',
+		'interwiki-removing-modifying': u'機器人移除：%(removing)s 修改：%(modifying)s',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'interwiki-adding': u'機械人新增%(adding)s',
-		'interwiki-adding-modifying': u'機械人增加%(adding)s、修改%(modifying)s',
-		'interwiki-adding-removing': u'機械人新增%(adding)s、刪除%(removing)s',
-		'interwiki-adding-removing-modifying': u'機械人添加%(adding)s、刪除%(removing)s、修改%(modifying)s',
-		'interwiki-modifying': u'機械人修改%(modifying)s',
-		'interwiki-removing': u'機械人刪除%(removing)s',
-		'interwiki-removing-modifying': u'機械人刪除%(removing)s、修改%(modifying)s',
-	},
    'zh-min-nan': {
    	'interwiki-adding': u'bot ka-thiam: %(adding)s',
    	'interwiki-adding-modifying': u'bot ka-thiam: %(adding)s siu-kái: %(modifying)s',
Modified: branches/rewrite/scripts/i18n/isbn.py
===================================================================
--- branches/rewrite/scripts/i18n/isbn.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/isbn.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -79,6 +79,9 @@
    'el': {
    	'isbn-formatting': u'Ρομπότ: Μορφοποίηση ISBN',
    },
+	'en': {
+		'isbn-formatting': u'Robot: Formatting ISBN',
+	},
    # Author: Mihxil
    'eo': {
    	'isbn-formatting': u'Roboto: Aranĝis ISBN',
@@ -372,8 +375,4 @@
    'zh-hant': {
    	'isbn-formatting': u'機器人：格式化ISBN',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'isbn-formatting': u'機械人將ISBN格式化',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/movepages.py
===================================================================
--- branches/rewrite/scripts/i18n/movepages.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/movepages.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -40,6 +40,9 @@
    'el': {
    	'movepages-moving': u'Μετακίνηση σελίδων με bot',
    },
+	'en': {
+		'movepages-moving': u'Robot: Moved page',
+	},
    # Author: Vivaelcelta
    'es': {
    	'movepages-moving': u'Bot: Página trasladada',
@@ -222,12 +225,7 @@
    	'movepages-moving': u'机器人：移动页面',
    },
    # Author: Breawycker
-	# Author: Justincheng12345
    'zh-hant': {
-		'movepages-moving': u'機械人：移動頁面',
+		'movepages-moving': u'機器人： 移動頁',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'movepages-moving': u'機械人移動頁面',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/noreferences.py
===================================================================
--- branches/rewrite/scripts/i18n/noreferences.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/noreferences.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -55,6 +55,9 @@
    'el': {
    	'noreferences-add-tag': u'Ρομπότ: προσθήκη ετικέτας <references /> που δεν υπήρχε',
    },
+	'en': {
+		'noreferences-add-tag': u'Robot: Adding missing <references /> tag',
+	},
    'eo': {
    	'noreferences-add-tag': u'Roboto: Aldono de "<references />"',
    },
@@ -268,12 +271,7 @@
    	'noreferences-add-tag': u'机器人：添加缺少的<references />标签',
    },
    # Author: Breawycker
-	# Author: Justincheng12345
    'zh-hant': {
-		'noreferences-add-tag': u'機械人：添加缺少的<references/>標記',
+		'noreferences-add-tag': u'機器人： 添加缺少<references></references>標記',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'noreferences-add-tag': u'機械人添加缺少的<references/>標記',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/redirect.py
===================================================================
--- branches/rewrite/scripts/i18n/redirect.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/redirect.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -93,10 +93,8 @@
    	'redirect-remove-loop': u'[[VP:CSR#R1]]: [[Viquipèdia:Redirecció|Redirecció]] trencada, formant un bucle',
    },
    # Author: Asoxor
-	# Author: Marmzok
    'ckb': {
    	'redirect-fix-double': u'ڕۆبۆت: چاکسازیی دووجار-ڕەوانەکردنەوە بۆ %(to)s',
-		'redirect-remove-broken': u'[[en:WP:CSD#G8|G8]]: [[en:Wikipedia:Redirec|ڕەوانەکەر]] بۆ پەڕەیەکی سڕاوە یان پەڕەیەک کە بوونی نییە',
    },
    # Author: Dontlietome7
    # Author: Spiffyk
@@ -135,6 +133,12 @@
    	'redirect-remove-broken': u'[[Βικιπαίδεια:Ανακατεύθυνση|Ανακατεύθυνση]] σε μια [[Βικιπαίδεια:Γρήγορη διαγραφή σελίδων#Ανακατευθύνσεις|σελίδα που διαγράφηκε ή δεν υπάρχει]].',
    	'redirect-remove-loop': u'Ο στόχος [[Βικιπαίδεια:Ανακατεύθυνση|ανακατεύθυνσης]] προκαλεί [[Βικιπαίδεια:Γρήγορη διαγραφή σελίδων#Ανακατευθύνσεις|βρόχο ανακατεύθυνσης]]',
    },
+	'en': {
+		'redirect-broken-redirect-template': u'{{db-r1}}',
+		'redirect-fix-double': u'Robot: Fixing double redirect to %(to)s',
+		'redirect-remove-broken': u'[[WP:CSD#G8|G8]]: [[Wikipedia:Redirect|Redirect]] to a deleted or non-existent page',
+		'redirect-remove-loop': u'[[WP:CSD#G8|G8]]: [[Wikipedia:Redirect|Redirect]] target forms a redirect loop',
+	},
    # Author: Mihxil
    'eo': {
    	'redirect-broken-redirect-template': u'{{db-r1}}',
@@ -680,20 +684,12 @@
    	'redirect-remove-loop': u'[[WP:CSD#R5|R5]]：[[Wikipedia:重定向|重定向]]目标构成循环',
    },
    # Author: Andrew971218
-	# Author: Justincheng12345
    'zh-hant': {
    	'redirect-broken-redirect-template': u'{{db-r1}}',
-		'redirect-fix-double': u'機械人：修正雙重定向至%(to)s',
+		'redirect-fix-double': u'機器人：修正雙重定向至%(to)s',
    	'redirect-remove-broken': u'[[WP:CSD#G8|G8]]：[[Wikipedia:Redirect|重定向]]到不存在的頁面',
    	'redirect-remove-loop': u'[[WP:CSD#G8|G8]]：[[Wikipedia:Redirect|重定向]]目標構成循環',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'redirect-broken-redirect-template': u'{{db-r1}}',
-		'redirect-fix-double': u'機械人修正雙重定向至%(to)s',
-		'redirect-remove-broken': u'[[WP:CSD#G8|G8]]：[[Wikipedia:Redirect|重定向]]到不存在的頁面',
-		'redirect-remove-loop': u'[[WP:CSD#G8|G8]]：[[Wikipedia:Redirect|重定向]]目標構成循環',
-	},
    'zh-yue': {
    	'redirect-fix-double': u'機械人：拉直連串跳轉 → %(to)s',
    	'redirect-remove-broken': u'機械人：跳轉目標唔存在',
Modified: branches/rewrite/scripts/i18n/replace.py
===================================================================
--- branches/rewrite/scripts/i18n/replace.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/replace.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -61,6 +61,9 @@
    'el': {
    	'replace-replacing': u'Ρομπότ: Αυτόματη αντικατάσταση κειμένου %(description)s',
    },
+	'en': {
+		'replace-replacing': u'Robot: Automated text replacement %(description)s',
+	},
    # Author: Mihxil
    'eo': {
    	'replace-replacing': u'Roboto: Automata tekst-anstataŭigo: %(description)s',
@@ -334,12 +337,7 @@
    	'replace-replacing': u'机器人：自动文本替换%(description)s',
    },
    # Author: Andrew971218
-	# Author: Justincheng12345
    'zh-hant': {
-		'replace-replacing': u'機械人：自動替換文字%(description)s',
+		'replace-replacing': u'機器人：自動替換文字%(description)s',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'replace-replacing': u'機械人自動替換文字%(description)s',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/solve_disambiguation.py
===================================================================
--- branches/rewrite/scripts/i18n/solve_disambiguation.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/solve_disambiguation.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -154,7 +154,6 @@
    },
    # Author: Erdemaslancan
    'diq': {
-		'solve_disambiguation-links-removed': u'Rehberinda Roboti ra maneê bin: %(ra) - gırey hewadayış(i).',
    	'solve_disambiguation-unknown-page': u'(Ne sılasneno)',
    },
    # Author: Glavkos
@@ -167,6 +166,15 @@
    	'solve_disambiguation-redirect-resolved': u'Υποβοηθούμενη αποσαφήνιση από Ρομπότ: %(from)s - Σύνδεσμος(οι) αλλάχτηκε(αν) προς  %(to)s',
    	'solve_disambiguation-unknown-page': u'(άγνωστο)',
    },
+	'en': {
+		'solve_disambiguation-adding-dn-template': u'Robot-assisted disambiguation: %(from)s - Marked as needing expert attention',
+		'solve_disambiguation-links-removed': u'Robot-assisted disambiguation: %(from)s - Removed link(s).',
+		'solve_disambiguation-links-resolved': u'Robot-assisted disambiguation: %(from)s - Changed link(s) to %(to)s',
+		'solve_disambiguation-redirect-adding-dn-template': u'Robot-assisted disambiguation: %(from)s - Marked as needing expert attention',
+		'solve_disambiguation-redirect-removed': u'Robot-assisted disambiguation: %(from)s - Removed link(s)',
+		'solve_disambiguation-redirect-resolved': u'Robot-assisted disambiguation: %(from)s - Changed link(s) to %(to)s',
+		'solve_disambiguation-unknown-page': u'(unknown)',
+	},
    # Author: Mihxil
    'eo': {
    	'solve_disambiguation-adding-dn-template': u'Robota unusencigo: %(from)s - Markis ke ĝi bezonas atenton de eksperto.',
@@ -857,14 +865,4 @@
    	'solve_disambiguation-redirect-resolved': u'機器人輔助消除歧義：%(from)s - 連接改為%(to)s',
    	'solve_disambiguation-unknown-page': u'(未知)',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'solve_disambiguation-adding-dn-template': u'機械人消歧義：%(from)s-標記為需要專家關注',
-		'solve_disambiguation-links-removed': u'機械人消歧義：%(from)s-刪除鏈接',
-		'solve_disambiguation-links-resolved': u'機械人消歧義：%(from)s-更改鏈接至%(to)s',
-		'solve_disambiguation-redirect-adding-dn-template': u'機械人消歧義：%(from)s-標記為需專家關注',
-		'solve_disambiguation-redirect-removed': u'機械人消歧義：%(from)s-刪除鏈接',
-		'solve_disambiguation-redirect-resolved': u'機械人消歧義：%(from)s-更改鏈接至%(to)s',
-		'solve_disambiguation-unknown-page': u'(未知)',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/table2wiki.py
===================================================================
--- branches/rewrite/scripts/i18n/table2wiki.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/table2wiki.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -56,10 +56,10 @@
    	'table2wiki-no-warning': u'Bot: Tabellensyntax konvertiert',
    	'table2wiki-warnings': u'Bot: Tabellensyntax konvertiert - {{PLURAL:count|1 Warnung|%(count)d Warnungen}}!',
    },
-	# Author: Erdemaslancan
-	'diq': {
-		'table2wiki-no-warning': u'Karberê qontrolkarê boti: imlay tabloy kerd newi',
-		'table2wiki-warnings': u'Karberê qontrolkarê boti: imlay tabloy kerd newi {{PLURAL:count|1|%(count)d}}',
+	# Author: Xqt
+	'en': {
+		'table2wiki-no-warning': u'User-controlled robot: Table syntax updated',
+		'table2wiki-warnings': u'User-controlled robot: Table syntax updated - {{PLURAL:count|1 warning|%(count)d warnings}}!',
    },
    # Author: Xqt
    'es': {
@@ -289,14 +289,8 @@
    	'table2wiki-warnings': u'用户控制机器人：更新表语法——但有%(count)d个警告！',
    },
    # Author: Breawycker
-	# Author: Justincheng12345
    'zh-hant': {
    	'table2wiki-no-warning': u'使用者控制的機器人： 表更新的語法',
-		'table2wiki-warnings': u'手動控制機械人進行表語法更新-出現%(count)d個警告！',
+		'table2wiki-warnings': u'使用者控制的機器人： 表語法更新-  {{PLURAL:count| 1 warning| %(計數） d 警告}} ！',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'table2wiki-no-warning': u'手動控制機械人進行表語法更新',
-		'table2wiki-warnings': u'手動控制機械人進行表語法更新-出現%(count)d個警告！',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/template.py
===================================================================
--- branches/rewrite/scripts/i18n/template.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/template.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -74,6 +74,11 @@
    	'template-removing': u'Ρομπότ: Αφαίρεση {{PLURAL:%(num)d| προτύπου|προτύπων}}: %(list)s',
    	'template-substituting': u'Ρομπότ: Ενσωμάτωση {{PLURAL:%(num)d| προτύπου|προτύπων}}: %(list)s',
    },
+	'en': {
+		'template-changing': u'Robot: Changing {{PLURAL:%(num)d|template|templates}}: %(list)s',
+		'template-removing': u'Robot: Removing {{PLURAL:%(num)d|template|templates}}: %(list)s',
+		'template-substituting': u'Robot: Substituting {{PLURAL:%(num)d|template|templates}}: %(list)s',
+	},
    'es': {
    	'template-changing': u'Bot: Cambiada la {{PLURAL:%(num)d|la plantilla|las plantillas}}: %(list)s',
    	'template-removing': u'Robot: Retirando {{PLURAL:%(num)d|la plantilla|las plantillas}}: %(list)s',
@@ -323,16 +328,4 @@
    	'template-removing': u'机器人：删除{{PLURAL:%(num)d|模板|模板}}：%(list)s',
    	'template-substituting': u'机器人：替换{{PLURAL:%(num)d|模板|模板}}：%(list)s',
    },
-	# Author: Justincheng12345
-	'zh-hant': {
-		'template-changing': u'機械人更改%(num)d個模板：%(list)s',
-		'template-removing': u'機械人刪除%(num)d個模板：%(list)s',
-		'template-substituting': u'機械人替換%(num)d個模板：%(list)s',
-	},
-	# Author: Justincheng12345
-	'zh-hk': {
-		'template-changing': u'機械人更改%(num)d個模板：%(list)s',
-		'template-removing': u'機械人刪除%(num)d個模板：%(list)s',
-		'template-substituting': u'機械人替換%(num)d個模板：%(list)s',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/thirdparty.py
===================================================================
--- branches/rewrite/scripts/i18n/thirdparty.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/thirdparty.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -197,16 +197,7 @@
    },
    # Author: Erdemaslancan
    'diq': {
-		'thirdparty-drtrigonbot-subster-summary-mod': u'%(tags)i etiket(i) vurnayış',
-		'thirdparty-drtrigonbot-sum_disc-notify-maintmsg': u'MESACE ROBOTİ',
    	'thirdparty-drtrigonbot-sum_disc-notify-new': u'Mınaqeşeyo newe',
-		'thirdparty-drtrigonbot-sum_disc-notify-notify': u'Xeberdar',
-		'thirdparty-drtrigonbot-sum_disc-parse': u':* %(notify)s: %(page_sections)s - [%(history_link)s vurnayışê peyêni] (%(page_size)s bytes) by %(karber)s (%(time)s)',
-		'thirdparty-drtrigonbot-sum_disc-parse-nonhuman': u'(Vurneber merdum nê vineya)',
-		'thirdparty-drtrigonbot-sum_disc-parse-notify': u':* %(notify)s: <span class="plainlinks">[%(page_link)s %(page)s]</span> - vurnayışê peyenê [[User:%(user)s]] (%(time)s)',
-		'thirdparty-drtrigonbot-sum_disc-parse-start': u'; %d. %B %Y',
-		'thirdparty-drtrigonbot-sum_disc-parse-warning': u':* Robot mesacê ikazi: %(page)s "''%(warning)s''"',
-		'thirdparty-drtrigonbot-sum_disc-summary-head': u'robot',
    },
    # Author: Geraki
    # Author: Glavkos
@@ -222,6 +213,26 @@
    	'thirdparty-drtrigonbot-sum_disc-parse-warning': u': * Προειδοποιητικό μήνυμα από ρομπότ: %(page)s "''%(warning)s''"',
    	'thirdparty-drtrigonbot-sum_disc-summary-head': u'ρομπότ',
    },
+	# Author: DrTrigon
+	'en': {
+		'thirdparty-drtrigonbot-subster-summary-mod': u'substituting %(tags)s tag(s)',
+		'thirdparty-drtrigonbot-sum_disc-notify-changed': u'Discussion changed',
+		'thirdparty-drtrigonbot-sum_disc-notify-closed': u'Discussion closed',
+		'thirdparty-drtrigonbot-sum_disc-notify-maintmsg': u'ROBOT MESSAGE',
+		'thirdparty-drtrigonbot-sum_disc-notify-new': u'New Discussion',
+		'thirdparty-drtrigonbot-sum_disc-notify-notify': u'Notification',
+		'thirdparty-drtrigonbot-sum_disc-parse': u':* %(notify)s: %(page_sections)s - [%(history_link)s last edit] (%(page_size)s bytes) by %(user)s (%(time)s)',
+		'thirdparty-drtrigonbot-sum_disc-parse-closed': u':* %(notify)s: %(page)s all discussions have finished (surveillance stopped) - last edit by %(user)s (%(time)s)',
+		'thirdparty-drtrigonbot-sum_disc-parse-end': u'<noinclude>\n\nSummary generated from and at: %(sign)s</noinclude>',
+		'thirdparty-drtrigonbot-sum_disc-parse-nonhuman': u'(no human editor found)',
+		'thirdparty-drtrigonbot-sum_disc-parse-notify': u':* %(notify)s: <span class="plainlinks">[%(page_link)s %(page)s]</span> - last edit by [[User:%(user)s]] (%(time)s)',
+		'thirdparty-drtrigonbot-sum_disc-parse-start': u'; %d. %B %Y',
+		'thirdparty-drtrigonbot-sum_disc-parse-warning': u':* Robot warning message: %(page)s "''%(warning)s''"',
+		'thirdparty-drtrigonbot-sum_disc-summary-add': u'Discussion summary added: %(num)i entries',
+		'thirdparty-drtrigonbot-sum_disc-summary-clean': u'Discussion summary added with clean up: %(num)i entries',
+		'thirdparty-drtrigonbot-sum_disc-summary-head': u'robot',
+		'thirdparty-drtrigonbot-sum_disc-summary-mod': u'Discussion summary updated: %(num)i entries in %(page)s',
+	},
    # Author: Vivaelcelta
    # Author: Armando-Martin
    'es': {
@@ -1117,44 +1128,22 @@
    	'thirdparty-drtrigonbot-sum_disc-summary-mod': u'更新讨论摘要：%(num)i个条目在%(page)s',
    },
    # Author: Breawycker
-	# Author: Justincheng12345
    'zh-hant': {
-		'thirdparty-drtrigonbot-subster-summary-mod': u'替換引用%(tags)s標記',
-		'thirdparty-drtrigonbot-sum_disc-notify-changed': u'討論已更改',
-		'thirdparty-drtrigonbot-sum_disc-notify-closed': u'討論已關閉',
-		'thirdparty-drtrigonbot-sum_disc-notify-maintmsg': u'機械人消息',
-		'thirdparty-drtrigonbot-sum_disc-notify-new': u'新討論',
+		'thirdparty-drtrigonbot-sum_disc-notify-changed': u'更改的討論',
+		'thirdparty-drtrigonbot-sum_disc-notify-closed': u'關閉的討論',
+		'thirdparty-drtrigonbot-sum_disc-notify-maintmsg': u'機器人消息',
+		'thirdparty-drtrigonbot-sum_disc-notify-new': u'檢視討論頁面',
    	'thirdparty-drtrigonbot-sum_disc-notify-notify': u'通知',
-		'thirdparty-drtrigonbot-sum_disc-parse': u':* %(notify)s: %(page_sections)s - [%(history_link)s 最後編輯] (由%(user)s於%(time)s更改%(page_size)s位元)',
-		'thirdparty-drtrigonbot-sum_disc-parse-closed': u':* %(notify)s：%(page)s所有討論完結（停止監察）-最後由%(user)s於%(time)s編輯',
-		'thirdparty-drtrigonbot-sum_disc-parse-end': u'<noinclude>摘要由在%(sign)s生成</noinclude></noinclude>',
-		'thirdparty-drtrigonbot-sum_disc-parse-nonhuman': u'（沒有發現人類編輯）',
-		'thirdparty-drtrigonbot-sum_disc-parse-notify': u':* %(notify)s: %(page_sections)s - [%(history_link)s %(page)s] (由%(user)s於%(time)s更改%(page_size)s位元)',
+		'thirdparty-drtrigonbot-sum_disc-parse': u'： ＊ %（通知） s: (page_sections) %s-[%（history_link） s 最後編輯] （（page_size） %s 的位元組） （使用者） %s (%(time)s)',
+		'thirdparty-drtrigonbot-sum_disc-parse-closed': u'： ＊ %（通知） （使用者） %s (%(time)s) 通過最後編輯所有討論都完 (監察停止）--s: %（頁） s',
+		'thirdparty-drtrigonbot-sum_disc-parse-end': u'<noinclude>\n!N ！從和在生成的摘要： （符號） %s</noinclude>',
+		'thirdparty-drtrigonbot-sum_disc-parse-nonhuman': u'（沒有發現人類編輯器）',
+		'thirdparty-drtrigonbot-sum_disc-parse-notify': u'： ＊ %（通知） s: <span class="plainlinks">[(page_link) 的 （頁） s]</span> -[[（使用者） 使用者： %s]] 通過最後編輯 （%(time)s)',
    	'thirdparty-drtrigonbot-sum_disc-parse-start': u';%d. %B %Y',
-		'thirdparty-drtrigonbot-sum_disc-parse-warning': u':* 機械人警告信息：%(page)s"''%(warning)s''"',
-		'thirdparty-drtrigonbot-sum_disc-summary-add': u'添加討論摘要：%(num)i項',
-		'thirdparty-drtrigonbot-sum_disc-summary-clean': u'添加並修改討論摘要：%(num)i項',
-		'thirdparty-drtrigonbot-sum_disc-summary-head': u'機械人',
-		'thirdparty-drtrigonbot-sum_disc-summary-mod': u'討論摘要更新：%(page)s中%(num)i項',
+		'thirdparty-drtrigonbot-sum_disc-parse-warning': u'： ＊ 機器人警告消息： （頁） %s"%（警告） s '"',
+		'thirdparty-drtrigonbot-sum_disc-summary-add': u'添加的討論摘要： %(num) 我的條目',
+		'thirdparty-drtrigonbot-sum_disc-summary-clean': u'添加具有清理的討論摘要： %(num) 我的條目',
+		'thirdparty-drtrigonbot-sum_disc-summary-head': u'機器人',
+		'thirdparty-drtrigonbot-sum_disc-summary-mod': u'討論摘要更新： %(num) 我 （頁） %s 中的條目',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'thirdparty-drtrigonbot-subster-summary-mod': u'替換引用%(tags)s標記',
-		'thirdparty-drtrigonbot-sum_disc-notify-changed': u'討論已更改',
-		'thirdparty-drtrigonbot-sum_disc-notify-closed': u'討論已關閉',
-		'thirdparty-drtrigonbot-sum_disc-notify-maintmsg': u'機械人信息',
-		'thirdparty-drtrigonbot-sum_disc-notify-new': u'新討論',
-		'thirdparty-drtrigonbot-sum_disc-notify-notify': u'通知',
-		'thirdparty-drtrigonbot-sum_disc-parse': u':* %(notify)s: %(page_sections)s - [%(history_link)s 最後編輯] (由%(user)s於%(time)s更改%(page_size)s位元)',
-		'thirdparty-drtrigonbot-sum_disc-parse-closed': u':* %(notify)s：%(page)s所有討論完結（停止監察）-最後由%(user)s於%(time)s編輯',
-		'thirdparty-drtrigonbot-sum_disc-parse-end': u'<noinclude>摘要由在%(sign)s生成</noinclude></noinclude>',
-		'thirdparty-drtrigonbot-sum_disc-parse-nonhuman': u'（未發現人類編輯）',
-		'thirdparty-drtrigonbot-sum_disc-parse-notify': u':* %(notify)s: %(page_sections)s - [%(history_link)s %(page)s] (由%(user)s於%(time)s更改%(page_size)s位元)',
-		'thirdparty-drtrigonbot-sum_disc-parse-start': u';%d. %B %Y',
-		'thirdparty-drtrigonbot-sum_disc-parse-warning': u':* 機械人警告信息：%(page)s"''%(warning)s''"',
-		'thirdparty-drtrigonbot-sum_disc-summary-add': u'添加討論摘要：%(num)i項',
-		'thirdparty-drtrigonbot-sum_disc-summary-clean': u'添加並修改討論摘要：%(num)i項',
-		'thirdparty-drtrigonbot-sum_disc-summary-head': u'機械人',
-		'thirdparty-drtrigonbot-sum_disc-summary-mod': u'討論摘要更新：%(page)s中%(num)i項',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/unlink.py
===================================================================
--- branches/rewrite/scripts/i18n/unlink.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/unlink.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -35,9 +35,8 @@
    'de': {
    	'unlink-unlinking': u'Bot: Entlinke „%s“',
    },
-	# Author: Erdemaslancan
-	'diq': {
-		'unlink-unlinking': u'Robot: "%s" bê gıreyo',
+	'en': {
+		'unlink-unlinking': u'Robot: Unlinking "%s"',
    },
    # Author: Armando-Martin
    'es': {
@@ -201,8 +200,4 @@
    'zh-hant': {
    	'unlink-unlinking': u'機器人： 斷開連結" %s "',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'unlink-unlinking': u'機械人取消“%s”鏈接',
-	},
 }
\ No newline at end of file
Modified: branches/rewrite/scripts/i18n/welcome.py
===================================================================
--- branches/rewrite/scripts/i18n/welcome.py	2012-04-15 12:12:03 UTC (rev 10110)
+++ branches/rewrite/scripts/i18n/welcome.py	2012-04-15 12:14:14 UTC (rev 10111)
@@ -94,7 +94,6 @@
    },
    # Author: Erdemaslancan
    'diq': {
-		'welcome-updating': u'Robot:Qeyd newekerdış',
    	'welcome-welcome': u'Xeyr amey',
    },
    # Author: Crazymadlover
@@ -104,6 +103,11 @@
    	'welcome-updating': u'Ρομπότ: Ενημέρωση αρχείου καταγραφής',
    	'welcome-welcome': u'Καλώς ήρθατε!',
    },
+	'en': {
+		'welcome-bad_username': u'Robot: Adding a username that needs to be checked',
+		'welcome-updating': u'Robot: Updating log',
+		'welcome-welcome': u'Welcome!',
+	},
    # Author: Crazymadlover
    # Author: Vivaelcelta
    'es': {
@@ -457,18 +461,11 @@
    },
    # Author: Lauhenry
    # Author: Breawycker
-	# Author: Justincheng12345
    'zh-hant': {
-		'welcome-bad_username': u'機械人添加需要檢查的用戶名',
+		'welcome-bad_username': u'機器人： 添加需要檢查的使用者名',
    	'welcome-updating': u'機器人： 更新日誌',
    	'welcome-welcome': u'歡迎！',
    },
-	# Author: Justincheng12345
-	'zh-hk': {
-		'welcome-bad_username': u'機械人添加需要檢查的用戶名',
-		'welcome-updating': u'機械人更新日誌',
-		'welcome-welcome': u'歡迎！',
-	},
    'zh-yue': {
    	'welcome-updating': u'Bot: 更新日誌',
    	'welcome-welcome': u'歡迎',

    