http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71886
Revision: 71886 Author: siebrand Date: 2010-08-29 16:42:59 +0000 (Sun, 29 Aug 2010) Log Message: ----------- Merge r71881, r71413 to 1.16wmf4: * Change language name of North Frisian (frr) from "Frasch" to "Nordfriisk" * (bug 24794) Update Tatar link trail. Done using: * svn merge -r71412:71413 svn+ssh://[email protected]/svnroot/mediawiki/trunk/phase3 * svn merge -r71880:71881 svn+ssh://[email protected]/svnroot/mediawiki/trunk/phase3 After that, reverted all files the above revs didn't touch (89 of them) and manually added svn:mergeinfo property. Please let me know if there would have been an easier way... Modified Paths: -------------- branches/wmf/1.16wmf4/languages/Names.php branches/wmf/1.16wmf4/languages/messages/MessagesTt_cyrl.php Property Changed: ---------------- branches/wmf/1.16wmf4/languages/Names.php branches/wmf/1.16wmf4/languages/messages/MessagesTt_cyrl.php Modified: branches/wmf/1.16wmf4/languages/Names.php =================================================================== --- branches/wmf/1.16wmf4/languages/Names.php 2010-08-29 13:38:26 UTC (rev 71885) +++ branches/wmf/1.16wmf4/languages/Names.php 2010-08-29 16:42:59 UTC (rev 71886) @@ -98,7 +98,7 @@ 'fr' => 'Français', # French 'frc' => 'Français cadien', # Cajun French 'frp' => 'Arpetan', # Franco-Provençal/Arpitan - 'frr' => 'Frasch', # North Frisian + 'frr' => 'Nordfriisk', # North Frisian 'fur' => 'Furlan', # Friulian 'fy' => 'Frysk', # Frisian 'ga' => 'Gaeilge', # Irish Property changes on: branches/wmf/1.16wmf4/languages/Names.php ___________________________________________________________________ Added: svn:mergeinfo + /trunk/phase3:71413 Modified: branches/wmf/1.16wmf4/languages/messages/MessagesTt_cyrl.php =================================================================== --- branches/wmf/1.16wmf4/languages/messages/MessagesTt_cyrl.php 2010-08-29 13:38:26 UTC (rev 71885) +++ branches/wmf/1.16wmf4/languages/messages/MessagesTt_cyrl.php 2010-08-29 16:42:59 UTC (rev 71886) @@ -127,6 +127,8 @@ 'localurle' => array( '0', 'URINLIURLE:', 'ЛОКАЛЬНЫЙ_АДРЕС_2:', 'LOCALURLE:' ), ); +$linkTrail = '/^([a-zабвгдеёжзийклмнопрстуфхцчшщъыьэюяӘәӨөҮүҖҗҢңҺһ]+)(.*)$/sDu'; + $messages = array( # User preference toggles 'tog-underline' => 'Сылтамаларның астына сызу:', Property changes on: branches/wmf/1.16wmf4/languages/messages/MessagesTt_cyrl.php ___________________________________________________________________ Added: svn:mergeinfo + /trunk/phase3:71881 _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
