* housekeeping: marking 'image_sample' and 'media_sample' as optional

* Update Chinese translations
* Update Cantonese translations

diff --git a/languages/messages/MessagesAr.php b/languages/messages/MessagesAr.php
index fc9f679..dc70185 100644 (file)
--- a/languages/messages/MessagesAr.php
+++ b/languages/messages/MessagesAr.php
@@ -753,9 +753,7 @@ $1 ساعة.',
 'math_tip'        => 'صيغة رياضية (لا تك)',
 'nowiki_sample'   => 'أدخل النص غير المنسق هنا',
 'nowiki_tip'      => 'أهمل تهيئة الويكي',
-'image_sample'    => 'Example.jpg',
 'image_tip'       => 'صورة مدرجة',
-'media_sample'    => 'Example.ogg',
 'media_tip'       => 'وصلة ملف وسائط',
 'sig_tip'         => 'توقيعك مع الساعة والتاريخ',
 'hr_tip'          => 'خط أفقي (تجنب الاستخدام بكثرة)',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index fbe1337..d74d1cf 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -940,9 +940,9 @@ You may ignore this message, if this account was created in error.',
 'math_tip'        => 'Mathematical formula (LaTeX)',
 'nowiki_sample'   => 'Insert non-formatted text here',
 'nowiki_tip'      => 'Ignore wiki formatting',
-'image_sample'    => 'Example.jpg',
+'image_sample'    => 'Example.jpg', # only translate this message to other languages if you have to change it
 'image_tip'       => 'Embedded image',
-'media_sample'    => 'Example.ogg',
+'media_sample'    => 'Example.ogg', # only translate this message to other languages if you have to change it
 'media_tip'       => 'Media file link',
 'sig_tip'         => 'Your signature with timestamp',
 'hr_tip'          => 'Horizontal line (use sparingly)',

diff --git a/languages/messages/MessagesYue.php b/languages/messages/MessagesYue.php
index b701cf8..564065c 100644 (file)
--- a/languages/messages/MessagesYue.php
+++ b/languages/messages/MessagesYue.php
@@ -582,9 +582,7 @@ $2',
 'math_tip'        => '數學方程（LaTeX）',
 'nowiki_sample'   => '喺呢度插入非格式代文字',
 'nowiki_tip'      => '唔理 wiki 格式',
-'image_sample'    => 'Example.jpg',
 'image_tip'       => '嵌入圖像',
-'media_sample'    => 'Example.ogg',
 'media_tip'       => '媒體檔案連結',
 'sig_tip'         => '你嘅簽名同埋時間戳',
 'hr_tip'          => '橫線（請小心用）',
@@ -1250,6 +1248,9 @@ Template:搞清楚',
 'protectedpages'          => '保護頁',
 'protectedpagestext'      => '以下嘅頁面係受保頁面，唔能夠移動或編輯',
 'protectedpagesempty'     => '響呢啲參數度，現時無頁面響度保護緊。',
+'protectedtitles'         => '保護咗嘅標題',
+'protectedtitlestext'     => '下面係一個保護咗唔䦒得嘅標題',
+'protectedtitlesempty'    => '響呢啲參數之下並無標題保護住。',
 'listusers'               => '用戶一覽',
 'specialpages'            => '特別頁',
 'spheading'               => '所有用戶嘅特別頁',

diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php
index c9d0e1e..6fa5b95 100644 (file)
--- a/languages/messages/MessagesZh_hans.php
+++ b/languages/messages/MessagesZh_hans.php
@@ -1183,6 +1183,9 @@ Template:消除歧義',
 'protectedpages'          => '已保护页面',
 'protectedpagestext'      => '以下页面已经被保护以防止移移或编辑',
 'protectedpagesempty'     => '在这些参数下没有页面正在保护。',
+'protectedtitles'         => '已保护的标题',
+'protectedtitlestext'     => '以下的页面已经被保护以防止创建',
+'protectedtitlesempty'    => '在这些参数之下并无标题正在保护。',
 'listusers'               => '用户列表',
 'specialpages'            => '特殊页面',
 'spheading'               => '所有用户的特殊页面',

diff --git a/languages/messages/MessagesZh_hant.php b/languages/messages/MessagesZh_hant.php
index c9b78a0..fdbf9d5 100644 (file)
--- a/languages/messages/MessagesZh_hant.php
+++ b/languages/messages/MessagesZh_hant.php
@@ -496,9 +496,7 @@ $2',
 'math_tip'        => '插入數學公式 (LaTeX)',
 'nowiki_sample'   => '在此插入非格式文字',
 'nowiki_tip'      => '插入非格式文字',
-'image_sample'    => 'Example.jpg',
 'image_tip'       => '嵌入圖像',
-'media_sample'    => 'Example.ogg',
 'media_tip'       => '媒體檔案連結',
 'sig_tip'         => '帶有時間的簽名',
 'hr_tip'          => '水平線 (小心使用)',
@@ -1155,8 +1153,11 @@ Template:消除歧義',
 'deadendpages'            => '斷鏈頁面',
 'deadendpagestext'        => '以下頁面沒有連結到這個wiki中的其它頁面。',
 'protectedpages'          => '已保護頁面',
-'protectedpagestext'      => '以下頁面已經被保護以防止移移或編輯',
+'protectedpagestext'      => '以下頁面已經被保護以防止移動或編輯',
 'protectedpagesempty'     => '在這些參數下沒有頁面正在保護。',
+'protectedtitles'         => '已保護的標題',
+'protectedtitlestext'     => '以下的頁面已經被保護以防止建立',
+'protectedtitlesempty'    => '在這些參數之下並無標題正在保護。',
 'listusers'               => '用戶列表',
 'specialpages'            => '特殊頁面',
 'spheading'               => '所有用戶的特殊頁面',

diff --git a/languages/messages/MessagesZh_tw.php b/languages/messages/MessagesZh_tw.php
index 01e57b1..c25bde6 100644 (file)
--- a/languages/messages/MessagesZh_tw.php
+++ b/languages/messages/MessagesZh_tw.php
@@ -477,9 +477,7 @@ $2',
 'math_tip'        => '插入數學公式 (LaTeX)',
 'nowiki_sample'   => '在此插入非格式文字',
 'nowiki_tip'      => '插入非格式文字',
-'image_sample'    => 'Example.jpg',
 'image_tip'       => '嵌入圖片',
-'media_sample'    => 'Example.ogg',
 'media_tip'       => '媒體檔案連結',
 'sig_tip'         => '帶有時間的簽名',
 'hr_tip'          => '水平線 (小心使用)',

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index fe00d19..3ec1e8b 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -121,6 +121,7 @@ $wgOptionalMessages = array(
        'allpages-summary',
        'booksources-summary',
        'ipblocklist-summary',
+       'protectedtitles-summary',
        'listusers-summary',
        'longpages-summary',
        'preferences-summary',
@@ -182,6 +183,8 @@ $wgOptionalMessages = array(
        'variantname-ku',
        'rc-change-size',
        'resetpass_text',
+       'image_sample',
+       'media_sample',
        'widthheight',
        'exif-fnumber-format',
        'exif-focallength-format',