From 59d988d7fdac179cd521d755ffa75e5c5c329f73 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Sat, 6 Aug 2011 09:35:25 +0000
Subject: [PATCH] Localisation updates for magic words from
 http://translatewiki.net.

---
 languages/messages/MessagesAn.php      |  2 +-
 languages/messages/MessagesBg.php      |  6 +++
 languages/messages/MessagesDe.php      |  2 +
 languages/messages/MessagesGsw.php     |  4 ++
 languages/messages/MessagesLb.php      |  1 +
 languages/messages/MessagesNds_nl.php  |  1 +
 languages/messages/MessagesNo.php      | 69 ++++++++++++++++++++++++++
 languages/messages/MessagesQu.php      |  3 ++
 languages/messages/MessagesTr.php      |  2 +-
 languages/messages/MessagesZh_hans.php | 16 +++---
 10 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/languages/messages/MessagesAn.php b/languages/messages/MessagesAn.php
index a375b4b89a..0479b25bcb 100644
--- a/languages/messages/MessagesAn.php
+++ b/languages/messages/MessagesAn.php
@@ -52,7 +52,7 @@ $magicWords = array(
 	'displaytitle'          => array( '1', 'TÍTOL', 'MOSTRARTÍTULO', 'MOSTRARTITULO', 'DISPLAYTITLE' ),
 	'currentversion'        => array( '1', 'BERSIÓNAUTUAL', 'BERSIONAUTUAL', 'REVISIÓNACTUAL', 'VERSIONACTUAL', 'VERSIÓNACTUAL', 'CURRENTVERSION' ),
 	'language'              => array( '0', '#LUENGA:', '#IDIOMA:', '#LANGUAGE:' ),
-	'special'               => array( '0', 'espezial', 'especial', 'special' ),
+	'special'               => array( '0', 'especial', 'espezial', 'special' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesBg.php b/languages/messages/MessagesBg.php
index a4ec10cc20..e21db8c20f 100644
--- a/languages/messages/MessagesBg.php
+++ b/languages/messages/MessagesBg.php
@@ -62,6 +62,7 @@ $magicWords = array(
 	'toc'                   => array( '0', '__СЪДЪРЖАНИЕ__', '__TOC__' ),
 	'noeditsection'         => array( '0', '__БЕЗ_РЕДАКТИРАНЕ_НА_РАЗДЕЛИ__', '__NOEDITSECTION__' ),
 	'currentmonth'          => array( '1', 'ТЕКУЩМЕСЕЦ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'         => array( '1', 'ТЕКУЩМЕСЕЦ1', 'CURRENTMONTH1' ),
 	'currentmonthname'      => array( '1', 'ТЕКУЩМЕСЕЦИМЕ', 'CURRENTMONTHNAME' ),
 	'currentmonthnamegen'   => array( '1', 'ТЕКУЩМЕСЕЦИМЕРОД', 'CURRENTMONTHNAMEGEN' ),
 	'currentmonthabbrev'    => array( '1', 'ТЕКУЩМЕСЕЦСЪКР', 'CURRENTMONTHABBREV' ),
@@ -75,7 +76,9 @@ $magicWords = array(
 	'numberofarticles'      => array( '1', 'БРОЙСТАТИИ', 'NUMBEROFARTICLES' ),
 	'numberoffiles'         => array( '1', 'БРОЙФАЙЛОВЕ', 'NUMBEROFFILES' ),
 	'numberofusers'         => array( '1', 'БРОЙПОТРЕБИТЕЛИ', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'   => array( '1', 'БРОЙАКТИВНИПОТРЕБИТЕЛИ', 'NUMBEROFACTIVEUSERS' ),
 	'numberofedits'         => array( '1', 'БРОЙРЕДАКЦИИ', 'NUMBEROFEDITS' ),
+	'numberofviews'         => array( '1', 'БРОЙПРЕГЛЕДИ', 'NUMBEROFVIEWS' ),
 	'pagename'              => array( '1', 'СТРАНИЦА', 'PAGENAME' ),
 	'pagenamee'             => array( '1', 'СТРАНИЦАИ', 'PAGENAMEE' ),
 	'namespace'             => array( '1', 'ИМЕННОПРОСТРАНСТВО', 'NAMESPACE' ),
@@ -108,6 +111,7 @@ $magicWords = array(
 	'servername'            => array( '0', 'ИМЕНАСЪРВЪРА', 'SERVERNAME' ),
 	'scriptpath'            => array( '0', 'ПЪТДОСКРИПТА', 'SCRIPTPATH' ),
 	'grammar'               => array( '0', 'ГРАМАТИКА:', 'GRAMMAR:' ),
+	'gender'                => array( '0', 'ПОЛ:', 'GENDER:' ),
 	'currentweek'           => array( '1', 'ТЕКУЩАСЕДМИЦА', 'CURRENTWEEK' ),
 	'currentdow'            => array( '1', 'ТЕКУЩ_ДЕН_ОТ_СЕДМИЦАТА', 'CURRENTDOW' ),
 	'revisionid'            => array( '1', 'ИД_НА_ВЕРСИЯТА', 'REVISIONID' ),
@@ -129,6 +133,8 @@ $magicWords = array(
 	'numberofadmins'        => array( '1', 'БРОЙАДМИНИСТРАТОРИ', 'NUMBEROFADMINS' ),
 	'defaultsort'           => array( '1', 'СОРТКАТ:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
 	'hiddencat'             => array( '1', '__СКРИТАКАТЕГОРИЯ__', '__HIDDENCAT__' ),
+	'index'                 => array( '1', '__ИНДЕКСИРАНЕ__', '__INDEX__' ),
+	'noindex'               => array( '1', '__БЕЗИНДЕКСИРАНЕ__', '__NOINDEX__' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 9bff8e5aa5..f84b599b0b 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -306,6 +306,7 @@ $magicWords = array(
 	'ns'                    => array( '0', 'NR:', 'NS:' ),
 	'nse'                   => array( '0', 'NR_URL:', 'NSE:' ),
 	'localurl'              => array( '0', 'LOKALE_URL:', 'LOCALURL:' ),
+	'articlepath'           => array( '0', 'ARTIKELPFAD', 'ARTICLEPATH' ),
 	'scriptpath'            => array( '0', 'SKRIPTPFAD', 'SCRIPTPATH' ),
 	'stylepath'             => array( '0', 'STYLEPFAD', 'STYLEPATH' ),
 	'grammar'               => array( '0', 'GRAMMATIK:', 'GRAMMAR:' ),
@@ -318,6 +319,7 @@ $magicWords = array(
 	'revisionday'           => array( '1', 'REVISIONSTAG', 'REVISIONDAY' ),
 	'revisionday2'          => array( '1', 'REVISIONSTAG2', 'REVISIONDAY2' ),
 	'revisionmonth'         => array( '1', 'REVISIONSMONAT', 'REVISIONMONTH' ),
+	'revisionmonth1'        => array( '1', 'REVISIONSMONAT1', 'REVISIONMONTH1' ),
 	'revisionyear'          => array( '1', 'REVISIONSJAHR', 'REVISIONYEAR' ),
 	'revisiontimestamp'     => array( '1', 'REVISIONSZEITSTEMPEL', 'REVISIONTIMESTAMP' ),
 	'revisionuser'          => array( '1', 'REVISIONSBENUTZER', 'REVISIONUSER' ),
diff --git a/languages/messages/MessagesGsw.php b/languages/messages/MessagesGsw.php
index 715934f47f..c356618f51 100644
--- a/languages/messages/MessagesGsw.php
+++ b/languages/messages/MessagesGsw.php
@@ -114,6 +114,10 @@ $specialPageAliases = array(
 	'Withoutinterwiki'          => array( 'Ohni Interwiki' ),
 );
 
+$magicWords = array(
+	'displaytitle'          => array( '1', 'SYTETITEL', 'SEITENTITEL', 'DISPLAYTITLE' ),
+);
+
 $linkTrail = '/^([äöüßa-z]+)(.*)$/sDu';
 
 $messages = array(
diff --git a/languages/messages/MessagesLb.php b/languages/messages/MessagesLb.php
index 6bc9404849..d3fcc50b4f 100644
--- a/languages/messages/MessagesLb.php
+++ b/languages/messages/MessagesLb.php
@@ -141,6 +141,7 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
+	'redirect'              => array( '0', '#VIRULEEDUNG', '#WEITERLEITUNG', '#REDIRECT' ),
 	'numberofarticles'      => array( '1', 'Artikelen', 'ARTIKELANZAHL', 'NUMBEROFARTICLES' ),
 	'numberoffiles'         => array( '1', 'Fichieren', 'DATEIANZAHL', 'NUMBEROFFILES' ),
 	'numberofusers'         => array( '1', 'Benotzerzuel', 'BENUTZERANZAHL', 'NUMBEROFUSERS' ),
diff --git a/languages/messages/MessagesNds_nl.php b/languages/messages/MessagesNds_nl.php
index 66e30cfd58..d1b9034372 100644
--- a/languages/messages/MessagesNds_nl.php
+++ b/languages/messages/MessagesNds_nl.php
@@ -66,6 +66,7 @@ $bookstoreList = array(
         'Koninklijke Bibliotheek' => 'http://opc4.kb.nl/DB=1/SET=5/TTL=1/CMD?ACT=SRCH&IKT=1007&SRT=RLV&TRM=$1'
 );
 
+#!!# Translation <b>HLEERSTE:</b> is used more than once for <a href="#mw-sp-magic-lcfirst">lcfirst</a> and <a href="#mw-sp-magic-ucfirst">ucfirst</a>.
 $magicWords = array(
 	'redirect'              => array( '0', '#DEURVERWIEZING', '#DOORVERWIJZING', '#REDIRECT' ),
 	'notoc'                 => array( '0', '__GIENONDERWARPEN__', '__GEENINHOUD__', '__NOTOC__' ),
diff --git a/languages/messages/MessagesNo.php b/languages/messages/MessagesNo.php
index c77cb50056..35eb9c6130 100644
--- a/languages/messages/MessagesNo.php
+++ b/languages/messages/MessagesNo.php
@@ -183,6 +183,33 @@ $specialPageAliases = array(
 
 $magicWords = array(
 	'redirect'              => array( '0', '#OMDIRIGERING', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__INGENINNHOLDSFORTEGNELSE__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__INTETGALLERI__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__TVINGINNHOLDSFORTEGNELSE__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__INNHOLDSFORTEGNELSE__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__INGENSEKSJONSREDIGERING__', '__NOEDITSECTION__' ),
+	'currentmonth'          => array( '1', 'NÅVÆRENDEMÅNED', 'NÅVÆRENDEMÅNED2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'         => array( '1', 'NÅVÆRENDEMÅNED1', 'CURRENTMONTH1' ),
+	'currentmonthname'      => array( '1', 'NÅVÆRENDEMÅNEDSNAVN', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', 'NÅVÆRENDEMÅNEDSNAVNGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', 'NÅVÆRENDEMÅNEDSNAVNKORT', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'NÅVÆRENDEDAG', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'NÅVÆRENDEDAG2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'NÅVÆRENDEDAGSNAVN', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'NÅVÆRENDEÅR', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'NÅVÆRENDETID', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'NÅVÆRENDETIME', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'LOKALMÅNED', 'LOKALMÅNED2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'           => array( '1', 'LOKALMÅNED1', 'LOCALMONTH1' ),
+	'localmonthname'        => array( '1', 'LOKALMÅNEDSNAVN', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', 'LOKALMÅNEDSNAVNGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', 'LOKALMÅNEDSNAVNKORT', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'LOKALDAG', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'LOKALDAG2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'LOKALDAGSNAVN', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'LOKALTÅR', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'LOKALTID', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'LOKALTIME', 'LOCALHOUR' ),
 	'numberofpages'         => array( '1', 'ANTALLSIDER', 'NUMBEROFPAGES' ),
 	'numberofarticles'      => array( '1', 'ANTALLARTIKLER', 'NUMBEROFARTICLES' ),
 	'numberoffiles'         => array( '1', 'ANTALLFILER', 'NUMBEROFFILES' ),
@@ -217,6 +244,8 @@ $magicWords = array(
 	'img_framed'            => array( '1', 'ramme', 'framed', 'enframed', 'frame' ),
 	'img_frameless'         => array( '1', 'ingenramme', 'frameless' ),
 	'img_page'              => array( '1', 'side=$1', 'side $1', 'page=$1', 'page $1' ),
+	'img_upright'           => array( '1', 'portrett', 'portrett=$1', 'portrett_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_baseline'          => array( '1', 'grunnlinje', 'baseline' ),
 	'img_top'               => array( '1', 'topp', 'top' ),
 	'img_middle'            => array( '1', 'midt', 'middle' ),
 	'img_bottom'            => array( '1', 'bunn', 'bottom' ),
@@ -225,12 +254,52 @@ $magicWords = array(
 	'ns'                    => array( '0', 'NR:', 'NS:' ),
 	'localurl'              => array( '0', 'LOKALURL:', 'LOCALURL:' ),
 	'localurle'             => array( '0', 'LOKALURLE:', 'LOCALURLE:' ),
+	'articlepath'           => array( '0', 'ARTIKKELSTI', 'ARTICLEPATH' ),
 	'server'                => array( '0', 'TJENER', 'SERVER' ),
 	'servername'            => array( '0', 'TJENERNAVN', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'SKRIPTSTI', 'SCRIPTPATH' ),
+	'stylepath'             => array( '0', 'STILSTI', 'STYLEPATH' ),
 	'grammar'               => array( '0', 'GRAMMATIKK:', 'GRAMMAR:' ),
 	'gender'                => array( '0', 'KJØNN:', 'GENDER:' ),
+	'notitleconvert'        => array( '0', '__INGENTITTELKONVERTERING__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'      => array( '0', '__INGENINNHOLDSKONVERTERING__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'           => array( '1', 'NÅVÆRENDEUKE', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'NÅVÆRENDEUKEDAG', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'LOKALUKE', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'LOKALUKEDAG', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'REVISJONSID', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'REVISJONSDAG', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'REVISJONSDAG2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'REVISJONSMÅNED', 'REVISIONMONTH' ),
+	'revisionmonth1'        => array( '1', 'REVISJONSMÅNED1', 'REVISIONMONTH1' ),
+	'revisionyear'          => array( '1', 'REVISJONSÅR', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'REVISJONSTIDSSTEMPEL', 'REVISIONTIMESTAMP' ),
+	'revisionuser'          => array( '1', 'REVISJONSBRUKER', 'REVISIONUSER' ),
+	'plural'                => array( '0', 'FLERTALL:', 'PLURAL:' ),
+	'raw'                   => array( '0', 'RÅ:', 'RAW:' ),
+	'displaytitle'          => array( '1', 'VISTITTEL', 'DISPLAYTITLE' ),
+	'newsectionlink'        => array( '1', '__NYSEKSJONSLENKE__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'      => array( '1', '__INGENNYSEKSJONSLENKE__', '__NONEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'NÅVÆRENDEVERSJON', 'CURRENTVERSION' ),
+	'currenttimestamp'      => array( '1', 'NÅVÆRENDETIDSSTEMPEL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'LOKALTTIDSSTEMPEL', 'LOCALTIMESTAMP' ),
+	'contentlanguage'       => array( '1', 'INNHOLDSSPRÅK', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'SIDERINAVNEROM:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'ANTALLADMINISTRATORER', 'NUMBEROFADMINS' ),
 	'special'               => array( '0', 'spesial', 'special' ),
+	'defaultsort'           => array( '1', 'STANDARDSORTERING', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
 	'filepath'              => array( '0', 'FILSTI:', 'FILEPATH:' ),
+	'hiddencat'             => array( '1', '__SKJULTKATEGORI__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'SIDERIKATEGORI', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'SIDESTØRRELSE', 'PAGESIZE' ),
+	'index'                 => array( '1', '__INDEKSER__', '__INDEX__' ),
+	'noindex'               => array( '1', '__INGENINDEKSERING__', '__NOINDEX__' ),
+	'numberingroup'         => array( '1', 'NUMMERIGRUPPE', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'        => array( '1', '__STATISTOMDIRIGERING__', '__STATICREDIRECT__' ),
+	'protectionlevel'       => array( '1', 'BESKYTTELSESNIVÅ', 'PROTECTIONLEVEL' ),
+	'formatdate'            => array( '0', 'datoformat', 'formatdate', 'dateformat' ),
+	'url_path'              => array( '0', 'STI', 'PATH' ),
+	'url_query'             => array( '0', 'SPØRRING', 'QUERY' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesQu.php b/languages/messages/MessagesQu.php
index 8184ee1007..0ad83d470b 100644
--- a/languages/messages/MessagesQu.php
+++ b/languages/messages/MessagesQu.php
@@ -125,6 +125,9 @@ $specialPageAliases = array(
 	'Withoutinterwiki'          => array( 'Interwikinnaq', 'Wikipurannaq' ),
 );
 
+#!!# Translation <b>HORA_ACTUAL</b> is used more than once for <a href="#mw-sp-magic-currenttime">currenttime</a> and <a href="#mw-sp-magic-currenthour">currenthour</a>.
+#!!# Translation <b>HORAACTUAL</b> is used more than once for <a href="#mw-sp-magic-currenttime">currenttime</a> and <a href="#mw-sp-magic-currenthour">currenthour</a>.
+#!!# Translation <b>HORALOCAL</b> is used more than once for <a href="#mw-sp-magic-localtime">localtime</a> and <a href="#mw-sp-magic-localhour">localhour</a>.
 $magicWords = array(
 	'redirect'              => array( '0', '#PUSAPUNA', '#REDIRECCIÓN', '#REDIRECCION', '#REDIRECT' ),
 	'notoc'                 => array( '0', '__YUYARINANNAQ__', '__NOTDC__', '__NOTOC__' ),
diff --git a/languages/messages/MessagesTr.php b/languages/messages/MessagesTr.php
index c99610be2a..817d11fcaf 100644
--- a/languages/messages/MessagesTr.php
+++ b/languages/messages/MessagesTr.php
@@ -168,7 +168,7 @@ $magicWords = array(
 	'nogallery'             => array( '0', '__GALERÄ°YOK__', '__NOGALLERY__' ),
 	'forcetoc'              => array( '0', '__İÇİNDEKİLERZORUNLU__', '__FORCETOC__' ),
 	'toc'                   => array( '0', '__İÇİNDEKİLER__', '__TOC__' ),
-	'noeditsection'         => array( '0', '__DEĞİŞTİRYOK__', '__NOEDITSECTION__' ),
+	'noeditsection'         => array( '0', '__DEĞİŞTİRYOK__', '__DÜZENLEMEYOK__', '__NOEDITSECTION__' ),
 	'noheader'              => array( '0', '__BAŞLIKYOK__', '__NOHEADER__' ),
 	'currentmonth'          => array( '1', 'MEVCUTAY', 'MEVCUTAY2', 'GÜNCELAY', 'GÜNCELAY2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'         => array( '1', 'MEVCUTAY1', 'GÜNCELAY1', 'CURRENTMONTH1' ),
diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php
index e424e5494e..b9c70924b2 100644
--- a/languages/messages/MessagesZh_hans.php
+++ b/languages/messages/MessagesZh_hans.php
@@ -196,18 +196,18 @@ $specialPageAliases = array(
 
 $magicWords = array(
 	'redirect'              => array( '0', '#重定向', '#REDIRECT' ),
-	'notoc'                 => array( '0', '__无目录__', '__NOTOC__' ),
-	'nogallery'             => array( '0', '__无画廊__', '__NOGALLERY__' ),
-	'forcetoc'              => array( '0', '__逼出目录__', '__FORCETOC__' ),
-	'toc'                   => array( '0', '__目录__', '__TOC__' ),
-	'noeditsection'         => array( '0', '__没有编辑节__', '__NOEDITSECTION__' ),
+	'notoc'                 => array( '0', '_无目录_', '__NOTOC__' ),
+	'nogallery'             => array( '0', '_无图库_', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '_强显目录_', '__FORCETOC__' ),
+	'toc'                   => array( '0', '_目录_', '__TOC__' ),
+	'noeditsection'         => array( '0', '_无段落编辑_', '__NOEDITSECTION__' ),
 	'currentmonth'          => array( '1', '本月', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'         => array( '1', '本月1', 'CURRENTMONTH1' ),
-	'currentmonthname'      => array( '1', '本月名', 'CURRENTMONTHNAME' ),
-	'currentmonthabbrev'    => array( '1', '本月短', 'CURRENTMONTHABBREV' ),
+	'currentmonthname'      => array( '1', '本月名称', 'CURRENTMONTHNAME' ),
+	'currentmonthabbrev'    => array( '1', '本月简称', 'CURRENTMONTHABBREV' ),
 	'currentday'            => array( '1', '今天', 'CURRENTDAY' ),
 	'currentday2'           => array( '1', '今天2', 'CURRENTDAY2' ),
-	'currentyear'           => array( '1', '本年', 'CURRENTYEAR' ),
+	'currentyear'           => array( '1', '今年', 'CURRENTYEAR' ),
 	'numberofpages'         => array( '1', '页数', 'NUMBEROFPAGES' ),
 	'numberofarticles'      => array( '1', '条目数', 'NUMBEROFARTICLES' ),
 	'numberoffiles'         => array( '1', '文件数', 'NUMBEROFFILES' ),
-- 
2.20.1