X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Fapi%2Fi18n%2Fzh-hans.json;h=41ce9c4a6b0d923dd409525b71b5ca3f74c728ac;hb=afa2e1e66088ae2c35b03e616549203138e1e03b;hp=3c667f1d7582f4e330b202c67ed8f4addb1f17b7;hpb=74bc2fc1eb77ac7f2fb80f0bcfe43f1261fff5f6;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/api/i18n/zh-hans.json b/includes/api/i18n/zh-hans.json
index 3c667f1d75..41ce9c4a6b 100644
--- a/includes/api/i18n/zh-hans.json
+++ b/includes/api/i18n/zh-hans.json
@@ -229,6 +229,14 @@
"apihelp-managetags-example-delete": "å é¤vandlaismæ ç¾ï¼åå Misspelt",
"apihelp-managetags-example-activate": "æ¿æ´»ä¸ä¸ªå为spamçæ ç¾ï¼åå For use in edit patrolling",
"apihelp-managetags-example-deactivate": "åç¨ä¸ä¸ªå为spamçæ ç¾ï¼åå No longer required",
+ "apihelp-mergehistory-description": "å并页é¢åå²ã",
+ "apihelp-mergehistory-param-from": "å°è¢«å并åå²ç页é¢çæ é¢ãä¸è½ä¸$1fromidä¸èµ·ä½¿ç¨ã",
+ "apihelp-mergehistory-param-fromid": "å°è¢«å并åå²ç页é¢ç页é¢IDãä¸è½ä¸$1fromä¸èµ·ä½¿ç¨ã",
+ "apihelp-mergehistory-param-to": "å°è¦å并åå²ç页é¢çæ é¢ãä¸è½ä¸$1toidä¸èµ·ä½¿ç¨ã",
+ "apihelp-mergehistory-param-toid": "å°è¦å并åå²ç页é¢ç页é¢IDãä¸è½ä¸$1toä¸èµ·ä½¿ç¨ã",
+ "apihelp-mergehistory-param-reason": "åå²å并çåå ã",
+ "apihelp-mergehistory-example-merge": "å°Oldpageçå®æ´åå²å并è³Newpageã",
+ "apihelp-mergehistory-example-merge-timestamp": "å°Oldpageç´å°2015-12-31T04:37:41Zç页é¢ä¿®è®¢çæ¬å并è³Newpageã",
"apihelp-move-description": "移å¨ä¸ä¸ªé¡µé¢ã",
"apihelp-move-param-from": "è¦éå½åç页é¢æ é¢ãä¸è½ä¸$1fromidä¸èµ·ä½¿ç¨ã",
"apihelp-move-param-fromid": "æ¨å¸æ移å¨ç页é¢IDãä¸è½ä¸$1fromä¸èµ·ä½¿ç¨ã",
@@ -940,7 +948,7 @@
"apihelp-query+redirects-param-show": "åªæ¾ç¤ºç¬¦åè¿äºæ åç项ç®ï¼\n;fragment:åªæ¾ç¤ºå¸¦ç¢ççéå®åã\n;!fragment:åªæ¾ç¤ºä¸å¸¦ç¢ççéå®åã",
"apihelp-query+redirects-example-simple": "è·åè³[[Main Page]]çéå®åå表ã",
"apihelp-query+redirects-example-generator": "è·åææéå®åè³[[Main Page]]çä¿¡æ¯ã",
- "apihelp-query+revisions-description": "è·å修订çæ¬ä¿¡æ¯ã\n\nå¯ç¨äºä»¥ä¸å 个æ¹é¢ï¼\n# éè¿è®¾ç½®titleæpageidè·åä¸æ¹é¡µé¢ï¼ææ°ä¿®è®¢ï¼çæ°æ®ã\n# éè¿ä½¿ç¨å¸¦startãendælimitçtitleæpageidè·åç»å®é¡µé¢çå¤ä¸ªä¿®è®¢ã\n# éè¿revid设置ä¸æ¹ä¿®è®¢çIDè·åå®ä»¬çæ°æ®ã",
+ "apihelp-query+revisions-description": "è·å修订çæ¬ä¿¡æ¯ã\n\nå¯ç¨äºä»¥ä¸å 个æ¹é¢ï¼\n# éè¿è®¾ç½®æ é¢æ页é¢IDè·åä¸æ¹é¡µé¢ï¼ææ°ä¿®è®¢ï¼çæ°æ®ã\n# éè¿ä½¿ç¨å¸¦startãendælimitçæ é¢æ页é¢IDè·åç»å®é¡µé¢çå¤ä¸ªä¿®è®¢ã\n# éè¿revid设置ä¸æ¹ä¿®è®¢çIDè·åå®ä»¬çæ°æ®ã",
"apihelp-query+revisions-paraminfo-singlepageonly": "å¯è½åªè½ä¸åä¸é¡µé¢ä½¿ç¨ï¼æ¨¡å¼#2ï¼ã",
"apihelp-query+revisions-param-startid": "ä»åªä¸ªä¿®è®¢çæ¬IDå¼å§å举ã",
"apihelp-query+revisions-param-endid": "å¨æ¤ä¿®è®¢çæ¬IDåæ¢ä¿®è®¢å举ã",