http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99504
Revision: 99504
Author: catrope
Date: 2011-10-11 17:36:07 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
1.18wmf1: MFT r98848, r98855, r98884, r98989, r99396
Modified Paths:
--------------
branches/wmf/1.18wmf1/extensions/Narayam/js/ext.narayam.rules.si-singlish.js
branches/wmf/1.18wmf1/languages/Names.php
branches/wmf/1.18wmf1/languages/messages/MessagesEn.php
Modified:
branches/wmf/1.18wmf1/extensions/Narayam/js/ext.narayam.rules.si-singlish.js
===================================================================
---
branches/wmf/1.18wmf1/extensions/Narayam/js/ext.narayam.rules.si-singlish.js
2011-10-11 17:20:44 UTC (rev 99503)
+++
branches/wmf/1.18wmf1/extensions/Narayam/js/ext.narayam.rules.si-singlish.js
2011-10-11 17:36:07 UTC (rev 99504)
@@ -8,15 +8,17 @@
// Normal rules
var rules = [
-['\\\\([A-Za-z\\>_~\\.0-9])', '\\\\','$1'],
-
-['ඬ්හ්a', '', 'ඳ'], // nndha
+//['ඬ්හ්a', '', 'ඳ'], // nndha
+['ඬ්h', '', 'ඳ්'], // nndh
['න්න්d', '', 'ඬ්'], // nnd
['න්න්g', '', 'ඟ්'], // nng
['ශ්රිi', '', 'ශ්රී'], // shrii
['ශ්රi', '', 'ශ්රි'], // shri
['ශ්r', '', 'ශ්ර'], // shr
+['([\\u0D9A-\\u0DC6])්\\u200Dර්u', '', '$1ෘ'], // <consonant>ru
+['([\\u0D9A-\\u0DC6])ෘu', '', '$1ෲ'], // <consonant>ruu
+
['([\\u0D9A-\\u0DC6])්a', '', '$1'], // <consonant>a
['([\\u0D9A-\\u0DC6])a', '', '$1ා'], // <consonant>aa
['([\\u0D9A-\\u0DC6])්A', '', '$1ැ'], // <consonant>A
@@ -32,6 +34,8 @@
['([\\u0D9A-\\u0DC6])u', '', '$1ෞ'], // <consonant>au
['([\\u0D9A-\\u0DC6])්I', '', '$1ෛ'], // <consonant>I
+['([\\u0D9A-\\u0DC6]්)r', '', '$1\u200Dර්'], // <consonant>r
+
['ළුu', '', 'ළුු'], // Luu
['(ක්h|K)', '', 'ඛ්'], // kh K
Modified: branches/wmf/1.18wmf1/languages/Names.php
===================================================================
--- branches/wmf/1.18wmf1/languages/Names.php 2011-10-11 17:20:44 UTC (rev
99503)
+++ branches/wmf/1.18wmf1/languages/Names.php 2011-10-11 17:36:07 UTC (rev
99504)
@@ -148,7 +148,7 @@
'it' => 'Italiano', # Italian
'iu' => 'ᐃᓄᒃᑎᑐᑦ/inuktitut', # Inuktitut (macro language - do no
localise, see ike/ikt - falls back to ike-cans)
'ja' => '日本語', # Japanese
- 'jam' => 'Patios', # Jamaican Creole English
+ 'jam' => 'Patois', # Jamaican Creole English
'jbo' => 'Lojban', # Lojban
'jut' => 'Jysk', # Jutish / Jutlandic
'jv' => 'Basa Jawa', # Javanese
Modified: branches/wmf/1.18wmf1/languages/messages/MessagesEn.php
===================================================================
--- branches/wmf/1.18wmf1/languages/messages/MessagesEn.php 2011-10-11
17:20:44 UTC (rev 99503)
+++ branches/wmf/1.18wmf1/languages/messages/MessagesEn.php 2011-10-11
17:36:07 UTC (rev 99504)
@@ -1499,27 +1499,27 @@
Details can be found in the
[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].",
'rev-deleted-text-unhide' => "This page revision has been '''deleted'''.
Details can be found in the
[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].
-As an administrator you can still [$1 view this revision] if you wish to
proceed.",
+You can still [$1 view this revision] if you wish to proceed.",
'rev-suppressed-text-unhide' => "This page revision has been '''suppressed'''.
Details can be found in the
[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].
-As an administrator you can still [$1 view this revision] if you wish to
proceed.",
+You can still [$1 view this revision] if you wish to proceed.",
'rev-deleted-text-view' => "This page revision has been '''deleted'''.
-As an administrator you can view it; details can be found in the
[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].",
+You can view it; details can be found in the
[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].",
'rev-suppressed-text-view' => "This page revision has been '''suppressed'''.
-As an administrator you can view it; details can be found in the
[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression
log].",
+You can view it; details can be found in the
[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression
log].",
'rev-deleted-no-diff' => "You cannot view this diff because one of the
revisions has been '''deleted'''.
Details can be found in the
[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].",
'rev-suppressed-no-diff' => "You cannot view this diff because one of the
revisions has been '''deleted'''.",
'rev-deleted-unhide-diff' => "One of the revisions of this diff has been
'''deleted'''.
Details can be found in the
[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].
-As an administrator you can still [$1 view this diff] if you wish to proceed.",
+You can still [$1 view this diff] if you wish to proceed.",
'rev-suppressed-unhide-diff' => "One of the revisions of this diff has been
'''suppressed'''.
Details can be found in the
[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].
-As an administrator you can still [$1 view this diff] if you wish to proceed.",
+You can still [$1 view this diff] if you wish to proceed.",
'rev-deleted-diff-view' => "One of the revisions of this diff has been
'''deleted'''.
-As an administrator you can view this diff; details can be found in the
[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].",
+You can view this diff; details can be found in the
[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].",
'rev-suppressed-diff-view' => "One of the revisions of this diff has been
'''suppressed'''.
-As an administrator you can view this diff; details can be found in the
[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression
log].",
+You can view this diff; details can be found in the
[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression
log].",
'rev-delundel' => 'show/hide',
'rev-showdeleted' => 'show',
'revisiondelete' => 'Delete/undelete revisions',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
