ArchiveOrangemail archive

MediaWiki CVS commits


mediawiki-cvs.lists.wikimedia.org
(List home) (Recent threads) (101 other Wikimedia lists)

Subscription Options

  • RSS or Atom: Read-only subscription using a browser or aggregator. This is the recommended way if you don't need to send messages to the list. You can learn more about feed syndication and clients here.
  • Conventional: All messages are delivered to your mail address, and you can reply. To subscribe, send an email to the list's subscribe address with "subscribe" in the subject line, or visit the list's homepage here.
  • This list contains about 112,241 messages, beginning Dec 2003
  • This list doesn't seem to be active
Report the Spam
This button sends a spam report to the moderator. Please use it sparingly. For other removal requests, read this.
Are you sure? yes no

SVN: [67746] branches/wmf/1.16wmf4/extensions/UsabilityInitiative

catrope1276110987Wed, 09 Jun 2010 19:16:27 +0000 (UTC)
http://www.mediawiki.org/wiki/Special:Code/Me...

Revision: 67746
Author:   catrope
Date:     2010-06-09 19:16:16 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
1.16wmf4: Update UsabilityInitiative to r67741 and merge r67743

Modified Paths:
--------------
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ApiClickTracking.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.alias.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.sql
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Makefile
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptIn.alias.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptIn.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptInLink.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefStats/PrefStats.alias.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefStats/PrefStats.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.alias.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.classes.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitchLink.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UpdateMyPrefs/UpdateMyPrefs.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UserDailyContribs/UserDailyContribs.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/ExpandableSearch/ExpandableSearch.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.hooks.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/AddMediaWizard/AddMediaWizard.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Highlight/Highlight.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Preview/Preview.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Publish/Publish.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/TemplateEditor/TemplateEditor.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Templates/Templates.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toc/Toc.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/combined.css
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/combined.min.css
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/vector.collapsibleNav.css
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.browser.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.dialogs.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.min.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/thirdparty/contentCollector.js

Added Paths:
-----------
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/patch-additional_info.sql
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/ExpandableSearch/
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/vector.expandableSearch.css
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.expandableField.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/thirdparty/

Property Changed:
----------------
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js
    branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js


Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646
/branches/wmf-deployment/extensions/UsabilityInitiative:60970
/trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66324,66331-66335,66402,66565,66623,66631,66642-66644,66655,66725,66728,67204,67227,67281,67354,67455
/trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,65387,65391,65555,65590
   + /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646
/branches/wmf-deployment/extensions/UsabilityInitiative:60970
/trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66324,66331-66335,66337-67741,67743-67744
/trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,65387,65391,65555,65590

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ApiClickTracking.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ApiClickTracking.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ApiClickTracking.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -19,7 +19,15 @@
 		$this->validateParams( $params );
 		$eventid_to_lookup = $params['eventid'];
 		$session_id = $params['token'];
-
+		
+		$additional = null;
+		
+		if( isset($params['additional'])  && strlen($params['additional']) > 0){
+			$additional = $params['additional'];
+			
+		}
+		
+		
 		// Event ID lookup table
 		// FIXME: API should already have urldecode()d
 		$event_id = ClickTrackingHooks::getEventIDFromName( urldecode( $eventid_to_lookup ) );
@@ -43,17 +51,29 @@
 			( $is_logged_in ? $wgUser->getEditCount() : 0 ), // total edit count or 0 if anonymous
 			$granularity1, // contributions made in granularity 1 time frame
 			$granularity2, // contributions made in granularity 2 time frame
-			$granularity3  // contributions made in granularity 3 time frame
+			$granularity3,  // contributions made in granularity 3 time frame
+			$additional
 		);
 		
 		// For links that go off the page, redirect the user
 		// FIXME: The API should have a proper infrastructure for this
 		if ( !is_null( $params['redirectto'] ) ) {
-			global $wgOut;
-			$wgOut->enable();
-			$wgOut->redirect( $params['redirectto'] );
-			$wgOut->output();
+			// Validate the redirectto parameter
+			// Must be a local URL, may not be protocol-relative
+			$href = $params['redirectto'];
+			if ( strlen( $href ) > 0 && $href{0} == '/' && ( strlen( $href ) == 1 || $href{1} != '/' ) ) {
+				global $wgOut;
+				$wgOut->redirect( $params['redirectto'] );
+				$wgOut->output();
+				
+				// Prevent any further output
+				$wgOut->disable();
+				$this->getMain()->getPrinter()->disable();
+			} else {
+				$this->dieUsage( 'The URL to redirect to must be domain-relative, i.e. start with a /', 'badurl' );
+			}
 		}
+		$this->getMain()->setCacheMaxAge( 0 );
 	} 	/**
@@ -73,7 +93,8 @@
 		return array(
 			'eventid' => 'string of eventID',
 			'token'  => 'unique edit ID for this edit session',
-			'redirectto' => 'URL to redirect to (only used for links that go off the page)'
+			'redirectto' => 'URL to redirect to (only used for links that go off the page)',
+			'additional' => 'additional info for the event, like state information'
 		);
 	}@@ -94,7 +115,8 @@
 		return array(
 			'eventid' => null,
 			'token' => null,
-			'redirectto' => null
+			'redirectto' => null,
+			'additional' => null
 		);
 	}
Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.alias.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.alias.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.alias.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -19,9 +19,14 @@ /** Egyptian Spoken Arabic (مصرى) */
 $aliases['arz'] = array(
-	'ClickTracking' => array( 'تتبع_الضغطات' ),
+	'ClickTracking' => array( 'متابعة_الدوسات' ),
 );+/** Breton (Brezhoneg) */
+$aliases['br'] = array(
+	'ClickTracking' => array( 'HeuliañKlikoù' ),
+);
+
 /** Persian (فارسی) */
 $aliases['fa'] = array(
 	'ClickTracking' => array( 'تعقیب_کلیک' ),
@@ -47,6 +52,11 @@
 	'ClickTracking' => array( 'Opzeechne vun de Klicken' ),
 );+/** Malayalam (മലയാളം) */
+$aliases['ml'] = array(
+	'ClickTracking' => array( 'ഞെക്കൽപിന്തുടരൽ' ),
+);
+
 /** Marathi (मराठी) */
 $aliases['mr'] = array(
 	'ClickTracking' => array( 'मागोवाटिचकवा' ),

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -15,7 +15,7 @@ 	/* 3 tables for click tracking */
 	public static function schema() {
-		global $wgExtNewTables, $wgExtNewIndexes;
+		global $wgExtNewTables, $wgExtNewIndexes, $wgExtNewFields; 		$wgExtNewTables[] = array(
 			'click_tracking',
@@ -31,6 +31,11 @@
 			'click_tracking', 'click_tracking_action_time',
 			dirname( __FILE__ ) . '/patch-action_time.sql'
 		);
+		
+		$wgExtNewFields[] = array(
+			'click_tracking', 'additional_info',
+			dirname( __FILE__ ) . '/patch-additional_info.sql'
+		); 		return true;
 	}
@@ -163,7 +168,7 @@
 	 * @return true if the event was stored in the DB
 	 */
 	public static function trackEvent( $session_id, $is_logged_in, $namespace, $event_id, $contribs = 0,
-						$contribs_in_timespan1 = 0, $contribs_in_timespan2 = 0, $contribs_in_timespan3 = 0 ) {
+						$contribs_in_timespan1 = 0, $contribs_in_timespan2 = 0, $contribs_in_timespan3 = 0, $additional= null ) {
 		$dbw = wfGetDB( DB_MASTER ); 		$dbw->begin();
@@ -178,7 +183,8 @@
 			'user_contribs_span2' => ( $is_logged_in ? (int) $contribs_in_timespan2 : null ),
 			'user_contribs_span3' => ( $is_logged_in ? (int) $contribs_in_timespan3 : null ),
 			'namespace' => (int) $namespace,
-			'event_id' => (int) $event_id
+			'event_id' => (int) $event_id,
+			'additional_info' =>  ( isset($additional)  ? (string) $additional : null )
 		); 		$db_status = $dbw->insert( 'click_tracking', $data, __METHOD__ );

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -931,7 +931,7 @@
  * @author 青子守歌
  */
 $messages['ja'] = array(
-	'clicktracking' => 'Usability Initiative クリック追跡',
+	'clicktracking' => '使用性改善のクリック追跡',
 	'clicktracking-desc' => 'クリック追跡:ページの再描画を引き起こさないイベントを追跡記録する機能',
 	'ct-title' => '利用者クリック集計',
 	'ct-event-name' => 'イベント名',
@@ -957,15 +957,18 @@ /** Georgian (ქართული)
  * @author BRUTE
+ * @author ITshnik
  * @author Temuri rajavi
  */
 $messages['ka'] = array(
 	'ct-event-name' => 'მოვლენის სახელი',
 	'ct-expert-header' => '"ექსპერტის" დაჭერა',
+	'ct-beginner-header' => '"დამწყებთა" მოქმედებები',
 	'ct-start-date' => 'დაწყების თარიღი (წწწწთთდდ)',
 	'ct-end-date' => 'დამთავრების თარიღი (წწწწთთდდ)',
 	'ct-change-graph' => 'გრაფიკის შეცვლა',
 	'ct-beginner' => 'დამწყები',
+	'ct-intermediate' => 'შუალედური',
 	'ct-expert' => 'ექსპერტი',
 	'ct-date-range' => 'თარიღის დიაპაზონი',
 	'ct-editing' => 'ამჟამად რედაქტირდება:',
@@ -1186,6 +1189,7 @@
  */
 $messages['mt'] = array(
 	'clicktracking' => "Moniteraġġ tal-klikks tal-Inizjattiva ta' Użabilità",
+	'clicktracking-desc' => "Moniteraġġ tal-klikks għall-moniteraġġ ta' avvenimenti li ma jikkawżawx riffriskar tal-paġna",
 	'ct-title' => 'Klikks tal-utenti aggregati',
 	'ct-event-name' => 'Isem tal-avveniment',
 	'ct-expert-header' => 'Klikks fuq "Espert"',
@@ -1457,12 +1461,12 @@
 $messages['ro'] = array(
 	'ct-title' => 'Clicuri utilizator cumulate',
 	'ct-event-name' => 'Numele evenimentului',
-	'ct-expert-header' => 'Clickuri de către "experţi"',
+	'ct-expert-header' => 'Clickuri de către "experți"',
 	'ct-intermediate-header' => 'Clicuri „intermediare”',
 	'ct-beginner-header' => 'Clicuri „începătoare”',
 	'ct-total-header' => 'Clickuri totale',
 	'ct-start-date' => 'Data de start (AAAALLZZ)',
-	'ct-end-date' => 'Data de sfârşit (AAAALLZZ)',
+	'ct-end-date' => 'Data de sfârșit (AAAALLZZ)',
 	'ct-change-graph' => 'Grafic de schimbări',
 	'ct-beginner' => 'Începători',
 	'ct-intermediate' => 'Intermediar',
@@ -1470,9 +1474,9 @@
 	'ct-date-range' => 'Interval în timp',
 	'ct-editing' => 'Editare curentă:',
 	'ct-anon-users' => 'Utilizatori anonimi',
-	'ct-user-contribs' => 'Contribuţiile totale ale utilizatorului',
-	'ct-user-span' => 'Contribuţiile utilizatorului în intervalul de timp',
-	'ct-and' => 'şi',
+	'ct-user-contribs' => 'Contribuțiile totale ale utilizatorului',
+	'ct-user-span' => 'Contribuțiile utilizatorului în intervalul de timp',
+	'ct-and' => 'și',
 	'ct-update-table' => 'Actualizează tabel',
 );@@ -1560,6 +1564,13 @@
 	'ct-update-table' => 'Таабылы саҥардыы',
 );+/** Sardinian (Sardu)
+ * @author Andria
+ */
+$messages['sc'] = array(
+	'ct-and' => 'e',
+);
+
 /** Sinhala (සිංහල)
  * @author චතුනි අලහප්පෙරුම
  */
@@ -1619,6 +1630,27 @@
 	'ct-and' => 'in',
 );+/** Serbian Cyrillic ekavian (Српски (ћирилица))
+ * @author Михајло Анђелковић
+ */
+$messages['sr-ec'] = array(
+	'ct-expert-header' => 'Кликови "експерата"',
+	'ct-intermediate-header' => 'Кликови "напредних"',
+	'ct-beginner-header' => 'Кликови "почетника"',
+	'ct-total-header' => 'Укупно кликова',
+	'ct-start-date' => 'Почетни датум (YYYYMMDD)',
+	'ct-end-date' => 'Крајњи датум (YYYYMMDD)',
+	'ct-beginner' => 'Почетник',
+	'ct-intermediate' => 'Напредни',
+	'ct-expert' => 'Експерт',
+	'ct-date-range' => 'Опсег датума',
+	'ct-editing' => 'Тренутно мења:',
+	'ct-anon-users' => 'Анонимни корисници',
+	'ct-user-contribs' => 'Укупно корисничких доприноса',
+	'ct-and' => 'и',
+	'ct-update-table' => 'Ажурирај табелу',
+);
+
 /** Swedish (Svenska)
  * @author Boivie
  * @author GameOn
@@ -1699,6 +1731,34 @@
 	'ct-update-table' => 'Tablisany täzele',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'clicktracking' => 'papindot na pagsubaybay sa Pasimula ng Pagkanagagamit',
+	'clicktracking-desc' => 'Papindot na pangpagsubaybay para sa pagsubaybay ng  mga kaganapang hindi nakakasanhi ng pagsariwa ng isang pahina',
+	'ct-title' => 'Tinipong mga pagpindot ng tagagamit',
+	'ct-event-name' => 'Pangalan ng kaganapan',
+	'ct-expert-header' => 'Mga pagpindot na "dalubhasa"',
+	'ct-intermediate-header' => 'Mga pagpindot na "nasa pagitan"',
+	'ct-beginner-header' => 'Mga pagpindot na "pambaguhan"',
+	'ct-total-header' => 'Kabuoan ng mga pagpindot',
+	'ct-start-date' => 'Simula ng Petsa (TTTTBBAA)',
+	'ct-end-date' => 'Pangwakas na Petsa (TTTTBBAA)',
+	'ct-increment-by' => 'Bilang ng mga araw na kinakatawan ng bawat punto ng dato',
+	'ct-change-graph' => 'Baguhin ang talangguhit',
+	'ct-beginner' => 'Baguhan',
+	'ct-intermediate' => 'Panggitna',
+	'ct-expert' => 'Dalubhasa',
+	'ct-date-range' => 'Sakop na petsa',
+	'ct-editing' => 'Kasalukuyang pinapatnugutan:',
+	'ct-anon-users' => 'Hindi nakikilalang mga tagagamit',
+	'ct-user-contribs' => 'Kabuuan ng mga ambag ng tagagamit',
+	'ct-user-span' => 'Mga ambag ng tagagamit sa loob ng dangkal ng panahon',
+	'ct-and' => 'at',
+	'ct-update-table' => 'Isapanahon ang tabla',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  * @author Vito Genovese

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -6,12 +6,20 @@
 					wgScriptPath + '/api.php', { 'action': 'clicktracking', 'eventid': id, 'token': wgTrackingToken }
 			);
 		};
+		
+		$.trackActionWithInfo = function( id, info ) {
+			$j.post(
+					wgScriptPath + '/api.php', { 'action': 'clicktracking', 'eventid': id, 'token': wgTrackingToken, 'additional': info }
+			);
+		};
+		
+		
 		// Add click tracking hooks to the sidebar
 		$j(document).ready( function() {
 			$( '#p-logo a, #p-navigation a, #p-interaction a, #p-tb a' ).each( function() {
 				var href = $(this).attr( 'href' );
-				// Only modify local and same-schema URLs
-				if ( href[0] == '/' || href.match( /^https?:\/\// ) ) {
+				// Only modify local URLs
+				if ( href.length > 0 && href[0] == '/' && ( href.length == 1 || href[1] != '/' ) ) {
 					var id = 'leftnav-' + skin + '-' + ( $(this).attr( 'id' ) || $(this).parent().attr( 'id' ) );
 					href = wgScriptPath + '/api.php?action=clicktracking' +
 						'&eventid=' + id + '&token=' + wgTrackingToken + '&redirectto=' + escape( href );

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -19,7 +19,7 @@
 /* Configuration */ // Increment this value when you change ClickTracking.js
-$wgClickTrackingStyleVersion = 4;
+$wgClickTrackingStyleVersion = 5; // click throttle, should be seen as "1 out of every $wgClickTrackThrottle users will have it enabled"
 // setting this to 1 means all users will have it enabled

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.sql
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.sql	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/ClickTracking.sql	2010-06-09 19:16:16 UTC (rev 67746)
@@ -28,7 +28,11 @@
 	namespace integer NOT NULL, 	-- event ID (not unique)
-	event_id integer NOT NULL
+	event_id integer NOT NULL,
+	
+	-- additional info for each click, such as state information
+	additional_info varbinary(255)
+	
 ) /*$wgDBTableOptions*/; CREATE INDEX /*i*/click_tracking_action_time ON /*_*/click_tracking (action_time);

Copied: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/patch-additional_info.sql (from rev 67741, trunk/extensions/UsabilityInitiative/ClickTracking/patch-additional_info.sql)
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/patch-additional_info.sql	                        (rev 0)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/ClickTracking/patch-additional_info.sql	2010-06-09 19:16:16 UTC (rev 67746)
@@ -0,0 +1,4 @@
+--
+-- create click_tracking.additional_info
+--
+ALTER TABLE /*_*/click_tracking ADD additional_info varbinary(255);

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Makefile
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Makefile	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Makefile	2010-06-09 19:16:16 UTC (rev 67746)
@@ -5,6 +5,7 @@
 CSS := \
 	css/suggestions.css\
 	css/vector.collapsibleNav.css\
+	css/vector.expandableSearch.css\
 	css/wikiEditor.css\
 	css/wikiEditor.dialogs.css\
 	css/wikiEditor.toc.css\
@@ -26,6 +27,7 @@
 	js/plugins/jquery.color.js\
 	js/plugins/jquery.cookie.js\
 	js/plugins/jquery.delayedBind.js\
+	js/plugins/jquery.expandableField.js\
 	js/plugins/jquery.suggestions.js\
 	js/plugins/jquery.textSelection.js\
 	js/plugins/jquery.wikiEditor.js\
@@ -35,7 +37,8 @@
 	js/plugins/jquery.wikiEditor.publish.js\
 	js/plugins/jquery.wikiEditor.templateEditor.js\
 	js/plugins/jquery.wikiEditor.toc.js\
-	js/plugins/jquery.wikiEditor.toolbar.js
+	js/plugins/jquery.wikiEditor.toolbar.js\
+	js/thirdparty/contentCollector.js WIKIEDITOR_MODULES := \
 	WikiEditor/Modules/Highlight/Highlight.js\
@@ -50,6 +53,7 @@
 	Vector/Modules/CollapsibleNav/CollapsibleNav.js\
 	Vector/Modules/CollapsibleTabs/CollapsibleTabs.js\
 	Vector/Modules/EditWarning/EditWarning.js\
+	Vector/Modules/ExpandableSearch/ExpandableSearch.js\
 	Vector/Modules/FooterCleanup/FooterCleanup.js\
 	Vector/Modules/SimpleSearch/SimpleSearch.js

Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646
/branches/wmf-deployment/extensions/UsabilityInitiative/OptIn:60970
/trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62127,62139-62140,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66402,66565,66623,66631,66642-66644,66655
/trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
   + /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646
/branches/wmf-deployment/extensions/UsabilityInitiative/OptIn:60970
/trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62127,62139-62140,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66337-67741,67743-67744
/trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptIn.alias.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptIn.alias.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptIn.alias.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -50,6 +50,11 @@
 	'OptIn' => array( 'Benotzerfrëndlechkeetsinitiative matmaachen' ),
 );+/** Malayalam (മലയാളം) */
+$aliases['ml'] = array(
+	'OptIn' => array( 'യൂസബിലിറ്റി‌‌ഇനിഷ്യേറ്റീവ്ഓപ്റ്റിൻ' ),
+);
+
 /** Marathi (मराठी) */
 $aliases['mr'] = array(
 	'OptIn' => array( 'उपयोगक्षमतापुढाकारनिवडा' ),
@@ -85,6 +90,11 @@
 	'OptIn' => array( 'KullanılabilirlikGirişimiOnayı' ),
 );+/** Yiddish (ייִדיש) */
+$aliases['yi'] = array(
+	'OptIn' => array( 'אײַנשרײַבן אין ניצלעכקייט איניציאטיוו' ),
+);
+
 /** Simplified Chinese (‪中文(简体)‬) */
 $aliases['zh-hans'] = array(
 	'OptIn' => array( '试用测试版' ),

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptIn.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptIn.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptIn.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -201,10 +201,39 @@
 	'optin-survey-answer-changes-other' => 'Ander:',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'optin' => 'Nisma e të përdorshmërisë zgjedhë-në',
+	'optin-desc' => 'Lejo përdoruesit të provoni Beta, enhancements fundit Iniciativa e përdorshmërisë së përdorshmërisë.',
+	'optin-title-optedout' => 'Provo Beta',
+	'optin-title-optedin' => 'Lini Beta',
+	'optin-title-justoptedin' => 'Mirë se vini në Beta',
+	'optin-title-justoptedout' => 'Ju faleminderit për përpjekjen tonë Beta',
+	'optin-title-feedback' => 'reagime Beta',
+	'optin-needlogin' => "Ju duhet të [$1 hyni brënda] për t'u përpjekur Beta.",
+	'optin-intro' => 'Përdorshmërisë Wikipedia Iniciativa ka qenë duke punuar shumë për përmirësimin e përdorshmërisë së Wikipedia. Doni të provoni Beta tonë?',
+	'optin-feedback-intro' => 'Ju faleminderit për përpjekjen Beta. Ne do të doja të di çfarë ju mendoni të re për ndërfaqen e tonë, kështu që ne do të vlerësojmë nëse ju mbushet nga sondazhi opsional më poshtë.',
+	'optin-feedback-back' => 'Nëse ju nuk dëshironi ta plotësoni këtë anketë, ju mund të ktheheni tek $1.',
+	'optin-success-in' => 'Ju jeni tani duke u përpjekur Beta. Ju mund të zgjedhë përsëri në çdo kohë duke klikuar tek "{{int:optin-leave}}" Lidhje në krye të faqes.',
+	'optin-leave-cancel' => "Nëse dëshironi të vazhdoni t'i përdorni Beta, ju mund të ktheheni tek $1.",
+	'optin-success-out' => 'Ju keni mbetur me sukses Beta. Ju mund të provoni përsëri në çdo kohë duke klikuar tek "{{int:optin-try}}" Lidhje në krye të faqes.',
+	'optin-success-feedback' => 'Faleminderit për komentin tuaj!',
+	'optin-accept-short' => 'Le të bëjmë atë!',
+	'optin-accept-long' => 'Provoni Beta',
+	'optin-accept-long-anon' => 'Log in dhe të provoni Beta',
+	'optin-deny-short' => 'Jo faleminderit',
+	'optin-deny-long' => 'Kthehu tek faqja e mëparshme',
+	'optin-submit-out' => 'Lini Beta',
+);
+
 /** Aragonese (Aragonés)
  * @author Juanpabl
  */
 $messages['an'] = array(
+	'optin-survey-yes' => 'Sí',
+	'optin-survey-no' => 'No',
 	'optin-survey-answer-whyoptout-other' => 'Atra razón:',
 	'optin-survey-answer-changes-other' => 'Atros:',
 );
@@ -431,6 +460,7 @@
  * @author EugeneZelenko
  * @author Jim-by
  * @author Red Winged Duck
+ * @author Wizardist
  */
 $messages['be-tarask'] = array(
 	'optin' => 'Удзел у ініцыятыве па паляпшэньні зручнасьці і прастаты выкарыстаньня',
@@ -485,7 +515,7 @@
 	'optin-survey-question-os' => 'Якой апэрацыйнай сыстэмай Вы карыстаецеся?',
 	'optin-survey-answer-os-other' => 'Іншая апэрацыйная сыстэма:',
 	'optin-survey-question-res' => 'Якое разрозьненьне Вашага манітора?',
-	'optin-survey-question-changes' => 'Якія зьмены Вы жадаеце бачыць у Beta ў будучыці (выберыце ўсё што падыходзіць)?',
+	'optin-survey-question-changes' => 'Якія зьмены Вы жадаеце бачыць у Beta ў будучыні (выберыце ўсё, што падыходзіць)?',
 	'optin-survey-answer-changes-nav' => 'Зрабіць навігацыю па сайту больш простай у выкарыстаньні.',
 	'optin-survey-answer-changes-edittools' => 'Пашырыць і палепшыць інструмэнты рэдагаваньня.',
 	'optin-survey-answer-changes-upload' => 'Палепшыць загрузку зьместу і мэдыя-файлаў.',
@@ -516,7 +546,7 @@
  * @author Turin
  */
 $messages['bg'] = array(
-	'optin-desc' => 'Позволява на потребителите да изпробват Бета, най-новият резултат на Инициативата за подобряване използваемостта.',
+	'optin-desc' => 'Позволява на потребителите да изпробват Бета, най-новият резултат на Инициативата за подобряване на ползваемостта.',
 	'optin-title-optedout' => 'Изпробвайте Бета',
 	'optin-title-optedin' => 'Напускане на Бета',
 	'optin-title-justoptedin' => 'Добре дошли в Бета',
@@ -575,6 +605,22 @@
 	'optin-survey-answer-changes-predictability' => 'Да стане по-прозрачно функционирането на сайта.',
 	'optin-survey-answer-changes-custom' => 'Позволяване на подробни потребителски настройки.',
 	'optin-survey-answer-changes-other' => 'Друго:',
+	'optin-improvements2' => '== Какво подобрихме? ==
+[[File:UsabilityToolbar.png|left|link=|Екранен кадър на подобрената лента с инструменти за редактиране]]
+[[File:UsabilityDialogs.png|left|link=|Екранен кадър на новия диалогов прозорец за въвеждане на препратка]]
+
+; Подобрена лента с инструменти
+Подобрената лента с инструменти улеснява редактирането на страниците. Нови и усъвършенствани иконки правят обясняват по-добре кой бутон каква функция изпълнява. Падащите менюта внасят порядък и едновременно с това позволяват не толкова често използваните инструменти да са разположени на разстояние само на едно щракване с мишката.
+
+; Диалогови прозорци
+При щракване върху бутона за създаване на препратки и таблици вече се отваря диалогов прозорец, съдържащ лесен за попълване формуляр. 
+
+; И още...
+Въведени са и още много други подобрения като улеснена навигация, каскадни менюта, подобрено търсене и т.н.
+
+== Научете повече ==
+За да научите повече за Инициативата за подобряване на ползваемостта, моля посетете [http://usability.wikimedia.org/wiki/Wikipedia... нейната начална страница].
+<div style="clear:both"></div>',
 ); /** Bengali (বাংলা)
@@ -1838,15 +1884,26 @@
 ); /** Persian (فارسی)
+ * @author Ebraminio
+ * @author Huji
  * @author Ladsgroup
  * @author Mardetanha
  */
 $messages['fa'] = array(
+	'optin' => 'انتخاب‌کردن گام مقدماتی قابلیت استفاده',
 	'optin-title-optedout' => 'استفاده از بتا',
 	'optin-title-optedin' => 'خروج از بتا',
 	'optin-title-justoptedin' => 'به نسخه بتا خوش‌آمدید',
 	'optin-title-justoptedout' => 'ممنونیم از اینکه نسخه بتا را امتحان کردید',
+	'optin-title-feedback' => 'بازخورد نسخه بتا',
 	'optin-needlogin' => 'شما برای استفاده از نسخه بتا باید [$1 وارد شوید].',
+	'optin-intro' => 'بخش بهبود کیفیت ویکی‌پدیا در تلاش است تا رابط کاربری ویکی‌پدیا را بهبود ببخشد. آیا مایلید که نسخه رابط کاربری بتا را امتحان کنید؟',
+	'optin-feedback-intro' => 'از اینکه نسخهٔ بتا را امتحان می‌کنید متشکریم.
+ما مایلیم نظر شما را در مورد نمایش جدید صفحه‌ها بدانیم، در نتیجه اگر در نظرخواهی زیر شرکت کنید ما را یاری می‌کنید.',
+	'optin-feedback-back' => 'اگر علاقه‌ای به شرکت در نظرخواهی ندارید، می‌توانید به $1 بازگردید.',
+	'optin-success-in' => 'در حال حاضر شما نسخه بتا را آزمایش می‌کنید.
+شما می‌توانید هر وقت که خواستید با کلیک بر روی «{{int:optin-leave}}» در بالای صفحه، به حالت قبل برگردید.',
+	'optin-accept-short' => 'بزن بریم!',
 	'optin-accept-long' => 'خروج از بتا',
 	'optin-deny-short' => 'نه ممنون!',
 	'optin-deny-long' => 'بازگشت به صفحه قبلی',
@@ -1854,6 +1911,23 @@
 	'optin-survey-yes' => 'بله',
 	'optin-survey-no' => 'نه',
 	'optin-survey-answer-whyoptout-other' => 'دلایل دیگر:',
+	'optin-survey-answer-changes-lookfeel' => 'به روز رسانی ظاهر وب‌گاه.',
+	'optin-survey-answer-changes-other' => 'سایر موارد:',
+	'optin-improvements2' => '== چه چیزهایی بهبود یافته؟ ==
+[[File:UsabilityToolbar.png|left|link=|Screenshot of the enhanced edit toolbar]]
+[[File:UsabilityDialogs.png|left|link=|Screenshot of the new content generation dialogs]]
+;نوار ابزار پیشرفته
+نوار ابزار پیشرفته ویرایش مقالات را ساده‌تر می‌سازد.
+شکلک‌های جدید و بهبود یافته کاری که ابزارها انجام می‌دهند را واضح‌تر می‌کند.
+گسترش بخش‌ها، درهم و برهمی را کم ساخته در حالیکه ابزارهایی که به ندرت استفاده می‌شوند فقط با یک کلیک قابل دسترس هستند.
+;گفتگو
+وقتی که پیوندها یا جدول‌ها را درست می‌کنید، کلیک کردن بر روی نمایه ابزار یک جعبه تعاملی را درست می‌کند که به شما در درست کردن پیوندها و جدول‌ها به وسیله پر کردن یک فرم ساده کمک می‌کند.
+;و بیشتر
+ما تعداد دیگری از بهسازی‌ها را نظیر ناوبری پیشرفته، زبانه‌های آبشاری و جستجوی بهبود یافته در این نسخه پیاده ساخته‌ایم.
+
+== چگونه می‌توانید در این تغییرات نقش بازی کنید؟ ==
+برای اطلاع بیشتر در رابطه با  توانایی استفاده ابتکاری به [http://usability.wikimedia.org/wiki/Wikipedia... اینجا] سر بزنید.
+<div style="clear:both"></div>',
 ); /** Finnish (Suomi)
@@ -1901,7 +1975,7 @@
 	'optin-survey-answer-whyoptout-notpredictable' => 'Se ei toiminut ennustettavalla tavalla.',
 	'optin-survey-answer-whyoptout-didntlike-look' => 'En pitänyt sen ulkonäöstä.',
 	'optin-survey-answer-whyoptout-didntlike-layout' => 'En pitänyt uusista välilehdistä ja asettelusta.',
-	'optin-survey-answer-whyoptout-didntlike-toolbar' => 'En pitänyt uudesta työkalurivistä.',
+	'optin-survey-answer-whyoptout-didntlike-toolbar' => 'En pitänyt uudesta työkalupalkista.',
 	'optin-survey-answer-whyoptout-other' => 'Muu syy',
 	'optin-survey-question-explain' => 'Olisitteko ystävällinen ja selittäisitte tai selventäisitte edelläolevaa vastaustanne:',
 	'optin-survey-question-techfail' => 'Koitko teknisiä häiriöitä käyttäessäsi Betaa?',
@@ -2112,10 +2186,10 @@
 Quere probar Beta?',
 	'optin-feedback-intro' => 'Grazas por probar Beta.
 Queremos saber que pensa da nosa nova interface, polo que lle agradeceriamos que enchese a enquisa opcional que aparece a continuación.',
-	'optin-feedback-back' => 'Se non quere encher a enquisa, pode voltar a "$1".',
+	'optin-feedback-back' => 'Se non quere encher a enquisa, pode volver a "$1".',
 	'optin-success-in' => 'Xa está probando Beta.
 Pode saír en calquera momento facendo clic na ligazón "{{int:optin-leave}}" que aparecerá na parte superior da pantalla.',
-	'optin-leave-cancel' => 'Se quere seguir usando Beta, pode voltar a "$1".',
+	'optin-leave-cancel' => 'Se quere seguir usando Beta, pode volver a "$1".',
 	'optin-success-out' => 'Deixou de probar Beta.
 Pode participar nas probas en calquera momento facendo clic na ligazón "{{int:optin-try}}" que aparecerá no canto superior dereito da pantalla.',
 	'optin-success-feedback' => 'Grazas polos seus comentarios!',
@@ -2123,7 +2197,7 @@
 	'optin-accept-long' => 'Probar Beta',
 	'optin-accept-long-anon' => 'Acceda ao sistema e probe Beta',
 	'optin-deny-short' => 'Non, grazas',
-	'optin-deny-long' => 'Voltar á páxina anterior',
+	'optin-deny-long' => 'Volver á páxina anterior',
 	'optin-submit-out' => 'Deixar Beta',
 	'optin-submit-feedback' => 'Enviar a opinión',
 	'optin-survey-yes' => 'Si',
@@ -2709,6 +2783,7 @@
  * @author Bennylin
  * @author Irwangatot
  * @author IvanLanin
+ * @author Kenrick95
  * @author Rex
  */
 $messages['id'] = array(
@@ -2748,7 +2823,7 @@
 	'optin-survey-answer-whyoptout-notpredictable' => 'Tidak dapat diprediksi.',
 	'optin-survey-answer-whyoptout-didntlike-look' => 'Saya tidak suka dengan penampilannya.',
 	'optin-survey-answer-whyoptout-didntlike-layout' => 'Saya tidak suka dengan tab baru dan tampilannya.',
-	'optin-survey-answer-whyoptout-didntlike-toolbar' => 'Aku tidak suka dengan kotak peralatan baru.',
+	'optin-survey-answer-whyoptout-didntlike-toolbar' => 'Saya tidak menyukai kotak peralatan yang baru.',
 	'optin-survey-answer-whyoptout-other' => 'Alasan lain:',
 	'optin-survey-question-explain' => 'Harap menjelaskan atau menguraikan jawaban Anda di atas:',
 	'optin-survey-question-techfail' => 'Pernahkah anda mengalami kesalahan teknis ketika menggunakan Beta?',
@@ -2772,6 +2847,9 @@
 	'optin-survey-answer-changes-predictability' => 'Meningkatkan prediktabilitas dari kinerja.',
 	'optin-survey-answer-changes-custom' => 'Memperbolehkan Pengguna yang lebih tinggi untuk kustomisasi',
 	'optin-survey-answer-changes-other' => 'Lain-lain:',
+	'optin-improvements2' => '== Apa yang telah diperbaiki? ==
+[[Berkas:UsabilityToolbar.png|left|link=|Screenshot of the enhanced edit toolbar]]
+[[Berkas:UsabilityDialogs.png|left|link=|Screenshot of the new content generation dialogs]]',
 ); /** Ido (Ido)
@@ -2867,20 +2945,20 @@
 	'optin-survey-answer-changes-predictability' => 'Migliorare la prevedibilità delle prestazioni.',
 	'optin-survey-answer-changes-custom' => "Consentire una maggiore personalizzazione all'utente.",
 	'optin-survey-answer-changes-other' => 'Altro:',
-	'optin-improvements2' => "== Cosa è stato migliorato? ==
+	'optin-improvements2' => '== Cosa è stato migliorato? ==
 [[File:UsabilityToolbar.png|left|link=|Screenshot della nuova e migliorata toolbar]]
 [[File:UsabilityDialogs.png|left|link=|Screenshot delle nuove finestre di dialogo per la generazione del contenuto]]
-;Toolbar migliorata
-La nuova toolbar rende più semplice modificare le voci.
+;Barra degli strumenti migliorata
+La nuova barra degli strumenti rende più semplice modificare le voci.
 Le icone nuove e migliorate rendono più chiara quale azione è svolta da ogni strumento.
 Le sezioni espandibili riducono il disordine, mentre mantengono strumenti poco usati a un solo click di distanza.
 ;Finestre di dialogo
-Nella creazione di link o tabelle, cliccando l'icona dello strumento adesso si apre una finestra di dialogo che ti aiuta a creare link e tabelle riempendo un semplice modulo.
+Nella creazione di link o tabelle, cliccando l\'icona dello strumento adesso si apre una finestra di dialogo che ti aiuta a creare link e tabelle riempendo un semplice modulo.
 ;E altro ancora
 Abbiamo introdotto una serie di altri miglioramenti come una navigazione migliorata, le schede a cascata, una ricerca migliorata, e altro ancora.
 == Come partecipare ==
-Per sapere altro sull'Iniziativa per l'Usabilità, visita il nostro [http://usability.wikimedia.org/wiki/Wikipedia... sito].
-<div style=\"clear:both\"></div>",
+Per sapere altro sul progetto Usabilità, visita il nostro [http://usability.wikimedia.org/wiki/Wikipedia... sito]. Oppure, [http://it.wikipedia.org/wiki/Progetto:Coordin... qui] puoi fare segnalazioni o dare pareri di ogni genere in italiano. 
+<div style="clear:both"></div>',
 ); /** Japanese (日本語)
@@ -2891,15 +2969,15 @@
  * @author 青子守歌
  */
 $messages['ja'] = array(
-	'optin' => 'ユーザビリティー改善への参加',
-	'optin-desc' => 'ユーザビリティ改善プロジェクトによる最新のユーザビリティー改善案のベータ版の試用を可能にする',
+	'optin' => '使用性改善への参加',
+	'optin-desc' => '使用性改善プロジェクトによる最新の使用性改善案のベータ版の試用を可能にする',
 	'optin-title-optedout' => 'ベータ版を試す',
 	'optin-title-optedin' => 'ベータ版をやめる',
 	'optin-title-justoptedin' => 'ベータ版にようこそ',
 	'optin-title-justoptedout' => 'ベータ版をお試しいただきありがとうございます',
 	'optin-title-feedback' => 'フィードバックしてください',
 	'optin-needlogin' => 'ベータ版を試すには[$1 ログイン]する必要があります。',
-	'optin-intro' => 'ウィキペディア・ユーザビリティ改善プロジェクトでは、ウィキペディアの使いやすさを改善するために活動しています。ベータ版を試してみませんか?',
+	'optin-intro' => 'Wikipedia Usability Initiativeでは、ウィキペディアの使いやすさを改善するために活動しています。ベータ版を試してみませんか?',
 	'optin-feedback-intro' => 'ベータ版をお試しいただきありがとうございます。よろしければこの新しいインタフェースについてご意見をお聞かせください。以下の任意調査にご協力いただければ幸いです。',
 	'optin-feedback-back' => '調査表への記入を望まない場合は、$1 へお戻りください。',
 	'optin-success-in' => 'ベータ版を試用しています。ページ上部の「{{int:optin-leave}}」のリンクをクリックすると、いつでも試用をやめることができます。',
@@ -2960,7 +3038,7 @@
 ;それだけではありません
 :他にも使いやすくなったナビゲーション、縦方向のタブ、検索機能の強化などなど、多くの改善を行ないました。
 ==改善にご協力ください==
-ユーザビリティイニシアティブについて、ぜひ[http://usability.wikimedia.org/wiki/Wikipedia... ホームページ]をご覧ください。 
+使用性改善について、ぜひ[http://usability.wikimedia.org/wiki/Wikipedia... ホームページ]をご覧ください。 
 <div style="clear:both"></div>',
 );@@ -3309,6 +3387,7 @@
 ); /** Luxembourgish (Lëtzebuergesch)
+ * @author Les Meloures
  * @author Purodha
  * @author Robby
  */
@@ -3352,9 +3431,9 @@
 	'optin-survey-answer-whyoptout-didntlike-layout' => 'Ech hat déi nei Ongleten an den neie Layout net gär.',
 	'optin-survey-answer-whyoptout-didntlike-toolbar' => 'Ech hunn déi nei Toolbar net gär.',
 	'optin-survey-answer-whyoptout-other' => 'Anere Grond:',
-	'optin-survey-question-explain' => 'Erklärt oder preziséiert Är Äntwert w.e.g.:',
+	'optin-survey-question-explain' => 'Erkläert oder preziséiert Är Äntwert w.e.g.:',
 	'optin-survey-question-techfail' => 'Hat Dir technesch Schwieregkeete beim Benotze vu Beta?',
-	'optin-survey-question-techfail-ifyes' => 'Wa jo, da begrënnt oder erklärt et:',
+	'optin-survey-question-techfail-ifyes' => 'Wa jo, da begrënnt oder erkläert et:',
 	'optin-survey-question-usedtoolbar' => "Hutt Dir déi nei erweiderbar Toolbar benotzt fir eng Säit z'änneren?",
 	'optin-survey-question-usedtoolbar-ifyes' => 'Wa jo, wat hutt Dir doru gutt fonnt? Wat huet Iech net esougutt gefall?',
 	'optin-survey-question-usedtoolbar-ifno' => 'Wann neen, firwat? Wäert Dir se an der Zukunft benotzen? Gitt w.e.g. en Erklärung.',
@@ -3523,7 +3602,7 @@
 	'optin-intro' => 'Иницијативата за употребливост на Википедија работеше напорно за да ја подобри употребливоста на Википедија.
 Дали би сакале да ја пробате нашата Бета?',
 	'optin-feedback-intro' => 'Ви благодариме што ја пробавте Бета.
-Би сакале да знаеме што мислите за нашиот нов интерфејс, па затоа би ценеле доколку го пополните изборниот прашалник подолу.',
+Би сакале да знаеме што мислите за нашиот нов посредник, па затоа би ценеле доколку го пополните прашалникот подолу (незадолжително).',
 	'optin-feedback-back' => 'Доколку не сакате да го пополните прашалникот, можете да се вратите на $1.',
 	'optin-success-in' => 'Моментално ја испробувате Бета.
 Можете да ја напуштите во било кога со кликнување на врската „{{int:optin-leave}}“ на врвот од страницата.',
@@ -3541,7 +3620,7 @@
 	'optin-survey-yes' => 'Да',
 	'optin-survey-no' => 'Не',
 	'optin-survey-intro' => 'Ви благодариме што ја пробавте Бета.
-Би сакале да знаеме што мислите за нашиот нов интерфејс, и затоа би ценеле доколку го пополние изборниот прашалник подолу пред да кликнете на „[[#leave|{{int:optin-submit-out}}]]“.',
+Би сакале да знаеме што мислите за нашиот нов посредник, и затоа би ценеле доколку го пополните прашалникот подолу (незадолжително) пред да кликнете на „[[#leave|{{int:optin-submit-out}}]]“.',
 	'optin-survey-question-likedislike' => 'Што ви се допаѓаше кај Бета? А што не ви се допадна?',
 	'optin-survey-question-whyoptout' => 'Зошто ја напуштате Бета? (Изберете колку што сакате.)',
 	'optin-survey-answer-whyoptout-hard' => 'Беше премногу тешка за употреба.',
@@ -3765,6 +3844,20 @@
 	'optin-survey-answer-changes-predictability' => 'Memperbaiki kebolehjankaan prestasi.',
 	'optin-survey-answer-changes-custom' => 'Benarkan pengubahsuaian penguna yang lebih besar.',
 	'optin-survey-answer-changes-other' => 'Lain-lain:',
+	'optin-improvements2' => '== Apa yang telah diperbaik? ==
+[[File:UsabilityToolbar.png|left|link=|Tampilan skrin palang menyunting tertingkat]]
+[[File:UsabilityDialogs.png|left|link=|Tampilan skrin dialog penjanaan kandungan baru]]
+;Palang Menyunting Tertingkat
+Palang menyunting tertingkat memudahkan lagi menyunting rencana.
+Ikon baru dan dipertingkat menjelaskan lagi apa tindakan yang dilakukan setiap alatan.
+Bahagian boleh kembang mengurangkan semak sambil meletakkan alat yang jarang dipakai cuma satu klik jauh.
+;Dialog
+Apabila membuat pautan atau jadual, mengklik ikon alatan kini membuka kotak dialog yang membantu mencipta pautan dan jadual dengan mengisi borang mudah.
+;Dan Lagi
+Sejumlah perbaikan lain telah diperkenalkan seperti pandu arah tertingkat, tab melata, carian ditingkatkan, dan banyak lagi.
+== Bagaimana boleh terlibat ==
+Untuk mengetahui lebih lanjut tentang Usability Initiative, sila kunjungi [http://usability.wikimedia.org/wiki/Wikipedia... laman] kami.
+<div style="clear:both"></div>',
 ); /** Maltese (Malti)
@@ -3776,7 +3869,7 @@
 	'optin-title-optedout' => 'Ipprova l-Beta',
 	'optin-title-optedin' => 'Ħalli l-Beta',
 	'optin-title-justoptedin' => 'Merħba fil-Beta',
-	'optin-title-justoptedout' => 'Grazzi talli ippruvajt l-verżjoni Beta',
+	'optin-title-justoptedout' => 'Grazzi talli ppruvajt l-verżjoni Beta',
 	'optin-title-feedback' => 'Rispons fuq il-Beta',
 	'optin-needlogin' => 'Huwa neċessarju li l-ewwel [$1 tidħol fil-kont tiegħek] qabel ma tipprova l-Beta.',
 	'optin-intro' => "L-Inizzjattiva ta' Użabilità tal-Wikipedija qed taħdem biex ittejjeb l-użabilità tal-Wikipedija. Tixtieq tipprova l-Beta?",
@@ -4469,6 +4562,7 @@
 	'optin-survey-question-browser' => 'تاسې کوم کتنمل کاروۍ؟',
 	'optin-survey-answer-browser-other' => 'بل کتنمل:',
 	'optin-survey-question-os' => 'تاسې کوم چليز غونډال کاروۍ؟',
+	'optin-survey-answer-changes-other' => 'بل:',
 ); /** Portuguese (Português)
@@ -4480,7 +4574,7 @@
  */
 $messages['pt'] = array(
 	'optin' => 'Participar na Iniciativa de Usabilidade',
-	'optin-desc' => 'Permitir que os utilizadores experimentem o Beta, que tem as melhorias mais recentes da Iniciativa de Usabilidade.',
+	'optin-desc' => 'Permitir que os utilizadores experimentem o tema Beta, que tem as melhorias mais recentes da Iniciativa de Usabilidade.',
 	'optin-title-optedout' => 'Experimentar o Beta',
 	'optin-title-optedin' => 'Sair do Beta',
 	'optin-title-justoptedin' => 'Bem-vindo ao Beta',
@@ -4493,10 +4587,10 @@
 Gostaríamos de saber o que acha da nossa nova interface, por isso agradeciamos que preenchesse o inquérito opcional abaixo.',
 	'optin-feedback-back' => 'Se não quiser preencher o inquérito, pode regressar à página $1.',
 	'optin-success-in' => 'Está agora a experimentar o Beta.
-Pode optar por sair a qualquer momento, clicando o link "{{int:optin-leave}}" no topo do ecrã.',
+Pode optar por sair a qualquer momento, clicando o link "{{int:optin-leave}}" no topo do monitor.',
 	'optin-leave-cancel' => 'Se quiser continuar a usar o Beta, pode voltar para $1.',
 	'optin-success-out' => 'Saiu do Beta.
-Pode experimentá-lo novamente a qualquer momento, clicando o link "{{int:optin-try}}" na parte superior do ecrã.',
+Pode experimentá-lo novamente a qualquer momento, clicando o link "{{int:optin-try}}" no topo do monitor.',
 	'optin-success-feedback' => 'Obrigado pelos seus comentários!',
 	'optin-accept-short' => 'Ok, vamos fazê-lo!',
 	'optin-accept-long' => 'Experimentar o Beta',
@@ -4510,7 +4604,7 @@
 	'optin-survey-intro' => 'Obrigado por experimentar o Beta.
 Gostaríamos de saber o que achou da nossa nova interface, por isso agradecíamos que preenchesse o inquérito opcional abaixo, antes de clicar "[[#leave|{{int:optin-submit-out}}]]".',
 	'optin-survey-question-likedislike' => 'Do que foi que gostou no Beta? Do que foi que não gostou no Beta?',
-	'optin-survey-question-whyoptout' => 'Por que está a sair do Beta? (Por favor, seleccione todas as opções que se aplicam.)',
+	'optin-survey-question-whyoptout' => 'Por que é que está a sair do Beta? (Seleccione todas as opções que se aplicam, por favor.)',
 	'optin-survey-answer-whyoptout-hard' => 'Foi muito difícil de usar.',
 	'optin-survey-answer-whyoptout-didntwork' => 'Não funcionou correctamente.',
 	'optin-survey-answer-whyoptout-notpredictable' => 'Não funcionou de forma consistente.',
@@ -4530,7 +4624,7 @@
 	'optin-survey-answer-browser-other' => 'Outro browser:',
 	'optin-survey-question-os' => 'Que sistema operativo utiliza?',
 	'optin-survey-answer-os-other' => 'Outro sistema operativo:',
-	'optin-survey-question-res' => 'Qual é a resolução do seu ecrã?',
+	'optin-survey-question-res' => 'Qual é a resolução do seu monitor?',
 	'optin-survey-question-changes' => 'Que mudanças gostaria de ver futuramente no Beta? (Por favor, seleccione todas as opções que se aplicam.)',
 	'optin-survey-answer-changes-nav' => 'Tornar a navegação geral do site mais fácil de usar.',
 	'optin-survey-answer-changes-edittools' => 'Criar mais e melhores ferramentas de edição.',
@@ -4623,6 +4717,20 @@
 	'optin-survey-answer-changes-predictability' => 'Melhorar a previsibilidade dos resultados.',
 	'optin-survey-answer-changes-custom' => 'Permitir uma maior personalização para o usuário.',
 	'optin-survey-answer-changes-other' => 'Outros:',
+	'optin-improvements2' => '== O que foi melhorado? ==
+[[File:UsabilityToolbar.png|left|link=|Imagem da barra melhorada das ferramentas de edição]]
+[[File:UsabilityDialogs.png|left|link=|Imagem dos diálogos de geração de novos conteúdos]]
+;Barra de ferramentas melhorada
+A barra de ferramentas melhorada facilita a edição de artigos.
+Ícones novos e melhorados tornam mais clara a função de cada ferramenta.
+Secções expandidas reduzem a confusão ao mesmo tempo que mantêm as ferramentas pouco usadas à distância de um clique.
+;Diálogo
+Ao criar links ou tabelas, clicar o ícone de ferramentas abre agora um diálogo que auxilia a sua criação preenchendo um formulário simples.
+;E mais
+Foram introduzidas várias melhorias, como a navegação melhorada, os separadores em cascata, a pesquisa melhorada e outras.
+== Como pode envolver-se ==
+Para saber mais sobre a Iniciativa de Usabilidade, visite a nossa [http://usability.wikimedia.org/wiki/Wikipedia... página].
+<div style="clear:both"></div>',
 ); /** Quechua (Runa Simi)
@@ -4653,65 +4761,65 @@
  * @author Stelistcristi
  */
 $messages['ro'] = array(
-	'optin' => 'Optaţo pentru Usability Initiative',
-	'optin-desc' => 'Permiteţi utilizatorilor să încerce versiunea Beta, ultimele îmbunătăţiri de utilizabilitate ale Usability Initiative',
-	'optin-title-optedout' => 'Încercaţi Beta',
-	'optin-title-optedin' => 'Părăsiţi Beta',
+	'optin' => 'Optațo pentru Usability Initiative',
+	'optin-desc' => 'Permiteți utilizatorilor să încerce versiunea Beta, ultimele îmbunătățiri de utilizabilitate ale Usability Initiative',
+	'optin-title-optedout' => 'Încercați Beta',
+	'optin-title-optedin' => 'Părăsiți Beta',
 	'optin-title-justoptedin' => 'Bine ati venit la Beta',
-	'optin-title-justoptedout' => 'Vă mulţumim că aţi încercat Beta',
+	'optin-title-justoptedout' => 'Vă mulțumim că ați încercat Beta',
 	'optin-title-feedback' => 'Păreri în legătură cu Beta',
-	'optin-needlogin' => 'Trebuie să vă [$1 autentificaţi] pentru a încerca Beta.',
-	'optin-intro' => 'Wikipedia Usability Inititiative a fost lucrat din greu pentru a îmbunătăţi gradul de utilizare al Wikipedia.
-Doriţi să încercaţi versiunea noastră Beta ?',
-	'optin-feedback-intro' => 'Mulţumesc că folosiţi versiunea Beta.
-Ne-am dori să ştim ce părere aveţi de noua noastră interfaţă, aşadar am aprecia dacă aţi completat sondajul opţional de mai jos.',
-	'optin-feedback-back' => 'Dacă nu doriţi să completaţi sondajul puteţi să reveniţi la $1.',
-	'optin-success-in' => 'Încercaţi acum versiunea Beta.
-Puteţi opta înapoi în orice moment, făcând clic pe legătura „{{int:optin-leave}}” pe partea de sus a paginii.',
-	'optin-leave-cancel' => 'Dacă doriţi să continuaţi folosirea versiunii Beta, puteţi să reveniţi la $1.',
-	'optin-success-out' => 'Aţi părăsit cu succes versiunea Beta.
-Puteţi să încercaţi iar în orice moment apăsând clic pe legătura „{{int:optin-try}}” pe partea de sus a paginii.',
-	'optin-success-feedback' => 'Vă mulţumim pentru părere!',
+	'optin-needlogin' => 'Trebuie să vă [$1 autentificați] pentru a încerca Beta.',
+	'optin-intro' => 'Wikipedia Usability Inititiative a fost lucrat din greu pentru a îmbunătăți gradul de utilizare al Wikipedia.
+Doriți să încercați versiunea noastră Beta ?',
+	'optin-feedback-intro' => 'Mulțumesc că folosiți versiunea Beta.
+Ne-am dori să știm ce părere aveți de noua noastră interfață, așadar am aprecia dacă ați completat sondajul opțional de mai jos.',
+	'optin-feedback-back' => 'Dacă nu doriți să completați sondajul puteți să reveniți la $1.',
+	'optin-success-in' => 'Încercați acum versiunea Beta.
+Puteți opta înapoi în orice moment, făcând clic pe legătura „{{int:optin-leave}}” pe partea de sus a paginii.',
+	'optin-leave-cancel' => 'Dacă doriți să continuați folosirea versiunii Beta, puteți să reveniți la $1.',
+	'optin-success-out' => 'Ați părăsit cu succes versiunea Beta.
+Puteți să încercați iar în orice moment apăsând clic pe legătura „{{int:optin-try}}” pe partea de sus a paginii.',
+	'optin-success-feedback' => 'Vă mulțumim pentru părere!',
 	'optin-accept-short' => 'S-o facem!',
-	'optin-accept-long' => 'Încercaţi Beta',
-	'optin-accept-long-anon' => 'Autentificaţi-vă şi încercaţi Beta',
-	'optin-deny-short' => 'Nu, mulţumesc',
-	'optin-deny-long' => 'Reveniţi la pagina anterioară',
-	'optin-submit-out' => 'Părăsiţi Beta',
-	'optin-submit-feedback' => 'Trimiteţi-vă părerea',
+	'optin-accept-long' => 'Încercați Beta',
+	'optin-accept-long-anon' => 'Autentificați-vă și încercați Beta',
+	'optin-deny-short' => 'Nu, mulțumesc',
+	'optin-deny-long' => 'Reveniți la pagina anterioară',
+	'optin-submit-out' => 'Părăsiți Beta',
+	'optin-submit-feedback' => 'Trimiteți-vă părerea',
 	'optin-survey-yes' => 'Da',
 	'optin-survey-no' => 'Nu',
-	'optin-survey-intro' => 'Mulţumim că folosiţi versiunea Beta.
-Ne-am dori să ştim ce părere aveţi despre noua noastră interfaţă, aşadar am aprecia dacă aţi completa sondajul opţional de mai jos înainte de a da clic pe „[[#leave|{{int:optin-submit-out}}]]”.',
+	'optin-survey-intro' => 'Mulțumim că folosiți versiunea Beta.
+Ne-am dori să știm ce părere aveți despre noua noastră interfață, așadar am aprecia dacă ați completa sondajul opțional de mai jos înainte de a da clic pe „[[#leave|{{int:optin-submit-out}}]]”.',
 	'optin-survey-question-likedislike' => 'Ce v-a plăcut la versiunea Beta ? Ce nu v-a plăcut la versiunea Beta ?',
-	'optin-survey-question-whyoptout' => 'De ce părăsiţi versiunea Beta ? (Vă rugăm selectaţi toate care se aplică.)',
+	'optin-survey-question-whyoptout' => 'De ce părăsiți versiunea Beta ? (Vă rugăm selectați toate care se aplică.)',
 	'optin-survey-answer-whyoptout-hard' => 'A fost prea greu de folosit.',
-	'optin-survey-answer-whyoptout-didntwork' => 'Nu a funcţionat cum trebuie.',
+	'optin-survey-answer-whyoptout-didntwork' => 'Nu a funcționat cum trebuie.',
 	'optin-survey-answer-whyoptout-notpredictable' => 'Nu s-a comportat predictibil.',
 	'optin-survey-answer-whyoptout-didntlike-look' => 'Nu mi-a plăcut cum arată.',
-	'optin-survey-answer-whyoptout-didntlike-layout' => 'Nu mi-au plăcut filele noi şi aspectul.',
+	'optin-survey-answer-whyoptout-didntlike-layout' => 'Nu mi-au plăcut filele noi și aspectul.',
 	'optin-survey-answer-whyoptout-didntlike-toolbar' => 'Nu mi-a plăcut noua bară de unelte.',
 	'optin-survey-answer-whyoptout-other' => 'Alt motiv:',
-	'optin-survey-question-explain' => 'Vă rugăm explicaţi sau elaboraţi răspunsul dumneavoastră mai jos:',
-	'optin-survey-question-techfail' => 'Aţi trecut prin vreo defecţiune tehnică în timp ce aţi utilizat versiunea Beta ?',
-	'optin-survey-question-techfail-ifyes' => 'Dacă da, vă rugăm elaboraţi sau explicaţi:',
-	'optin-survey-question-usedtoolbar' => 'Aţi folosit noua bara de unelte expansibilă pentru a modifica o pagină ?',
-	'optin-survey-question-usedtoolbar-ifyes' => 'Dacă da, ce ţi-a plăcut la ea ? Ce nu ţi-a plăcut la ea ?',
-	'optin-survey-question-usedtoolbar-ifno' => 'Dacă nu, de ce nu ? Veţi dori în viitor ? Vă rugăm explicaţi.',
+	'optin-survey-question-explain' => 'Vă rugăm explicați sau elaborați răspunsul dumneavoastră mai jos:',
+	'optin-survey-question-techfail' => 'Ați trecut prin vreo defecțiune tehnică în timp ce ați utilizat versiunea Beta ?',
+	'optin-survey-question-techfail-ifyes' => 'Dacă da, vă rugăm elaborați sau explicați:',
+	'optin-survey-question-usedtoolbar' => 'Ați folosit noua bara de unelte expansibilă pentru a modifica o pagină ?',
+	'optin-survey-question-usedtoolbar-ifyes' => 'Dacă da, ce ți-a plăcut la ea ? Ce nu ți-a plăcut la ea ?',
+	'optin-survey-question-usedtoolbar-ifno' => 'Dacă nu, de ce nu ? Veți dori în viitor ? Vă rugăm explicați.',
 	'optin-survey-question-different' => 'Ce am fi putut face diferit pentru a nu părăsi versiunea Beta ?',
-	'optin-survey-question-feedback' => 'Vă rugăm înştiinţaţi-ne prin orice alte comentarii, preocupări sau gânduri ai pentru noi - toate mesajele sunt utile:',
-	'optin-survey-question-browser' => 'Ce navigator web folosiţi ?',
+	'optin-survey-question-feedback' => 'Vă rugăm înștiințați-ne prin orice alte comentarii, preocupări sau gânduri ai pentru noi - toate mesajele sunt utile:',
+	'optin-survey-question-browser' => 'Ce navigator web folosiți ?',
 	'optin-survey-answer-browser-other' => 'Alt browser:',
-	'optin-survey-question-os' => 'Ce sistem de operare folosiţi ?',
+	'optin-survey-question-os' => 'Ce sistem de operare folosiți ?',
 	'optin-survey-answer-os-other' => 'Alt sistem de operare:',
-	'optin-survey-question-res' => 'Care este rezoluţia monitorului dvs ?',
-	'optin-survey-question-changes' => 'Ce modificări v-ar plăcea să vedeţi în versiunea Beta în viitor (vă rugăm selectaţi tot ce se aplică) ?',
-	'optin-survey-answer-changes-nav' => 'Să facă navigarea generală a saitului mai uşoară de folosit.',
-	'optin-survey-answer-changes-edittools' => 'Să crească şi să îmbunătăţească uneltele de editare.',
-	'optin-survey-answer-changes-upload' => 'Să îmbunătăţească conţinutul şi încărcările media.',
+	'optin-survey-question-res' => 'Care este rezoluția monitorului dvs ?',
+	'optin-survey-question-changes' => 'Ce modificări v-ar plăcea să vedeți în versiunea Beta în viitor (vă rugăm selectați tot ce se aplică) ?',
+	'optin-survey-answer-changes-nav' => 'Să facă navigarea generală a saitului mai ușoară de folosit.',
+	'optin-survey-answer-changes-edittools' => 'Să crească și să îmbunătățească uneltele de editare.',
+	'optin-survey-answer-changes-upload' => 'Să îmbunătățească conținutul și încărcările media.',
 	'optin-survey-answer-changes-richtext' => 'Să dezvolte unelte de editare similare ca editoarele „rich-text”.',
-	'optin-survey-answer-changes-lookfeel' => 'Să actualizeze „aspectul şi simţul” saitului.',
-	'optin-survey-answer-changes-predictability' => 'Să se îmbunătăţească predictibilitatea de performanţă.',
+	'optin-survey-answer-changes-lookfeel' => 'Să actualizeze „aspectul și simțul” saitului.',
+	'optin-survey-answer-changes-predictability' => 'Să se îmbunătățească predictibilitatea de performanță.',
 	'optin-survey-answer-changes-custom' => 'Să se permită personalizarea utilizatorului mai mare',
 	'optin-survey-answer-changes-other' => 'Altul:',
 );
@@ -4964,6 +5072,32 @@
 	'optin-survey-answer-changes-other' => 'Атын:',
 );+/** Sardinian (Sardu)
+ * @author Andria
+ */
+$messages['sc'] = array(
+	'optin-title-optedout' => 'Proa Beta',
+	'optin-title-optedin' => 'Lassa Beta',
+	'optin-title-justoptedin' => 'Bene bènnidu a sa Beta',
+	'optin-title-justoptedout' => 'Gràtzias pro àer proadu sa nostra Beta',
+	'optin-title-feedback' => 'Feedback pro sa Beta',
+	'optin-needlogin' => 'Depes èsser [$1 identificadu (log in)] pro proare sa Beta.',
+	'optin-accept-short' => 'Proa·dda!',
+	'optin-accept-long' => 'Proare sa Beta',
+	'optin-accept-long-anon' => 'Identìfica·ti e proa sa Beta',
+	'optin-deny-short' => 'No gràtzias',
+	'optin-deny-long' => 'Torra a sa pàgina de prima',
+	'optin-submit-out' => 'Lassa sa Beta',
+	'optin-submit-feedback' => 'Lassa unu feedback',
+	'optin-survey-yes' => 'Eja',
+	'optin-survey-question-likedislike' => 'Ite as agradadu de sa Beta? Ite no as agradadu de sa Beta?',
+	'optin-survey-question-whyoptout' => 'Pro ite ses lassende sa Beta? (Seletziona totu is respostas pertinentes)',
+	'optin-survey-answer-whyoptout-hard' => "Fiat tropu difìtzile a dd'usare.",
+	'optin-survey-answer-whyoptout-other' => 'Àteru motivu:',
+	'optin-survey-answer-browser-other' => 'Àteru browser:',
+	'optin-survey-answer-changes-other' => 'Àteru:',
+);
+
 /** Sicilian (Sicilianu)
  * @author Gmelfi
  * @author Melos
@@ -5105,37 +5239,37 @@
  */
 $messages['sl'] = array(
 	'optin' => 'Vtičnik Usability Initiative (Pobuda za uporabnost)',
-	'optin-desc' => 'Omogoča uporabnikom, da preizkusjo Beta različico spletišča, najnovejše izboljšave k uporabnosti.',
-	'optin-title-optedout' => 'Poskusite Beta različico',
-	'optin-title-optedin' => 'Zapusti Beta različico',
-	'optin-title-justoptedin' => 'Dobrodošli v Beta različico',
-	'optin-title-justoptedout' => 'Hvala, ker ste preizkusili našo Beta različico',
-	'optin-title-feedback' => 'Povratne informacije Beta različice',
-	'optin-needlogin' => 'Za preizkus Beta različice je potrebna [$1 prijava].',
-	'optin-intro' => 'Wikipedijina Pobuda za uporabnost si prizadeva za izboljšanje uporabnosti Wikipedije. Želite preizkusite našo Beta različico?',
-	'optin-feedback-intro' => 'Zahvaljujemo se vam za preizkušanje Beta različice.
-Ker bi radi vedeli, kaj mislite o našem novem vmesniku, bi cenili če izpolnite spodnjo (neobvezno) anketo.',
+	'optin-desc' => 'Omogoča uporabnikom, da preizkusijo betarazličico spletišča, ki vsebuje najnovejše izboljšave k uporabnosti.',
+	'optin-title-optedout' => 'Preizkusite betarazličico',
+	'optin-title-optedin' => 'Zapusti betarazličico',
+	'optin-title-justoptedin' => 'Dobrodošli v betarazličici',
+	'optin-title-justoptedout' => 'Hvala, ker ste preizkusili našo betarazličico',
+	'optin-title-feedback' => 'Povratne informacije betarazličice',
+	'optin-needlogin' => 'Za preizkus betarazličice je potrebna [$1 prijava].',
+	'optin-intro' => 'Wikipedijina Pobuda za uporabnost si prizadeva za izboljšanje uporabnosti Wikipedije. Želite preizkusite našo betarazličico?',
+	'optin-feedback-intro' => 'Zahvaljujemo se vam za preizkušanje betarazličice.
+Ker bi radi vedeli, kaj mislite o našem novem vmesniku, bi cenili, če izpolnite spodnjo (neobvezno) anketo.',
 	'optin-feedback-back' => 'Če ne želite izpolniti ankete, se lahko vrnete v $1.',
-	'optin-success-in' => 'Sedaj preizkušate Beta različico.
-Kadarkoli se lahko vrnete s klikom na povezavo »{{int:optin-leave}}« na vrhu strani.',
-	'optin-leave-cancel' => 'Če želite nadaljevati z uporabo Beta različice, se lahko vrnete na $1.',
-	'optin-success-out' => 'Uspešno ste zapustili Beta različico. 
-Lahko jo poskusite znova kadarkoli s klikom na povezavo »{{int:optin-try}}« na vrhu strani.',
+	'optin-success-in' => 'Sedaj preizkušate betarazličico.
+Kadar koli se lahko vrnete s klikom na povezavo »{{int:optin-leave}}« na vrhu strani.',
+	'optin-leave-cancel' => 'Če želite nadaljevati z uporabo betarazličice, se lahko vrnete na $1.',
+	'optin-success-out' => 'Uspešno ste zapustili betarazličico. 
+Lahko jo poskusite znova kadar koli s klikom na povezavo »{{int:optin-try}}« na vrhu strani.',
 	'optin-success-feedback' => 'Zahvaljujemo se vam za povratne informacije!',
 	'optin-accept-short' => 'Seveda!',
-	'optin-accept-long' => 'Preizkusite Beta različico',
-	'optin-accept-long-anon' => 'Prijavite se in preizkusite Beta različico',
+	'optin-accept-long' => 'Preizkusite betarazličico',
+	'optin-accept-long-anon' => 'Prijavite se in preizkusite betarazličico',
 	'optin-deny-short' => 'Ne, hvala',
 	'optin-deny-long' => 'Vrni se na prejšnjo stran',
-	'optin-submit-out' => 'Zapusti Beta različico',
+	'optin-submit-out' => 'Zapusti betarazličico',
 	'optin-submit-feedback' => 'Pošlji povratne informacije',
 	'optin-survey-yes' => 'Da',
 	'optin-survey-no' => 'Ne',
-	'optin-survey-intro' => 'Zahvaljujemo se vam za preizkušanje Beta različice.
+	'optin-survey-intro' => 'Zahvaljujemo se vam za preizkušanje betarazličice. Želimo vedeti, kaj mislite o našem novem vmesniku, zato bi cenili, če boste izpolnili neobvezno anketo preden kliknete »[[#leave|{{int:optin-submit-out}}]]«.',
 	'optin-survey-question-likedislike' => 'Kaj vam je bilo pri betarazličici všeč? Česa niste marali?',
-	'optin-survey-question-whyoptout' => 'Zakaj zapuščate Beta različico? (Označite lahko več možnosti.)',
+	'optin-survey-question-whyoptout' => 'Zakaj zapuščate betarazličico? (Označite lahko več možnosti.)',
 	'optin-survey-answer-whyoptout-hard' => 'Prezapletena uporaba.',
 	'optin-survey-answer-whyoptout-didntwork' => 'Nepravilno delovanje.',
 	'optin-survey-answer-whyoptout-notpredictable' => 'Nepredvidljivo delovanje.',
@@ -5144,19 +5278,19 @@
 	'optin-survey-answer-whyoptout-didntlike-toolbar' => 'Nova orodna vrstica mi ni všeč.',
 	'optin-survey-answer-whyoptout-other' => 'Drug razlog:',
 	'optin-survey-question-explain' => 'Prosimo, pojasnite vaš zgornji odgovor:',
-	'optin-survey-question-techfail' => 'Ste med uporabo Beta različice nalateli na kakšno tehnično napako?',
+	'optin-survey-question-techfail' => 'Ste med uporabo betarazličice naleteli na kakšno tehnično napako?',
 	'optin-survey-question-techfail-ifyes' => 'Če je odgovor pritrdilen, ga prosimo pojasnite:',
 	'optin-survey-question-usedtoolbar' => 'Ali ste uporabili novo razširljivo orodno vrstico za urejanje strani?',
 	'optin-survey-question-usedtoolbar-ifyes' => 'Če je odgovor pritrdilen, kaj vam je bilo všeč? Česa niste marali?',
 	'optin-survey-question-usedtoolbar-ifno' => 'Če je odgovor nikalen, zakaj ne? Jo boste preizkusili v prihodnje? Prosimo, pojasnite.',
-	'optin-survey-question-different' => 'Kaj bi lahko naredili drugače, da bi nadaljevali z uporabo Beta različice?',
-	'optin-survey-question-feedback' => 'V primeru kakršnih koli drugih pripomb, idej ali misli o Beta različice, vas prosimo, da nam jih zaupate - vse povratne informacije so koristne:',
+	'optin-survey-question-different' => 'Kaj bi lahko naredili drugače, da bi nadaljevali z uporabo betarazličice?',
+	'optin-survey-question-feedback' => 'V primeru kakršnih koli drugih pripomb, idej ali misli o betarazličice, vas prosimo, da nam jih zaupate – vse povratne informacije so koristne:',
 	'optin-survey-question-browser' => 'Kateri brskalnik uporabljate?',
 	'optin-survey-answer-browser-other' => 'Drug brskalnik:',
 	'optin-survey-question-os' => 'Kateri operacijski sistem uporabljate?',
 	'optin-survey-answer-os-other' => 'Drug operacijski sistem:',
 	'optin-survey-question-res' => 'Kakšna je ločljivost vašega zaslona?',
-	'optin-survey-question-changes' => 'Kakšne spremembe želite videti v Beta različici v prihodnosti (izberete lahko več možnosti)?',
+	'optin-survey-question-changes' => 'Kakšne spremembe želite videti v betarazličici v prihodnosti (izberete lahko več možnosti)?',
 	'optin-survey-answer-changes-nav' => 'Poenostavite navigacijo.',
 	'optin-survey-answer-changes-edittools' => 'Izboljšajte orodja za urejanje strani.',
 	'optin-survey-answer-changes-upload' => 'Izboljšanje dodajanje vsebine in nalaganje večpredstavnostnih datotek.',
@@ -5165,6 +5299,20 @@
 	'optin-survey-answer-changes-predictability' => 'Izboljšajte predvidljivost delovanja.',
 	'optin-survey-answer-changes-custom' => 'Omogočite uporabniku večjo prilagoditev.',
 	'optin-survey-answer-changes-other' => 'Drugo:',
+	'optin-improvements2' => '== Kaj je bilo izboljšano? ==
+[[File:UsabilityToolbar.png|left|link=|Zaslonski posnetek izboljšane urejevalne vrstice]]
+[[File:UsabilityDialogs.png|left|link=|Zaslonski posnetek novih pogovornih oken za ustvarjanje vsebine]]
+;Izboljšana orodna vrstica
+Z izboljšano orodno vrstico je urejanje člankov lažje.
+Nove in izpopolnjene ikone jasneje kažejo, katero dejanje orodje izvede.
+Razširljivi razdelki zmanjšajo nered, medtem ko ohranjajo vsa redko uporabljana orodja samo klik proč.
+;Pogovorna okna
+Ko ustvarjate povezave ali preglednice, klik na ikono orodja sedaj odpre pogovorno okno, ki vam pomaga ustvariti povezave in preglednice z izpolnitvijo preprostega obrazca.
+;In več
+Uvedli smo število drugih izboljšav, kot je izpopolnjena navigacija, padajoči zavihki, izboljšano iskanje in več.
+== Kako sodelujem ==
+Da izveste več o Pobudi za uporabnost, si, prosimo, oglejte našo [http://usability.wikimedia.org/wiki/Wikipedia... domačo stran].
+<div style="clear:both"></div>',
 ); /** Serbian Cyrillic ekavian (Српски (ћирилица))
@@ -5312,6 +5460,8 @@
 ); /** Swedish (Svenska)
+ * @author Ainali
+ * @author Boivie
  * @author Hannibal
  * @author Micke
  * @author Rotsee
@@ -5383,24 +5533,17 @@
 	'optin-survey-answer-changes-custom' => 'Tillåt mer skräddarsydda inställningar.',
 	'optin-survey-answer-changes-other' => "Övrigt ''(endast engelska)'':",
 	'optin-improvements2' => '== Vad har förbättrats? == 
-[[Fil: UsabilityToolbar.png | vänster | link = | Skärmdump av det förbättrade redigeringsverktygsfältet]] 
-[[Fil: UsabilityDialogs.png | vänster | link = | Skärmdump av de nya dialogrutorna för att skapa innehåll]]
-;Förbättrat verktygsfält Det förbättrade verktygsfältet gör det enklare att redigera artiklar. 
-
+[[File:UsabilityToolbar.png|vänster|link=|Skärmdump av det förbättrade redigeringsverktygsfältet]] 
+[[File:UsabilityDialogs.png|vänster|link=|Skärmdump av de nya dialogrutorna för att skapa innehåll]]
+;Förbättrat verktygsfält
+Det förbättrade verktygsfältet gör det enklare att redigera artiklar. 
 Nya och förbättrade ikoner gör det tydligare vad de olika verktygen gör. 
-
 Utfällbara avsnitt minskar röran, samtidigt som verktyg som används sällan finns ett enda klick bort.
-
-; Dialogruta
-
-Numera när du skapar länkar eller tabeller, och klickar på verktygsikonen, så öppnas en dialogruta som hjälper dig att skapa länkar och tabeller genom att du bara kan fylla i ett formulär.
-
-; Dessutom
-
+;Dialogruta
+Numera när du skapar länkar eller tabeller och klickar på verktygsikonen, så öppnas en dialogruta som hjälper dig att skapa länkar och tabeller genom att du bara kan fylla i ett formulär.
+;Dessutom
 Vi har infört en rad andra förbättringar såsom enklare navigering, utfällbara flikar, förbättrad sökning, med mera. 
-
 == Så här kan du hjälpa till == 
-
 Om du vill veta mer om användbarhetsinitiativet, besök vår [http://usability.wikimedia.org/wiki/Wikipedia... webbplats].
 <div style="clear:both"></div>',
 );
@@ -5634,6 +5777,86 @@
 	'optin-survey-answer-changes-other' => 'Başga:',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'optin' => 'Paglahok sa Pagpapanimula ng Pagkanagagamit',
+	'optin-desc' => 'Pahintulutan ang mga tagagamit na subukan ang Beta, ang pinakabagong mga pagpapaigi ng pagkanagagamit ng Pagpapanimula ng Pagkanagagamit',
+	'optin-title-optedout' => 'Subukan ang Beta',
+	'optin-title-optedin' => 'Umalis mula sa Beta',
+	'optin-title-justoptedin' => 'Maligayang pagdating sa Beta',
+	'optin-title-justoptedout' => 'Salamat sa pagsubok mo ng aming Beta',
+	'optin-title-feedback' => 'Mga puna sa Beta',
+	'optin-needlogin' => 'Kailangan mong [$1 lumagda] upang masubukan ang Beta.',
+	'optin-intro' => 'Ang Pagpapanimula ng Pagkanagagamit ng Wikipedia ay nagsusumikap upang mapainam ang pagiging nagagamit ng Wikipedia. Nais mo bang subukan ang aming Beta?',
+	'optin-feedback-intro' => 'Salamat sa pagsubok mo ng Beta. 
+Nais namin na malaman kung ano ang tingin mo sa aming bagong hangganang-mukha, mamarapatin namin ang maaaring hindi gawing pagtugon mo sa mga katanungang nasa ibaba.',
+	'optin-feedback-back' => 'Kung hindi mo nais na sagutin ang pagtatanong, maaari kang magbalik sa $1.',
+	'optin-success-in' => 'Sinusubukan mo na ngayon ang Beta.
+Maaari kang umatras at huwag makilahok anumang oras sa pamamagitan ng pagpindot sa kawing na "{{int:optin-leave}}" na nasa kawing na nasa itaas ng pahina.',
+	'optin-leave-cancel' => 'Kung nais mong magpatuloy sa paggamit ng Beta, maaaring kang bumalik sa $1.',
+	'optin-success-out' => 'Matagumpay ka nang nakaalis mula sa Beta.
+Maaari mo itong subukang muli anumang oras sa pamamagitan ng pagpindot sa kawing na "{{int:optin-try}}" na nasa itaas ng pahina.',
+	'optin-success-feedback' => 'Salamat sa iyong mga puna!',
+	'optin-accept-short' => 'Iyan ang gawin natin!',
+	'optin-accept-long' => 'Subukan ang Beta',
+	'optin-accept-long-anon' => 'Lumagda at subukan ang Beta',
+	'optin-deny-short' => 'Huwag, salamat na lang',
+	'optin-deny-long' => 'Bumalik sa nakaraang pahina',
+	'optin-submit-out' => 'Umalis mula sa Beta',
+	'optin-submit-feedback' => 'Magbigay ng puna',
+	'optin-survey-yes' => 'Oo',
+	'optin-survey-no' => 'Huwag',
+	'optin-survey-intro' => 'Salamat sa pagsubok mo ng Beta.
+Nais naming malaman ang tingin mo sa aming bagong hangganang-mukha, mamarapatin namin ang maaaring huwag gawing pagtugon mo sa mga pagtatanong na nasa ibaba bago pindutin ang "[[#leave|{{int:optin-submit-out}}]]".',
+	'optin-survey-question-likedislike' => 'Ano ang naibigan mo tungkol sa Beta? Ano ang hindi mo nagustuhan tungkol sa Beta?',
+	'optin-survey-question-whyoptout' => 'Bakit ka aalis mula sa Beta? (Pakipili ang lahat ng mga maaari.)',
+	'optin-survey-answer-whyoptout-hard' => 'Mahirap itong gamitin.',
+	'optin-survey-answer-whyoptout-didntwork' => 'Hindi maayos ang pag-andar nito.',
+	'optin-survey-answer-whyoptout-notpredictable' => 'Hindi maaasahan ang pagganap nito.',
+	'optin-survey-answer-whyoptout-didntlike-look' => 'Hindi ko naibigan ang anyo nito.',
+	'optin-survey-answer-whyoptout-didntlike-layout' => 'Hindi ko naibigan ang bagong mga panglaylay at pagkakaayos.',
+	'optin-survey-answer-whyoptout-didntlike-toolbar' => 'Hindi ko gusto ang bagong kahon ng kasangkapan.',
+	'optin-survey-answer-whyoptout-other' => 'Ibang dahilan:',
+	'optin-survey-question-explain' => 'Mangyaring ipaliwanag o palawigin ang sagot mong nasa itaas:',
+	'optin-survey-question-techfail' => 'Nakaranas ka ba ng anumang mga kabiguang teknikal habang ginagamit ang Beta?',
+	'optin-survey-question-techfail-ifyes' => 'Kung oo, mangyaring palawigin o ipaliwanag:',
+	'optin-survey-question-usedtoolbar' => 'Nagamit mo ang bagong napapalawak na kahon ng kasangkapan sa pamamatnugot ng isang pahina?',
+	'optin-survey-question-usedtoolbar-ifyes' => 'Kung oo, ano ang naibigan mo tungkol dito? Ano ang hindi mo nagustuhan tungkol dito?',
+	'optin-survey-question-usedtoolbar-ifno' => 'Kung hindi, bakit hindi? Gagamitin mo ba ito sa hinaharap? Mangyaring ipaliwanag.',
+	'optin-survey-question-different' => 'Ano ba ang magagawa naming naiiba upang mapanatili kang gumagamit ng Beta?',
+	'optin-survey-question-feedback' => 'Mangyaring ipaalam sa amin ang tungkol sa iba pang mga pagpuna, mga alalahanin, o mga kaisipan mayroon ka para sa amin - magagamit ang lahat ng mga pabalik-sabi:',
+	'optin-survey-question-browser' => 'Anong pambasa-basa ba ang ginagamit mo?',
+	'optin-survey-answer-browser-other' => 'Ibang pambasa-basa:',
+	'optin-survey-question-os' => 'Anong sistemang pampaandar ang ginagamit mo?',
+	'optin-survey-answer-os-other' => 'Iba pang sistema ng pampaandar:',
+	'optin-survey-question-res' => 'Ano ang resolusyon ng tanawan mo?',
+	'optin-survey-question-changes' => 'Anong mga pagbabago ang nais mong makita sa loob ng Beta pagdating ng hinaharap (pakipili ang lahat ng maaari)?',
+	'optin-survey-answer-changes-nav' => 'Gawing mas maginhawa ang paggamit na kabuoang paglilibot sa sayt.',
+	'optin-survey-answer-changes-edittools' => 'Dagdagan at paigihin ang mga kasangkapang pampatnugot.',
+	'optin-survey-answer-changes-upload' => 'Painamin ang mga paitaas na pagkakarga ng nilalaman at midya.',
+	'optin-survey-answer-changes-richtext' => 'Magpaunlad ng mga kasangkapang pampatnugot na katulad ng sa mga patnugot ng mayamang teksto.',
+	'optin-survey-answer-changes-lookfeel' => 'Isapanahon ang "wangis at hipo" ng sayt.',
+	'optin-survey-answer-changes-predictability' => 'Painamin ang pagka naaasahan ng pagganap.',
+	'optin-survey-answer-changes-custom' => 'Pahintulutan ang mas malaking pagpapasadya ng tagagamit.',
+	'optin-survey-answer-changes-other' => 'Iba pa:',
+	'optin-improvements2' => '== Ano ba ang napainam? ==
+[[File:UsabilityToolbar.png|left|link=|Larawan ng pinainam na kahon ng kasangkapan na pampatnugot]]
+[[File:UsabilityDialogs.png|left|link=|Larawan ng mga salitaan na para sa paglikha ng bagong nilalaman]]
+;Pinainam na kahon ng kasangkapan
+Nakapagpapaginhawa sa pamamatnugot ng mga lathalain ang pinainam na kahon ng kasangkapan.
+Nakapagpapalinaw sa kung anong galaw ang gagampanan ng bawat isang kasangkapan ang bago at napainam na mga larawan.
+Nakapagbabawas ng kalat ang pinalawak na mga seksyon habang pinananatiling mapipindot lang kaagad ang hindi gaanong ginagamit na mga kasangkapan.
+;Diyalogo
+Kapag lumilikha ng mga kawing o mga talahanayan, nagbubukas na ngayon ng isang kahon ng salitaan ang pagpindot sa larawan na pangkasangkapan na nakakatulong sa iyo na makalikha ng mga kawing at mga talahanayan sa pamamagitan ng pagpupuno sa isang payak na pormularyo.
+;At marami pa
+Nagpakilala kami ng isang bilan gng iba pang mga pagpapainam katulad ng pinaiging panglibot, dumudulas na mga panglaylay, pinainam na paghahanap, at marami pa.
+== Paano makakalahok ==
+Upang makatuklas ng iba pang tungkol sa Pampanimula ng Pagkanagagamit, mangyaring dalawin ang aming [http://usability.wikimedia.org/wiki/Wikipedia... bahay-pahina].
+<div style="clear:both"></div>',
+);
+
 /** Turkish (Türkçe)
  * @author Bekiroflaz
  * @author Joseph
@@ -6180,6 +6403,7 @@ /** Traditional Chinese (‪中文(繁體)‬)
  * @author Gaoxuewei
+ * @author Horacewai2
  * @author Mark85296341
  * @author Shinjiman
  */
@@ -6247,6 +6471,16 @@
 	'optin-survey-answer-changes-predictability' => '改善效率預測。',
 	'optin-survey-answer-changes-custom' => '容許更加有彈性的用戶自定。',
 	'optin-survey-answer-changes-other' => '其它:',
+	'optin-improvements2' => '==有什麼改善? ==
+[[file:UsabilityToolbar.png|left|link=|截圖編輯工具欄上的增強]][[file:UsabilityDialogs.png|left|link=|對話內容截圖]]
+;增強的工具欄
+增強工具欄上可以更容易地編輯文章。
+新的和改進的圖標使每個工具更清楚什麼樣的行動執行。
+膨脹節減少混亂,同時保持不經常使用的工具只是一個點擊即可。
+;對話框在創建鏈接或表
+點擊工具圖標現在打開對話框,幫助您創建鏈接和表格填寫一份簡單的表格。以及更多我們採取了一些其他的改進,如增強的導航,級聯標籤,改進的搜索,以及更多。
+==如何參與==
+若要了解更多關於可用性倡議,請訪問我們的[http://usability.wikimedia.org/wiki/Wikipedia... 網頁]。 <div style="clear:both"></div>',
 ); /** Chinese (Taiwan) (‪中文(台灣)‬)

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptInLink.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptInLink.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/OptInLink.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -44,6 +44,18 @@
 	'optin-feedback' => 'Beta terugvoer',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'optin-try' => 'Provo Beta',
+	'tooltip-pt-optin-try' => 'Provoni karakteristika të reja',
+	'optin-leave' => 'Lini Beta',
+	'tooltip-pt-optin-leave' => 'Turn off karakteristika të reja',
+	'optin-feedback' => 'reagime Beta',
+	'tooltip-pt-optin-feedback' => 'Sigurimi reagime për përvojën tuaj me karakteristika të reja',
+);
+
 /** Arabic (العربية)
  * @author ;Hiba;1
  * @author Meno25
@@ -332,6 +344,7 @@
 ); /** Persian (فارسی)
+ * @author Ebraminio
  * @author Ladsgroup
  */
 $messages['fa'] = array(
@@ -339,6 +352,7 @@
 	'tooltip-pt-optin-try' => 'خروج از امکانات جدید',
 	'optin-leave' => 'خروج از بتا',
 	'tooltip-pt-optin-leave' => 'خاموش کردن امکانات جدید',
+	'optin-feedback' => 'بازخورد نسخه بتا',
 ); /** Finnish (Suomi)
@@ -556,11 +570,14 @@ /** Georgian (ქართული)
  * @author Alsandro
+ * @author BRUTE
  * @author გიორგიმელა
  */
 $messages['ka'] = array(
 	'optin-try' => 'მოსინჯეთ ბეტა',
+	'tooltip-pt-optin-try' => 'სცადეთ ახალი შესაძლებლობები',
 	'optin-leave' => 'ბეტადან გასვლა',
+	'tooltip-pt-optin-leave' => 'გამორთეთ ახალი შესაძლებლობები',
 	'optin-feedback' => 'გამოხმაურება',
 );@@ -775,13 +792,14 @@ /** Polish (Polski)
  * @author Leinad
+ * @author Nux
  * @author Sp5uhe
  */
 $messages['pl'] = array(
 	'optin-try' => 'Wypróbuj wersję testową',
-	'tooltip-pt-optin-try' => 'Wypróbuj nowe funkcje',
+	'tooltip-pt-optin-try' => 'Wypróbuj nowe funkcjonalności',
 	'optin-leave' => 'Koniec testowania',
-	'tooltip-pt-optin-leave' => 'Wyłącz nowe funkcje',
+	'tooltip-pt-optin-leave' => 'Wyłącz nowe funkcjonalności',
 	'optin-feedback' => 'Opinia o wersji testowej',
 	'tooltip-pt-optin-feedback' => 'Prześlij opinię na temat nowych funkcji',
 );
@@ -845,12 +863,12 @@
  * @author Stelistcristi
  */
 $messages['ro'] = array(
-	'optin-try' => 'Încercaţi Beta',
-	'tooltip-pt-optin-try' => 'Încercaţi funcţii noi',
-	'optin-leave' => 'Părăsiţi Beta',
-	'tooltip-pt-optin-leave' => 'Dezactivaţi funcţiile noi',
+	'optin-try' => 'Încercați Beta',
+	'tooltip-pt-optin-try' => 'Încercați funcții noi',
+	'optin-leave' => 'Părăsiți Beta',
+	'tooltip-pt-optin-leave' => 'Dezactivați funcțiile noi',
 	'optin-feedback' => 'Părere despre Beta',
-	'tooltip-pt-optin-feedback' => 'Furnizaţi un feedback cu privire la experienţa cu noile funcţionalităţi',
+	'tooltip-pt-optin-feedback' => 'Furnizați un feedback cu privire la experiența cu noile funcționalități',
 ); /** Tarandíne (Tarandíne)
@@ -893,6 +911,14 @@
 	'tooltip-pt-optin-feedback' => 'Саҥаны туттубутуҥ туһунан кэпсээ',
 );+/** Sardinian (Sardu)
+ * @author Andria
+ */
+$messages['sc'] = array(
+	'optin-try' => 'Proa sa Beta',
+	'optin-leave' => 'Lassa sa Beta',
+);
+
 /** Sinhala (සිංහල)
  * @author චතුනි අලහප්පෙරුම
  */
@@ -922,9 +948,9 @@
  * @author Smihael
  */
 $messages['sl'] = array(
-	'optin-try' => 'Poskusite Beta različico',
+	'optin-try' => 'Preizkusite betarazličico',
 	'tooltip-pt-optin-try' => 'Preizkusite nove funkcije',
-	'optin-leave' => 'Zapusti Beta različico',
+	'optin-leave' => 'Zapusti betarazličico',
 	'tooltip-pt-optin-leave' => 'Izklopite nove funkcije',
 	'optin-feedback' => 'Mnenja o betarazličici',
 	'tooltip-pt-optin-feedback' => 'Nudi povratne informacije o vaših izkušnjah z novimi funkcijami',
@@ -1034,6 +1060,18 @@
 	'tooltip-pt-optin-feedback' => 'Täze funksiýalardaky tejribeleriňiz barada seslenme ýazyň',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'optin-try' => 'Subukan ang Beta',
+	'tooltip-pt-optin-try' => 'Subukan ang bagong mga kasangkapang-katangian',
+	'optin-leave' => 'Umalis mula sa Beta',
+	'tooltip-pt-optin-leave' => 'Huwag buhayin ang bagong mga kasangkapang-katangian',
+	'optin-feedback' => 'Mga puna sa Beta',
+	'tooltip-pt-optin-feedback' => 'Magbigay ng mga puna tungkol sa iyong karanasan sa bagong mga kasangkapang-katangian',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  * @author Vito Genovese

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -379,7 +379,7 @@
 						"survey-$id-other-radio",
 						$answer === 'other'
 					) .
-					'&nbsp;' .
+					'&#160;' .
 					Xml::input(
 						"survey-$id-other",
 						false,
@@ -415,7 +415,7 @@
 						in_array( 'other', $answers, true ),
 						array( 'value' => 'other' )
 					) .
-					'&nbsp;' .
+					'&#160;' .
 					Xml::input(
 						"survey-$id-other",
 						false,

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefStats/PrefStats.alias.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefStats/PrefStats.alias.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefStats/PrefStats.alias.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -62,6 +62,11 @@
 	'PrefStats' => array( 'Statistike vun den Astellungen' ),
 );+/** Malayalam (മലയാളം) */
+$aliases['ml'] = array(
+	'PrefStats' => array( 'ക്രമീകരണസ്ഥിതിവിവരം' ),
+);
+
 /** Marathi (मराठी) */
 $aliases['mr'] = array(
 	'PrefStats' => array( 'प्राथम्यसांख्यिकी' ),
@@ -92,3 +97,8 @@
 	'PrefStats' => array( 'ŠtatistikyNastavení' ),
 );+/** Yiddish (ייִדיש) */
+$aliases['yi'] = array(
+	'PrefStats' => array( 'פרעפערענצן סטאטיסטיק' ),
+);
+

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefStats/PrefStats.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefStats/PrefStats.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefStats/PrefStats.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -74,6 +74,34 @@
 	'prefstats-factor-default' => 'terug na die verstek-skaal',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'prefstats' => 'Statistikat e Preferencë',
+	'prefstats-desc' => 'Statistika Track se si shumë përdorues të ketë preferenca të caktuara aktivizuar',
+	'prefstats-title' => 'Statistikat e Preferencë',
+	'prefstats-list-intro' => 'Aktualisht, preferencat e mëposhtme janë duke u gjurmuar.
+ Klikoni mbi një për të parë statistikave në lidhje me të.',
+	'prefstats-noprefs' => 'Nuk ka preferencat janë duke u gjurmuar. Konfiguro $wgPrefStatsTrackPrefs për të gjetur preferencave.',
+	'prefstats-counters' => '* $1 {{PLURAL:$1|përdorues ka|perdorues kanë}} mundësuar këtë parapëlqim që nga statistika preferencë ishin aktivizuar
+** $2 {{PLURAL:$2 |përdorues ka akoma|përdoruesit kanë ende}} është aktivizuar
+** $3 {{PLURAL:$3|përdorues ka|perdorues kanë}} me aftësi të kufizuara që',
+	'prefstats-counters-expensive' => '* $1 {{PLURAL:$1|përdorues ka|perdorues kanë}} mundësuar këtë parapëlqim që nga statistika preferencë ishin aktivizuar
+** $2 {{PLURAL:$2|përdorues ka akoma|përdoruesit kanë ende}} është aktivizuar',
+	'prefstats-xaxis' => 'Kohëzgjatja (orë)',
+	'prefstats-factors' => 'Shiko për: $1',
+	'prefstats-factor-hour' => 'orë',
+	'prefstats-factor-sixhours' => 'gjashtë orë',
+	'prefstats-factor-day' => 'ditë',
+	'prefstats-factor-week' => 'javë',
+	'prefstats-factor-twoweeks' => 'dy javë',
+	'prefstats-factor-fourweeks' => 'katër javë',
+	'prefstats-factor-default' => 'back to default shkallë',
+	'prefstats-legend-out' => 'Zgjedhur nga',
+	'prefstats-legend-in' => 'Zgjedhur në',
+);
+
 /** Arabic (العربية)
  * @author Meno25
  * @author Orango
@@ -709,9 +737,11 @@
 ); /** Persian (فارسی)
+ * @author Ebraminio
  * @author Mardetanha
  */
 $messages['fa'] = array(
+	'prefstats' => 'آمار ترجیحات',
 	'prefstats-factor-hour' => 'ساعت',
 	'prefstats-factor-sixhours' => 'شش ساعت',
 	'prefstats-factor-day' => 'روز',
@@ -846,7 +876,7 @@
 	'prefstats-factor-week' => 'semana',
 	'prefstats-factor-twoweeks' => 'dúas semanas',
 	'prefstats-factor-fourweeks' => 'catro semanas',
-	'prefstats-factor-default' => 'voltar á escala por defecto',
+	'prefstats-factor-default' => 'volver á escala por defecto',
 	'prefstats-legend-out' => 'Deixou de participar',
 	'prefstats-legend-in' => 'Quixo participar',
 );
@@ -1220,6 +1250,8 @@
 	'prefstats-factor-week' => 'კვირა',
 	'prefstats-factor-twoweeks' => 'ორი კვირა',
 	'prefstats-factor-fourweeks' => 'ოთხი კვირა',
+	'prefstats-legend-out' => 'გამორიცხვის პრინციპით',
+	'prefstats-legend-in' => 'დაშვების პრინციპით',
 ); /** Khmer (ភាសាខ្មែរ)
@@ -1600,13 +1632,26 @@
 	'prefstats-title' => 'Statistikk over innstillingar',
 	'prefstats-list-intro' => 'For tida vert dei fylgjande innstillingane spora.
 Trykk på éi for å sjå statistikk for ho.',
+	'prefstats-noprefs' => 'For tida vert ingen innstillingar spora.
+Endra oppsettet til $wgPrefStatsTrackPrefs for å spora innstillingar.',
+	'prefstats-counters' => '* {{PLURAL:$1|Éin brukar|$1 brukarar}} har aktivert denne innstillinga sidan innstillingsstatistikken vart sett i gang
+** {{PLURAL:$2|Éin brukar|$2 brukarar}} har enno innstillinga aktivert
+** {{PLURAL:$3|Éin brukar|$3 brukarar}} har sidan deaktivert innstillinga',
+	'prefstats-counters-expensive' => '* {{PLURAL:$1|Éin brukar|$1 brukarar}} har aktivert denne innstillinga sidan innstillingsstatistikken vart sett i gang
+** {{PLURAL:$2|Éin brukar|$2 brukarar}} har enno innstillinga aktivert
+** {{PLURAL:$3|Éin brukar|$3 brukarar}} har sidan deaktivert innstillinga
+* I alt har {{PLURAL:$4|éin brukar|$4 brukarar}} innstillinga aktivert',
 	'prefstats-xaxis' => 'Tid i timar',
+	'prefstats-factors' => 'Vis per $1',
 	'prefstats-factor-hour' => 'time',
 	'prefstats-factor-sixhours' => 'seks timar',
 	'prefstats-factor-day' => 'dag',
 	'prefstats-factor-week' => 'veke',
 	'prefstats-factor-twoweeks' => 'to veker',
 	'prefstats-factor-fourweeks' => 'fire veker',
+	'prefstats-factor-default' => 'tilbake til standardskalering',
+	'prefstats-legend-out' => 'Valde vekk',
+	'prefstats-legend-in' => 'Valde',
 ); /** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
@@ -1837,23 +1882,23 @@
  * @author Strainu
  */
 $messages['ro'] = array(
-	'prefstats' => 'Statistici despre preferinţe',
-	'prefstats-desc' => 'Urmăiţi statistici despre câţi utilizatori au o anumită preferinţă activată',
-	'prefstats-title' => 'Statistici despre preferinţe',
-	'prefstats-list-intro' => 'În prezent, sunt urmărite următoarele preferinţe.
-Apăsaţi pe ele pentru a vizualiza statistici despre ele.',
-	'prefstats-noprefs' => 'Nicio preferinţă nu este în prezent urmărită.
-Configuraţi $wgPrefStatsTrackPrefs pentru a urmări preferinţe.',
+	'prefstats' => 'Statistici despre preferințe',
+	'prefstats-desc' => 'Urmăiți statistici despre câți utilizatori au o anumită preferință activată',
+	'prefstats-title' => 'Statistici despre preferințe',
+	'prefstats-list-intro' => 'În prezent, sunt urmărite următoarele preferințe.
+Apăsați pe ele pentru a vizualiza statistici despre ele.',
+	'prefstats-noprefs' => 'Nicio preferință nu este în prezent urmărită.
+Configurați $wgPrefStatsTrackPrefs pentru a urmări preferințe.',
 	'prefstats-xaxis' => 'Durată (ore)',
 	'prefstats-factors' => 'Vizualizări pe: $1',
 	'prefstats-factor-hour' => 'oră',
-	'prefstats-factor-sixhours' => 'şase ore',
+	'prefstats-factor-sixhours' => 'șase ore',
 	'prefstats-factor-day' => 'zi',
 	'prefstats-factor-week' => 'săptămână',
 	'prefstats-factor-twoweeks' => 'două săptămâni',
 	'prefstats-factor-fourweeks' => 'patru săptămâni',
-	'prefstats-factor-default' => 'înapoi la scala iniţială',
-	'prefstats-legend-out' => 'Renunţat',
+	'prefstats-factor-default' => 'înapoi la scala inițială',
+	'prefstats-legend-out' => 'Renunțat',
 	'prefstats-legend-in' => 'Optat',
 );@@ -1952,6 +1997,19 @@
 	'prefstats-legend-in' => 'Холбонорго',
 );+/** Sardinian (Sardu)
+ * @author Andria
+ */
+$messages['sc'] = array(
+	'prefstats-xaxis' => 'Durada (oras)',
+	'prefstats-factor-hour' => 'ora',
+	'prefstats-factor-sixhours' => 'ses oras',
+	'prefstats-factor-day' => 'die',
+	'prefstats-factor-week' => 'chida',
+	'prefstats-factor-twoweeks' => 'duas chidas',
+	'prefstats-factor-fourweeks' => 'bator chidas',
+);
+
 /** Sicilian (Sicilianu)
  * @author Melos
  */
@@ -2195,6 +2253,37 @@
 	'prefstats-legend-in' => 'Goşulan',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'prefstats' => 'Estadistika ng nais',
+	'prefstats-desc' => 'Subaybayan ang estadistika tungkol sa ilang mga tagagamit ang mayroong partikular na pinaaandar na mga nais',
+	'prefstats-title' => 'Estadistika ng nais',
+	'prefstats-list-intro' => 'Sa kasalukuyan, sinusubaybayan ang sumusunod na mga nais.
+Pindutin ang isa upang matingnan ang estadistikang tungkol dito.',
+	'prefstats-noprefs' => 'Kasalukuyang walang sinusubaybayang mga nais.
+Iayos ang $wgPrefStatsTrackPrefs upang subaybayan ang mga nais.',
+	'prefstats-counters' => ' $1 {{PLURAL:$1|tagagamit|mga tagagamit}} ang nagpapagana ng ganitong nais magmula noong pasiglahin ang estadistika ng nais
+** $2 {{PLURAL:$2|tagagamit pa rin|mga tagagamit pa rin}} nagpapagana nito
+** $3 {{PLURAL:$3|tagagamit|mga tagagamit}} ang hindi na nagpagana nito mula noon',
+	'prefstats-counters-expensive' => '$1 {{PLURAL:$1|tagagamit|mga tagagamit}} ang nagpapagana ng ganitong nais magmula noong pasiglahin ang estadistika ng nais
+** $2 {{PLURAL:$2|tagagamit pa rin|mga tagagamit pa rin}} nagpapagana nito
+** $3 {{PLURAL:$3|tagagamit|mga tagagamit}} ang hindi na nagpagana nito mula noon
+* Sa kabuoan, {{PLURAL:$4|tagagamit ang|mga tagagamit ang}}  nagtakda ng ganitong nais',
+	'prefstats-xaxis' => 'Pamamarati (mga oras)',
+	'prefstats-factors' => 'Pagtingin bawat: $1',
+	'prefstats-factor-hour' => 'oras',
+	'prefstats-factor-sixhours' => 'anim na oras',
+	'prefstats-factor-day' => 'araw',
+	'prefstats-factor-week' => 'linggo',
+	'prefstats-factor-twoweeks' => 'dalawang linggo',
+	'prefstats-factor-fourweeks' => 'apat na linggo',
+	'prefstats-factor-default' => 'bumalik sa likas na nakatakdang tumbasan',
+	'prefstats-legend-out' => 'Hindi sumali',
+	'prefstats-legend-in' => 'Sumali',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  */


Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/REL1_15/phase3/extensions/UsabilityInitiative/PrefSwitch:51646
/branches/wmf-deployment/extensions/UsabilityInitiative/PrefSwitch:60970
/trunk/extensions/UsabilityInitiative/PrefSwitch:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66331-66335,66402,66565,66623,66631,66642-66644,66655
/trunk/phase3/extensions/UsabilityInitiative/PrefSwitch:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
   + /branches/REL1_15/phase3/extensions/UsabilityInitiative/PrefSwitch:51646
/branches/wmf-deployment/extensions/UsabilityInitiative/PrefSwitch:60970
/trunk/extensions/UsabilityInitiative/PrefSwitch:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66331-66335,66337-67741,67743-67744
/trunk/phase3/extensions/UsabilityInitiative/PrefSwitch:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.alias.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.alias.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.alias.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -15,3 +15,18 @@
 	'PrefSwitch' => array( 'تغيير_تفضيلات_مبادرة_الاستخدام' ),
 );+/** Japanese (日本語) */
+$aliases['ja'] = array(
+	'PrefSwitch' => array( 'ユーザビリティイニシアティブ設定スイッチ' ),
+);
+
+/** Malayalam (മലയാളം) */
+$aliases['ml'] = array(
+	'PrefSwitch' => array( 'യൂസബിലിറ്റി‌‌ഇനിഷ്യേറ്റീവ്‌‌ക്രമീകരണസ്ഥിതിവിവരം' ),
+);
+
+/** Dutch (Nederlands) */
+$aliases['nl'] = array(
+	'PrefSwitch' => array( 'BruikbaarheidsinitiatiefVoorkeurenwissel' ),
+);
+

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.classes.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.classes.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.classes.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -181,7 +181,7 @@
 				"prefswitch-survey-{$question}-other",
 				$answer === 'other'
 			) .
-			'&nbsp;' .
+			'&#160;' .
 			Xml::input(
 				"prefswitch-survey-{$question}-other-radio",
 				false,
@@ -220,7 +220,7 @@
 				in_array( 'other', $answers, true ),
 				array( 'value' => 'other' )
 			) .
-			'&nbsp;' .
+			'&#160;' .
 			Xml::input(
 				"prefswitch-survey-{$question}-other",
 				false,

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -5,7 +5,6 @@
  * @file
  * @ingroup Extensions
  */
-
 $messages = array(); /** English
@@ -68,30 +67,51 @@
 	'prefswitch-success-feedback' => 'Your feedback has been sent.',
 	'prefswitch-return' => '<hr style="clear:both">
 Return to <span class="plainlinks">[$1 $2]</span>.',
-	'prefswitch-main' => "We have been working hard to make things easier for our users. We are excited to share some improvements, including a new look and feel and simplified editing features.  Improving the usability of our projects is a priority of the Wikimedia Foundation and we will be sharing more updates in the future. For more details, visit the related [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedia blog] post.
+	'prefswitch-main' => "{| border=\"0\" align=\"right\" style=\"margin-left:1em\"
+| align=\"center\" |
+{| border=\"0\" style=\"background:#F3F3F3;border: 1px solid #CCCCCC;padding:10px;\" 
+| [[Image:VectorNavigation-en.png|401px|]]
+|-
+| A screenshot of Wikipedia's new navigation interface <small>[[Media:VectorNavigation-en.png|(enlarge)]]</small>
+|}
+|-
+| align=\"center\" |
+{| border=\"0\" style=\"background:#F3F3F3;border: 1px solid #CCCCCC;padding:10px;\"
+| [[Image:VectorEditorBasic-en.png|401px|]]
+|-
+| A screenshot of the basic page editing interface <small>[[Media:VectorEditorBasic-en.png|(enlarge)]]</small>
+|}
+|-
+| align=\"center\" |
+{| border=\"0\" style=\"background:#F3F3F3;border: 1px solid #CCCCCC;padding:10px;\"
+| [[Image:VectorLinkDialog-en.png|401px|]]
+|-
+| A screenshot of the new dialog box for entering links
+|}
+|}
+The Wikimedia Foundation's User Experience Team has been working with volunteers from the community to make things easier for you. We are excited to share some improvements, including a new look and feel and simplified editing features. These changes are intended to make it easier for new contributors to get started, and are based on our [http://usability.wikimedia.org/wiki/Usability... usability testing conducted over the last year]. Improving the usability of our projects is a priority of the Wikimedia Foundation and we will be sharing more updates in the future. For more details, visit the related Wikimedia [http://blog.wikimedia.org/2010/05/13/a-new-lo... blog post].-[[File:UsabilityNavigation.png|right|link=|Screenshot of the new navigation]]
-[[File:UsabilityToolbar.png|right|link=|Screenshot of the enhanced edit toolbar]]
-[[File:UsabilityDialogs.png|right|link=|Screenshot of the new content generation dialogs]]
-===Here's what we have changed===
-* '''Navigation''': We have improved the navigation for reading and editing pages. Now, the tabs at the top of each page more clearly define whether you are viewing the page or discussion page, and whether you are reading or editing a page.
-* '''Editing toolbar improvements''':  We have reorganized the editing toolbar to make it easier to use. Now, formatting pages is simpler and more intuitive.
-* '''Link wizard''':  An easy-to-use tool allows you to add links to other wiki pages as well as links to external sites.
-* '''Search improvements''': We have improved search suggestions to get you to the page you are looking for more quickly.
-* '''Other new features''':  We have also introduced a table wizard to make creating tables easier and find and a replace feature to simplify page editing.
-* '''Wikipedia puzzle globe''': We have updated the puzzle globe. Read more at the [http://blog.wikimedia.org/2010/05/13/wikipedi...  Wikimedia blog].",
-	'prefswitch-main-anon' => "===Take Me Back===
-If you would like to turn off the new features, <span class=\"plainlinks\">[$1 click here]</span>. You will be asked to login or create an account first.",
-	'prefswitch-main-on' => "===Feedback?===
-We would love to hear from you.  Please visit our <span class=\"plainlinks\">[$1 feedback page]</span>.
-===Take me back!===
-If you would like to turn off the new features, please <span class=\"plainlinks\">[$2 click here]</span>.",
+=== Here's what we have changed ===
+* '''Navigation:''' We have improved the navigation for reading and editing pages. Now, the tabs at the top of each page more clearly define whether you are viewing the page or discussion page, and whether you are reading or editing a page.
+* '''Editing toolbar improvements:''' We have reorganized the editing toolbar to make it easier to use. Now, formatting pages is simpler and more intuitive.
+* '''Link wizard:''' An easy-to-use tool allows you to add links to other wiki pages as well as links to external sites.
+* '''Search improvements:''' We have improved search suggestions to get you to the page you are looking for more quickly.
+* '''Other new features:''' We have also introduced a table wizard to make creating tables easier and find and a replace feature to simplify page editing.
+* '''Wikipedia logo:''' We have updated our logo. Read more at the [http://blog.wikimedia.org/2010/05/13/wikipedi... Wikimedia blog].
+
+===Feedback?===
+We would love to hear from you. Please visit our [[$1|feedback page]] or, if you are interested in our ongoing efforts to improve the software, visit our [http://usability.wikimedia.org usability wiki] for more information.",
+	'prefswitch-main-anon' => "===Take me back===
+[$1 Click here to turn off the new features]. You will be asked to login or create an account first.",
+	'prefswitch-main-on' => "===Take me back!===
+[$2 Click here to turn off the new features].",
 	'prefswitch-main-off' => "===Try them out!===
-If you would like to turn on the new features, please <span class=\"plainlinks\">[$1 click here]</span>.",
+[$1 Click here to enable the new features].",
 	'prefswitch-survey-intro-feedback' => 'We would love to hear from you.
 Please fill out the optional survey below before clicking "[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]".',
 	'prefswitch-survey-intro-off' => 'Thanks for trying out our new features.
 To help us improve them, please fill out the optional survey below before clicking "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]".',
+	'prefswitch-feedbackpage' => 'Wikipedia:User experience feedback',
 ); /** Message documentation (Message documentation)
@@ -99,8 +119,10 @@
  * @author Hamilton Abreu
  * @author Lloffiwr
  * @author McDutchie
+ * @author Umherirrender
  */
 $messages['qqq'] = array(
+	'prefswitch-desc' => '{{desc}}',
 	'prefswitch-survey-true' => 'Used in a form where it is a radio button label from the PrefSwitch questionnaire module to answer Yes or No to a question ([http://commons.wikimedia.org/w/index.php?titl... example]). It is not in used at the referred page, as of 16 May 2010.
@@ -115,11 +137,75 @@
 	'prefswitch-survey-answer-whyoff-hard' => 'Should be generic enough to be used as an option for questions:
 *{{msg-mw|Optin-survey-question-whyoptout}}
 *{{msg-mw|Prefswitch-survey-question-whyoff}}.',
-	'prefswitch-survey-answer-whyoff-didntwork' => '{{MediaWiki:Prefswitch-survey-answer-whyoff-hard/qqq}}',
-	'prefswitch-survey-answer-whyoff-notpredictable' => '{{MediaWiki:Prefswitch-survey-answer-whyoff-hard/qqq}}',
 	'prefswitch-survey-answer-whyoff-other' => '{{Identical|Other reason}}',
+	'prefswitch-feedbackpage' => 'The name of the user experience feedback page on this wiki. Should only be translated for ja, es, de, fr, it, ru, pl, pt, nl for now.',
 );+/** Afrikaans (Afrikaans)
+ * @author Naudefj
+ */
+$messages['af'] = array(
+	'prefswitch-survey-true' => 'Ja',
+	'prefswitch-survey-false' => 'Nee',
+	'prefswitch-survey-answer-whyoff-other' => '',
+);
+
+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'prefswitch' => 'Përdorshmërisë kaloni Nisma preferencë',
+	'prefswitch-desc' => 'Lejo përdoruesit të kaloni grupe të preferencave',
+	'prefswitch-survey-true' => 'Po',
+	'prefswitch-survey-false' => 'Jo',
+	'prefswitch-survey-submit-off' => 'Turn off karakteristika të reja',
+	'prefswitch-survey-cancel-off' => 'Nëse dëshironi të vazhdoni përdorimin e tipare të reja, ju mund të ktheheni tek $1.',
+	'prefswitch-survey-submit-feedback' => 'Send feedback',
+	'prefswitch-survey-cancel-feedback' => 'Nëse ju nuk dëshironi të japin mendimet, ju mund të ktheheni tek $1.',
+	'prefswitch-survey-question-like' => 'Çfarë ju pëlqen në lidhje me tipare të reja?',
+	'prefswitch-survey-question-dislike' => 'Çfarë keni antipati për tiparet?',
+	'prefswitch-survey-question-whyoff' => 'Pse jeni kthyer tek pjesa e tipare të reja? Ju lutemi zgjidhni të gjitha që aplikohet.',
+	'prefswitch-survey-answer-whyoff-hard' => "Karakteristika ishin tepër të vështirë për t'u përdorur.",
+	'prefswitch-survey-answer-whyoff-didntwork' => 'Karakteristika nuk funksionojnë siç duhet.',
+	'prefswitch-survey-answer-whyoff-notpredictable' => 'Karakteristika nuk ka kryer parashikueshme.',
+	'prefswitch-survey-answer-whyoff-didntlike-look' => 'Unë nuk e pëlqen mënyra tiparet e shikuar.',
+	'prefswitch-survey-answer-whyoff-didntlike-layout' => 'Unë nuk e kam si skedat e reja dhe layout.',
+	'prefswitch-survey-answer-whyoff-didntlike-toolbar' => 'Unë nuk e kam si toolbar re.',
+	'prefswitch-survey-answer-whyoff-other' => 'arsye të tjera:',
+	'prefswitch-survey-question-browser' => 'Cili browser do you use?',
+	'prefswitch-survey-answer-browser-other' => 'browser tjera:',
+	'prefswitch-survey-question-os' => 'Cili sistem operativ do you use?',
+	'prefswitch-survey-answer-os-other' => 'sistemit të tjera operative:',
+	'prefswitch-survey-question-res' => 'Cila është zgjidhja e ekranit tuaj?',
+	'prefswitch-title-on' => 'Tipare të reja',
+	'prefswitch-title-switched-on' => 'Enjoy!',
+	'prefswitch-title-off' => 'Turn off karakteristika të reja',
+	'prefswitch-title-switched-off' => 'Falënderim',
+	'prefswitch-title-feedback' => 'Reagim',
+	'prefswitch-success-on' => 'Tipare të reja janë kthyer tani në. Ne shpresojmë që të gëzojnë duke përdorur tipare të reja. Ju mund gjithmonë të kthehet prapa atyre jashtë duke klikuar mbi "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]" në krye të faqes.',
+	'prefswitch-success-off' => 'Tipare të reja janë kthyer tani off. Faleminderit për përpjekjen tipare të reja. Ju mund gjithmonë të kthehet përsëri në ato duke klikuar mbi "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]" në krye të faqes.',
+	'prefswitch-success-feedback' => 'Your feedback është dërguar.',
+	'prefswitch-return' => '<hr style="clear:both"> Kthehuni tek <span class="plainlinks">[$1 $2].</span>',
+	'prefswitch-main' => "Ne kemi punuar shumë për të bërë gjërat më të lehtë për përdoruesit tanë. Ne jemi të ngazëllyer për të ndarë disa përmirësime, duke përfshirë një vështrim të ri dhe të ndjehen dhe të thjeshtuar karakteristika redaktimi. Përmirësimi i përdorshmërisë e projekteve tona është një përparësi e Fondacionit Wikimedia dhe ne do të jetë ndarja rejat më shumë në të ardhmen. Për më shumë detaje, vizitoni lidhur [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedia blog] post.[[File:UsabilityNavigation.png|right|link=|Screenshot i navigacion ri]][[File:UsabilityToolbar.png|right|link=|pamjen e zgjeruar toolbar redakto]][[File:UsabilityDialogs.png|right|link=|pamjen e përmbajtjes dialogs brezi i ri]]=== Ja se çfarë ne kemi ndryshuar ==='''Navigation''': Ne kemi përmirësuar navigacion për lexim dhe të redaktoni. Tani, në skedat në krye të secilës faqe më të përcaktojë qartë nëse ju jeni duke shfletuar faqe apo faqe diskutimi, dhe nëse ju jeni duke lexuar ose redaktoni një faqe.*'''Redaktimi përmirësime toolbar''': Ne kemi riorganizuar toolbar editing për të bërë më të lehtë për t'u përdorur. Tani, formatimit faqe është e thjeshtë dhe më i kuptueshëm.",
+	'prefswitch-main-anon' => '=== Merrni Me Kthehu ===
+Nëse dëshironi të fikur tipare të reja, <span class="plainlinks">[$1 klikoni këtu]</span>. Ju do të pyeteni për të identifikoheni ose krijoni një llogari të parë.',
+	'prefswitch-main-on' => '=== Feedback? ===
+Ne do të duan të dëgjojmë nga ju. Ju lutem vizitoni tonë <span class="plainlinks">[$1 faqe reagime]</span>.=== Çoni përsëri! ===
+Nëse dëshironi të fikur tipare të reja, ju lutem <span class="plainlinks">[$2 klikoni këtu].</span>',
+	'prefswitch-main-off' => '=== Provo ato! ===
+Nëse ju dëshironi të kthehet në tipare të reja, ju lutem <span class="plainlinks">[$1 klikoni këtu]</span>.',
+	'prefswitch-survey-intro-feedback' => 'Ne do të duan të dëgjojmë nga ju. Ju lutem plotësoni këtë anketë opsional më poshtë para se të klikoni "[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]".',
+	'prefswitch-survey-intro-off' => 'Faleminderit për përpjekje të reja nga karakteristikat tona. Për të na ndihmuar në përmirësimin e tyre, ju lutemi plotësoni këtë anketë opsional më poshtë para se të klikoni "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]".',
+);
+
+/** Aragonese (Aragonés)
+ * @author Juanpabl
+ */
+$messages['an'] = array(
+	'prefswitch-survey-true' => 'Sí',
+	'prefswitch-survey-false' => 'No',
+);
+
 /** Arabic (العربية)
  * @author Meno25
  * @author OsamaK
@@ -247,13 +333,18 @@
 ); /** Bulgarian (Български)
+ * @author DCLXVI
  * @author Spiritia
  * @author Stanqo
  */
 $messages['bg'] = array(
 	'prefswitch-survey-true' => 'Да',
 	'prefswitch-survey-false' => 'Не',
+	'prefswitch-survey-answer-whyoff-other' => 'Друга причина:',
 	'prefswitch-survey-question-browser' => 'Кой браузър използвате?',
+	'prefswitch-survey-answer-browser-other' => 'Друг браузър:',
+	'prefswitch-survey-question-os' => 'Каква операционна система използвате?',
+	'prefswitch-survey-answer-os-other' => 'Друга операционна система:',
 	'prefswitch-title-on' => 'Нови функции',
 	'prefswitch-title-switched-on' => 'Наслаждавайте се!',
 	'prefswitch-title-switched-off' => 'Благодаря',
@@ -283,7 +374,7 @@
 	'prefswitch-survey-question-os' => 'আপনি কোন অপারেটিং সিস্টেম ব্যবহার করেন?',
 	'prefswitch-survey-answer-os-other' => 'অন্য অপারেটিং সিস্টেম:',
 	'prefswitch-survey-question-res' => 'আপনার পর্দার রেজ্যুলেশন কত?',
-	'prefswitch-title-on' => 'নতুন কি আছে?',
+	'prefswitch-title-on' => 'নতুন বৈশিষ্ট্যাবলী',
 	'prefswitch-title-switched-on' => 'উপভোগ করুন!',
 	'prefswitch-title-off' => 'নতুন বৈশিষ্ট্যাবলী বন্ধ করো',
 	'prefswitch-title-switched-off' => 'ধন্যবাদ',
@@ -302,7 +393,7 @@
 	'prefswitch-main-off' => '===সেগুলো ব্যবহার করুন!===
 আপনি যদি নতুন বৈশিষ্ট্যাবলী চালু করতে চান, অনুগ্রহ করে <span class="plainlinks">[$1 এখানে ক্লিক করুন]</span>।',
 	'prefswitch-survey-intro-feedback' => 'আমরা আপনার কাছ থেকে জানতে চাই।
-অনুগ্রহ করে নিচের ঐচ্ছিক জরিপ ফরমটি পূরণ করুন।',
+"[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]" ক্লিক করার আগে অনুগ্রহ করে নিচের ঐচ্ছিক জরিপ ফরমটি পূরণ করুন।',
 ); /** Breton (Brezhoneg)
@@ -506,9 +597,9 @@
 	'prefswitch-survey-cancel-feedback' => 'Os nad ydych am anfon adborth atom, gallwch ddychwelyd i $1.',
 	'prefswitch-survey-question-whyoff' => "Pam ydych chi'n diffodd y nodweddion newydd?
 Dewiswch yr holl resymau dros gwneud.",
-	'prefswitch-survey-answer-whyoff-hard' => "Yr oedd yn rhy anodd i'w ddefnyddio.",
-	'prefswitch-survey-answer-whyoff-didntwork' => "Nid oedd yn gweithio'n iawn.",
-	'prefswitch-survey-answer-whyoff-notpredictable' => "Roedd yn gweithredu'n fympwyol.",
+	'prefswitch-survey-answer-whyoff-hard' => "Roedd y nodweddion yn rhy anodd i'w defnyddio.",
+	'prefswitch-survey-answer-whyoff-didntwork' => "Nid oedd y nodweddion yn gweithio'n iawn.",
+	'prefswitch-survey-answer-whyoff-notpredictable' => "Roedd y nodweddion yn gweithredu'n fympwyol.",
 	'prefswitch-survey-answer-whyoff-didntlike-look' => "Doeddwn i ddim yn hoffi'r golwg newydd.",
 	'prefswitch-survey-answer-whyoff-didntlike-layout' => "Doeddwn i ddim yn hoffi'r tabiau a'r gosodiad newydd.",
 	'prefswitch-survey-answer-whyoff-didntlike-toolbar' => "Doeddwn i ddim yn hoffi'r bar offer newydd.",
@@ -593,7 +684,7 @@
 	'prefswitch-success-feedback' => 'Dein Feedback wurde versandt.',
 	'prefswitch-return' => '<hr style="clear:both">
 Zurück zu <span class="plainlinks">[$1 $2]</span>.',
-	'prefswitch-main' => "Wir haben hart gearbeitet, um die Arbeit für unsere Benutzer einfacher zu machen. Wir freuen uns sehr, dass wir nun einige Neuheiten präsentieren können, darunter ein neues Aussehen und vereinfachte Bearbeitungs-Möglichkeiten. Die Verbesserung der Bedienbarkeit unserer Projekte hat Priorität für die Wikimedia Foundation und wir werden auch in Zukunft weitere Neuheiten vorstellen. Für weitere Informationen, siehe den [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedia-Blog]-Eintrag. 
+	'prefswitch-main' => "Wir haben schwer daran gearbeitet, um die Arbeit für unsere Benutzer einfacher zu machen. Wir freuen uns sehr, dass wir nun einige Neuheiten präsentieren können, darunter ein neues Aussehen und vereinfachte Bearbeitungs-Möglichkeiten. Die Verbesserung der Bedienbarkeit unserer Projekte hat Priorität für die Wikimedia Foundation und wir werden auch in Zukunft weitere Neuheiten vorstellen. Für weitere Informationen, siehe den [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedia-Blog]-Eintrag.  [[File:UsabilityNavigation.png|right|link=|Screenshot der neuen Navigation]]
 [[File:UsabilityToolbar.png|right|link=|Screenshot der erweiterten Werkzeugleiste]]
@@ -618,23 +709,49 @@
 Bitte fülle die freiwillige Umfrage aus, bevor du auf „[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]“ klickst.',
 	'prefswitch-survey-intro-off' => 'Danke für das Ausprobieren unserer neuen Features.
 Damit wir besser werden können, fülle bitte die freiwillige Umfrage aus, bevor du auf „[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]“ klickst.',
+	'prefswitch-feedbackpage' => 'Wikipedia:Usability-Initiative/Feedback',
 ); /** German (formal address) (Deutsch (Sie-Form))
+ * @author Kghbln
  * @author The Evil IP address
  */
 $messages['de-formal'] = array(
-	'prefswitch-main' => 'Wir haben hart gearbeitet, um die Arbeit für unsere Benutzer einfacher zu machen. Wir freuen uns sehr, dass wir nun einige Neuheiten präsentieren können, darunter ein neues Aussehen und vereinfachte Bearbeitungs-Möglichkeiten. Die Verbesserung der Bedienbarkeit unserer Projekte hat Priorität für die Wikimedia Foundation und wir werden auch in Zukunft weitere Neuheiten vorstellen.
+	'prefswitch-survey-cancel-off' => 'Wenn Sie die neuen Features weiter verwenden wollen, können Sie zu $1 zurückkehren.',
+	'prefswitch-survey-cancel-feedback' => 'Wenn Sie kein Feedback geben möchten, können Sie zu $1 zurückkehren.',
+	'prefswitch-survey-question-like' => 'Was gefiel Ihnen an den Features?',
+	'prefswitch-survey-question-dislike' => 'Was mochten Sie an den Features nicht?',
+	'prefswitch-survey-question-whyoff' => 'Warum schalten Sie die neuen Features ab?
+Bitte wählen Sie alle zutreffenden Punkte aus.',
+	'prefswitch-survey-question-browser' => 'Welchen Browser verwenden Sie?',
+	'prefswitch-survey-question-os' => 'Welches Betriebssystem verwenden Sie?',
+	'prefswitch-survey-question-res' => 'Was ist Ihre Bildschirmauflösung?',
+	'prefswitch-success-on' => 'Die neuen Funktionalitäten sind jetzt aktiv. Wir wünschen Ihnen viel Freude bei deren Verwendung. Sie können sie jederzeit deaktivieren, indem Sie auf den Link „[[Special:UsabilityInitiativePrefSwitch|Beta verlassen]]“ oben auf der Webseite klicken.',
+	'prefswitch-success-off' => 'Die neuen Funktionalitäten sind jetzt inaktiv. Vielen Dank, dass Sie sie verwendet haben. Sie können sie jederzeit aktivieren, indem Sie auf den Link „[[Special:UsabilityInitiativePrefSwitch|Beta aktivieren]]“ oben auf der Webseite klicken.',
+	'prefswitch-success-feedback' => 'Ihr Feedback wurde versandt.',
+	'prefswitch-main' => "Wir haben hart gearbeitet, um die Arbeit für unsere Benutzer einfacher zu machen. Wir freuen uns sehr, dass wir nun einige Neuheiten präsentieren können, darunter ein neues Aussehen und vereinfachte Bearbeitungs-Möglichkeiten. Die Verbesserung der Bedienbarkeit unserer Projekte hat Priorität für die Wikimedia Foundation und wir werden auch in Zukunft weitere Neuheiten vorstellen. Für weitere Informationen, siehe den [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedia-Blog]-Eintrag. [[File:UsabilityNavigation.png|right|link=|Screenshot der neuen Navigation]]
 [[File:UsabilityToolbar.png|right|link=|Screenshot der erweiterten Werkzeugleiste]]
 [[File:UsabilityDialogs.png|right|link=|Screenshot der neuen Dialoge]]
 ===Was sich geändert hat===
-* Navigation: Wir haben die Navigation zum Lesen und zur Bearbeitung der Seiten verbessert. Die Reiter am Kopf jeder Seite zeigen klarer, ob Sie eine Seite oder eine Diskussionsseite lesen und ob Sie eine Seite lesen oder bearbeiten.
-* Werkzeugleiste: Wir haben die Werkzeugleiste einfacher bedienbar gemacht. Die Formatierung von Seiten ist nun einfacher und intuitiver.
-* Link-Assistent: Ein einfach zu bedienender Dialog ermöglicht das Hinzufügen von Links sowohl zu anderen Wiki-Seiten als auch zu externen Seiten.
-* Suche: Wir haben die Suchvorschläge verbessert, damit Sie schneller zu der von Ihnen gesuchten Seite kommen.
-* Weiteres: Ein Tabellen-Assistent ermöglicht das einfache Erstellen von Tabellen und ein Suchen-und-Ersetzen-Dialog vereinfacht die Seitenbearbeitung.',
+* '''Navigation:''' Wir haben die Navigation zum Lesen und zur Bearbeitung der Seiten verbessert. Die Reiter am Kopf jeder Seite zeigen klarer, ob Sie eine Seite oder eine Diskussionsseite lesen und ob Sie eine Seite lesen oder bearbeiten.
+* '''Werkzeugleiste:''' Wir haben die Werkzeugleiste einfacher bedienbar gemacht. Die Formatierung von Seiten ist nun einfacher und intuitiver.
+* '''Link-Assistent:''' Ein einfach zu bedienender Dialog ermöglicht das Hinzufügen von Links sowohl zu anderen Wiki-Seiten als auch zu externen Seiten.
+* '''Suche:''' Wir haben die Suchvorschläge verbessert, damit Sie schneller zu der von Ihnen gesuchten Seite kommen.
+* '''Weiteres:''' Ein Tabellen-Assistent ermöglicht das einfache Erstellen von Tabellen und ein Suchen-und-Ersetzen-Dialog vereinfacht die Seitenbearbeitung.
+* '''Wikipedia-Puzzle-Globus''': wir haben den Puzzle-Globus erneuert, mehr Informationen im [http://blog.wikimedia.org/2010/05/13/wikipedi... Wikimedia-Blog.]",
+	'prefswitch-main-anon' => '===Zurück===
+Sofern Sie die neuen Funktionen deaktivieren möchten, dann <span class="plainlinks">[$1 klicken Sie hier]</span>. Sie werden dann gebeten sich anzumelden oder zunächst ein neues Benutzerkonto zu erstellen.',
+	'prefswitch-main-on' => '=== Feedback? ===
+Wir würden uns freuen, von Ihnen zu hören.
+Bitte besuchen Sie unsere <span class="plainlinks">[$1 Feedback-Seite]</span>.
+=== Bring mich zurück! ===
+Wenn Sie die neuen Features abschalten möchten, <span class="plainlinks">[$2 klicken Sie hier]</span>.',
+	'prefswitch-survey-intro-feedback' => 'Wir würden uns freuen, von Ihnen zu hören.
+Bitte füllen Sie die freiwillige Umfrage aus, bevor Sie auf „[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]“ klicken.',
+	'prefswitch-survey-intro-off' => 'Danke für das Ausprobieren unserer neuen Features.
+Damit wir besser werden können, füllen Sie bitte die freiwillige Umfrage aus, bevor Sie auf „[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]“ klicken.',
 ); /** Lower Sorbian (Dolnoserbski)
@@ -675,17 +792,18 @@
 	'prefswitch-success-feedback' => 'Twójo měnjenje jo se pósłało.',
 	'prefswitch-return' => '<hr style="clear:both">
 Slědk k <span class="plainlinks">[$1 $2]</span>.',
-	'prefswitch-main' => "Źěłamy śežko, aby my wólažcyli wěcy za swójich wužywarjow. My by se wjaselili, se wó pólěpšenjach wuměniś, inkluziwnje nowy naglěd a zjadnorjone wobźěłowańske funkcije. Pólěpšenje wužywajobnosći našych projektow jo priorita załožby Wikimedia foundation a rozdźělijomy wěcej aktualizacijow w pśichoźe.
+	'prefswitch-main' => "Źěłamy śežko, aby my wólažcyli wěcy za swójich wužywarjow. My by se wjaselili, se wó pólěpšenjach wuměniś, inkluziwnje nowy naglěd a zjadnorjone wobźěłowańske funkcije. Pólěpšenje wužywajobnosći našych projektow jo priorita załožby Wikimedia foundation a rozdźělijomy wěcej aktualizacijow w pśichoźe. Za dalšne informacije, woglědaj se wótpowědny [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedia blogowy zapisk]. [[File:UsabilityNavigation.png|right|link=|Wobrazowkowe foto noweje nawigacije]]
 [[File:UsabilityToolbar.png|right|link=|Wobrazowkowe foto pólěpšoneje wobźěłowańskeje lejstwy]]
 [[File:UsabilityDialogs.png|right|link=|Wobrazowkowe foto nowych dialogow napóranja wopśimjeśa]]
 ===Tole smy změnili===
-* '''Nawigacija:''' Smy pólěpšyli nawigaciju za cytanje a wobźěłowanje bokow.´Něnto ejtarki górjejce na boku mógu jasnjej definěrowaś, lěc woglědujoš se nastawk abo diskusijny bok, a lěc cytaš abo wobźěłujoš bok.
-* '''Pólěpšenja wobźěkowańskeje lejstwy:''' Smy spóznali, až musymy wužywanje wólažcyś. Něnto jo formatěrowanje bokow lažčejše a intuitiwnjejše.
-* '''Wótkazowy asistent:''' Rěd, kótaryž dajo se wužywaś a śi dowólujo, wótkaze drugim wikibokam ako teke wótkaze eksternym sedłam pśidaś.
-* '''Pytańske pólěpšenja:''' Smy pytańske naraźenja pólěpšyli, aby my śi wjadli malsnjej k tomu bokoju, kótaryž pytaš.
-* '''Druge nowe funkcije:''' Smy teke zawjadli tabelowy asistent, aby my wólažcyli napóranje tabelow a funkciju za pytanje a wuměnjenje, aby my zjadnorili wobźěłowanje bokow.",
+* '''Nawigacija''': Smy pólěpšyli nawigaciju za cytanje a wobźěłowanje bokow. Něnto rejtarki górjejce na boku mógu jasnjej definěrowaś, lěc woglědujoš se nastawk abo diskusijny bok, a lěc cytaš abo wobźěłujoš bok.
+* '''Pólěpšenja wobźěłowańskeje lejstwy''': Smy pśeorganizowali wobźěłowańsku lejstwu, aby wužywanje wólažcyli. Něnto jo formatěrowanje bokow lažčejše a intuitiwnjejše.
+* '''Wótkazowy asistent''': Rěd, kótaryž dajo se lažko wužywaś a śi dowólujo, wótkaze drugim wikibokam ako teke wótkaze eksternym sedłam pśidaś.
+* '''Pytańske pólěpšenja''' Smy pytańske naraźenja pólěpšyli, aby śi wjadli malsnjej k tomu bokoju, kótaryž pytaš.
+* '''Druge nowe funkcije''': Smy teke zawjadli tabelowy asistent, aby wólažcyli napóranje tabelow a funkciju za pytanje a narownanje, aby my zjadnorili wobźěłowanje bokow.
+* '''Wikipedia puzzle globe''': My smy puzzlowy globus aktualizěrowali. Cytaj wěcej wó tom na [http://blog.wikimedia.org/2010/05/13/wikipedi...  blogu Wikimedije].",
 	'prefswitch-main-anon' => '===Slědk===
 Jolic coš nowe funkcije znjemóžnis, <span class="plainlinks">[$1 klikni how]</span>.  Pšose śi se pśizjawiś abo nejpjerwjej konto załožyś.',
 	'prefswitch-main-on' => '===Rezonanca?===
@@ -713,6 +831,8 @@
 	'prefswitch-survey-cancel-off' => 'Αν θέλετε να συνεχίσετε να χρησιμοποιείτε τις καινούριες λειτουργίες, μπορείτε να επιστρέψετε στο $1.',
 	'prefswitch-survey-submit-feedback' => 'Αποστολή σχολίων',
 	'prefswitch-survey-cancel-feedback' => 'Αν δεν θέλετε να δώσετε σχόλια, μπορείτε να επιστρέψετε στο $1.',
+	'prefswitch-survey-question-like' => 'Τι σας άρεσε στις καινούριες λειτουργίες;',
+	'prefswitch-survey-question-dislike' => 'Τι δεν σας άρεσε στις λειτουργίες;',
 	'prefswitch-survey-question-whyoff' => 'Γιατί απενεργοποιείτε τις καινούριες λειτουργίες; Επιλέξτε όλα όσα ισχύουν.',
 	'prefswitch-survey-answer-whyoff-hard' => 'Ήταν πολύ δύσχρηστες.',
 	'prefswitch-survey-answer-whyoff-didntwork' => 'Δεν λειτουργούσαν σωστά.',
@@ -726,13 +846,13 @@
 	'prefswitch-survey-question-os' => 'Ποιο λειτουργικό σύστημα χρησιμοποιείτε;',
 	'prefswitch-survey-answer-os-other' => 'Άλλο λειτουργικό σύστημα:',
 	'prefswitch-survey-question-res' => 'Ποια είναι η ανάλυση της οθόνης σας;',
-	'prefswitch-title-on' => 'Νέα',
+	'prefswitch-title-on' => 'Καινούριες λειτουργίες',
 	'prefswitch-title-switched-on' => 'Απολαύστε τες!',
 	'prefswitch-title-off' => 'Απενεργοποίηση των καινούριων λειτουργιών',
 	'prefswitch-title-switched-off' => 'Ευχαριστούμε',
 	'prefswitch-title-feedback' => 'Σχόλια',
-	'prefswitch-success-on' => 'Οι καινούριες λειτουργίες είναι τώρα ενεργοποιημένες.',
-	'prefswitch-success-off' => 'Οι καινούριες λειτουργίες απενεργοποιήθηκαν.',
+	'prefswitch-success-on' => 'Οι καινούριες λειτουργίες είναι τώρα ενεργοποιημένες. Ελπίζουμε ότι απολαμβάνετε τις καινούριες λειτουργίες.  Μπορείτε πάντα να τις απενεργοποιήσετε ξανά κάνοντας κλικ στο σύνδεσμο "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]" στην κορυφή της σελίδας.',
+	'prefswitch-success-off' => 'Οι καινούριες λειτουργίες απενεργοποιήθηκαν.  Ευχαριστούμε που δοκιμάσατε τις καινούριες λειτουργίες.  Μπορείτε πάντα να τις ενεργοποιήσετε ξανά κάνοντας κλικ στο σύνδεσμο "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]" στην κορυφή της σελίδας.',
 	'prefswitch-success-feedback' => 'Τα σχόλια σας αποστάλθηκαν.',
 	'prefswitch-return' => '<hr style="clear:both">
 Επιστροφή στο <span class="plainlinks">[$1 $2]</span>.',
@@ -747,6 +867,8 @@
 * '''Οδηγός για συνδέσμους:'''  Ένα εύχρηστο εργαλείο που σας επιτρέπει να προσθέσετε συνδέσμους προς άλλες σελίδες της Βικιπαίδειας καθώς και προς εξωτερικούς ιστότοπους.
 * '''Βελτιώσεις στην αναζήτηση:''' Έχουμε βελτιώσει τις συμβουλές αναζήτησης, ώστε  να οδηγηθείτε στη σελίδα που ψάχνετε πιο γρήγορα. 
 * '''Άλλες καινούργιες λειτουργίες:'''  Επιπλέον έχουμε εισαγάγει έναν οδηγό που διευκολύνει τη δημιουργία πινάκων, και μια λειτουργία για αναζήτηση-αντικατάσταση που απλοποιεί την επεξεργασία σελίδων.",
+	'prefswitch-main-anon' => '===Επιστροφή στις παλιά ρυθμίσεις===
+Αν θέλετε να απενεργοποιήσετε τις καινούριες λειτουργίες, <span class="plainlinks">[$1 πατήστε εδώ]</span>. Θα σας ζητηθεί πρώτα να συνδεθείτε ή να δημιουργήσετε λογαριασμό.',
 	'prefswitch-main-on' => '===Σχόλια;===
 Θα χαιρόμασταν να μάθουμε τη γνώμη σας.  Παρακαλούμε, επισκεφτείτε τη <span class="plainlinks">[$1 σελίδα σχολίων]</span> μας.
 ===Επιστροφή πίσω===
@@ -754,9 +876,9 @@
 	'prefswitch-main-off' => '===Δοκιμάστε τες!===
 Αν θέλετε να ενεργοποιήσετε τις καινούριες λειτουργίες, παρακαλούμε <span class="plainlinks">[$1 πατήστε εδώ]</span>.',
 	'prefswitch-survey-intro-feedback' => 'Θα χαιρόμασταν να μάθουμε τη γνώμη σας.
-Σας παρακαλούμε να συμπληρώσετε το παρακάτω προαιρετικό ερωτηματολόγιο.',
+Σας παρακαλούμε να συμπληρώσετε το παρακάτω προαιρετικό ερωτηματολόγιο πριν πατήσετε την «[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]».',
 	'prefswitch-survey-intro-off' => 'Ευχαριστούμε που δοκιμάσατε τις καινούριες μας λειτουργίες.
-Για να μας βοηθήσετε να τις βελτιώσουμε, σας παρακαλούμε να συμπληρώσετε το παρακάτω προαιρετικό ερωτηματολόγιο.',
+Για να μας βοηθήσετε να τις βελτιώσουμε, σας παρακαλούμε να συμπληρώσετε το παρακάτω προαιρετικό ερωτηματολόγιο πριν πατήσετε την «[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]».',
 ); /** Esperanto (Esperanto)
@@ -825,6 +947,7 @@
 /** Spanish (Español)
  * @author Crazymadlover
  * @author Locos epraix
+ * @author Muro de Aguas
  * @author Pertile
  * @author Translationista
  */
@@ -890,8 +1013,8 @@
 * '''Mejoras en la búsqueda:''' hemos mejorado las sugerencias para llegar más rápido a la página que se está buscando.
 * '''Otras nuevas características:''' también hemos introducido un asistente de tablas para hacer más sencilla la creación de tablas y una funcionalidad de buscar y reemplazar que simplifica la edición de páginas.
 * '''Globo rompecabezas de Wikipedia''': Hemos actualizado nuestro logo.Encontrarás más información al respecto en el [http://blog.wikimedia.org/2010/wikipedia-in-3...  blog Wikimedia en inglés].",
-	'prefswitch-main-anon' => '===Regresarme===
-Si deseas deshabilitar las nuevas características, <span class="plainlinks">[$1 hazclick aquí]</span>. Se te solicitará iniciar sesión o crear una cuenta primero.',
+	'prefswitch-main-anon' => '=== Volver a la versión anterior ===
+Si deseas deshabilitar las nuevas características, haz clic <span class="plainlinks">[$1 aquí]</span>. Necesitarás iniciar sesión o crear una cuenta primero.',
 	'prefswitch-main-on' => '===Retroalimentar?===
 Nos encantaría escucharte. Por favor visita nuestra <span class="plainlinks">[$1 página de retroalimentación]</span>.
 ===Llévenme de vuelta===
@@ -902,6 +1025,7 @@
 Por favor llene la encuesta opcional de abajo presionando "[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]".',
 	'prefswitch-survey-intro-off' => 'Gracias por probar nuestras nuevas características.
 Para ayudarnos a mejorarlas, por favor llene la encuesta de abajo presionando "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]".',
+	'prefswitch-feedbackpage' => 'Wikipedia:Feedback de experiencia de usuario',
 ); /** Estonian (Eesti)
@@ -952,8 +1076,10 @@ /** Finnish (Suomi)
  * @author Crt
+ * @author Str4nd
  */
 $messages['fi'] = array(
+	'prefswitch' => 'Käytettävyyshankkeen asetusvalinta',
 	'prefswitch-desc' => 'Mahdollistaa käyttäjille asetussarjan vaihtamisen.',
 	'prefswitch-survey-true' => 'Kyllä',
 	'prefswitch-survey-false' => 'Ei',
@@ -982,11 +1108,23 @@
 	'prefswitch-title-off' => 'Poista käytöstä uudet omaisuudet',
 	'prefswitch-title-switched-off' => 'Kiitos',
 	'prefswitch-title-feedback' => 'Palaute',
-	'prefswitch-success-on' => 'Uudet ominaisuudet ovat nyt käytössä.',
-	'prefswitch-success-off' => 'Uudet ominaisuudet ovat nyt poistettu käytöstä.',
+	'prefswitch-success-on' => 'Uudet ominaisuudet ovat nyt käytössä. Toivomme, että nautit uusien ominaisuuksien käytöstä. Voit aina ottaa ne pois käytöstä napsauttamalla ”[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]” -linkkiä sivun yläreunasta.',
+	'prefswitch-success-off' => 'Uudet ominaisuudet ovat nyt poistettu käytöstä. Kiitos uusien ominaisuuksien kokeilusta. Voit aina ottaa ne takaisin käyttöön napsauttamalla ”[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]” -linkkiä sivun yläreunasta.',
 	'prefswitch-success-feedback' => 'Palautteesi on lähetetty.',
 	'prefswitch-return' => '<hr style="clear:both">
 Palaa sivulle <span class="plainlinks">[$1 $2]</span>.',
+	'prefswitch-main' => "Olemme tehneet kovasti töitä saadaksemme asioita helpommaksi käyttäjillemme. Olemme jakaneet joitain parannuksia, kuten uuden ilmeen ja yksinkertaistetut muokkaustoiminnot. Käytettävyyden parantaminen hankkeissamme on etusijalla Wikimedia Foundationissa ja tulemme jakamaan lisää päivityksiä tulevaisuudessa. Lisätietoja löytyy aiheeseen liittyvästä [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedian blogiviestistä].
+
+[[File:UsabilityNavigation.png|right|link=|Kuvakaappaus uudesta navigaatiosta]]
+[[File:UsabilityToolbar.png|right|link=|Kuvakaappaus parannetusta muokkauspalkista]]
+[[File:UsabilityDialogs.png|right|link=|Kuvakaappaus uudesta sisällöntuoton valintaikkunasta]]
+==Mitä olemme muuttaneet==
+* '''Navigaatio''': Paransimme navigaatiota sivujen lukemiseksi ja muokkaamiseksi. Nyt jokaisen sivun yläreunassa olevat välilehdet ovat selvempiä
+* '''Muokkauspalkin parannukset''':  Olemme järjestäneet muokkauspalkin uudelleen, jotta sitä olisi helpompi käyttää. Nyt sivujen muotoilu on yksinkertaisempaa ja havainnollisempaa.
+* '''Ohjattu linkkitoiminto''':  Helppokäyttöinen työkalu antaa sinun lisätä linkkejä sekä muille wikisivuille että ulkoisille sivustoille.
+* '''Hakuparannukset''': Olemme parantaneet hakuehdotuksia, jotta löytäisit etsimäsi sivun nopeammin.
+* '''Muut uudet toiminnot''':  Olemme myös tuoneet esiin ohjatun taulukonlisäystoiminnon taulukoiden helpompaan lisäämiseen ja etsi ja korvaa -toiminnon yksinkertaisempaan muokkaamiseen.
+* '''Wikipedia-palapelimaapallo''': Olemme päivittäneet palapelimaapalloa. Lue lisää [http://blog.wikimedia.org/2010/05/13/wikipedi... Wikimedian blogista].",
 	'prefswitch-main-anon' => '=== Palaa takaisin ===
 Jos haluat poistaa käytöstä uudet ominaisuudet – <span class="plainlinks">[$1 napsauta tästä]</span>. Sinua pyydetään ensin kirjautumaan sisään tai luomaan tunnus.',
 	'prefswitch-main-on' => '=== Palautetta? ===
@@ -1005,6 +1143,7 @@
  * @author Coyau
  * @author IAlex
  * @author Jean-Frédéric
+ * @author Kropotkine 113
  */
 $messages['fr'] = array(
 	'prefswitch' => "Commutateur de préférences de l'initiative d'utilisabilité",
@@ -1041,17 +1180,17 @@
 	'prefswitch-success-feedback' => 'Vos commentaires ont été envoyés.',
 	'prefswitch-return' => '<hr style="clear:both">
 Revenir à <span class="plainlinks">[$1 $2]</span>.',
-	'prefswitch-main' => "Nous avons travaillé dur pour rendre les choses plus facile pour nos utilisateurs. Nous sommes heureux de partager quelques améliorations, notamment un nouveau look et la simplification des fonctions d'édition. Améliorer la convivialité de nos projets est une priorité de la Fondation Wikimedia et nous partagerons plus de mises à jour dans le futur. Pour plus de détails, lisez le post du [http://blog.wikimedia.org/2010/05/13/a-new-lo... blog de Wikimedia] consacré à ces améliorations.
+	'prefswitch-main' => "Nous avons travaillé dur pour rendre les choses plus faciles pour nos utilisateurs. Nous sommes heureux de partager quelques améliorations, notamment un nouveau look et la simplification des fonctions d'édition. Améliorer la convivialité de nos projets est une priorité de la Fondation Wikimedia et nous continuerons à le faire dans le futur. Pour plus de détails, lisez le post du [http://blog.wikimedia.org/2010/05/13/a-new-lo... blog de Wikimedia] consacré à ces améliorations. [[File:UsabilityNavigation.png|right|link=|Capture d'écran de la nouvelle navigation]]
 [[File:UsabilityToolbar.png|right|link=|Capture d'écran de la barre d'outils d'édition améliorée]]
 [[File:UsabilityDialogs.png|right|link=|Capture d'écran du contenu des boîtes de dialogue de nouvelle génération]]
 === Voici ce que nous avons changé ===
-* '''Navigation :''' Nous avons amélioré la navigation pour la lecture et la modification des pages. Maintenant, les onglets en haut de chaque page définissent plus clairement si vous voyez la page ou la page de discussion, et si vous lisez ou modifiez une page.
-* '''Améliorations de la barre d'outils d'édition :''' Nous avons réorganisé la barre d'outils d'édition pour la rendre plus facile à utiliser. Maintenant, la mise en page est plus simple et plus intuitive.
-* '''Assistant de liens :''' Un outil simple pour vous permettre d'ajouter des liens vers d'autres pages de Wikipédia ainsi que des liens vers des sites externes.
-* '''Amélioration de la recherche :''' Nous avons amélioré les suggestions de recherche pour vous aider à trouvez la page que vous recherchez plus rapidement.
-* '''Autres nouvelles fonctionnalités :''' Nous avons également introduit un assistant de tableaux pour créer des tableaux plus facilement et une fonctionnalité de remplacement pour simplifier la modification de page.
+* '''Navigation :''' nous avons amélioré la navigation pour la lecture et la modification des pages. Maintenant, les onglets en haut de chaque page définissent plus clairement si vous voyez la page ou la page de discussion, et si vous lisez ou modifiez une page.
+* '''Améliorations de la barre d'outils d'édition :''' nous avons réorganisé la barre d'outils d'édition pour la rendre plus facile à utiliser. Maintenant, la mise en page est plus simple et plus intuitive.
+* '''Assistant de liens :''' un outil simple pour vous permettre d'ajouter des liens vers d'autres pages de Wikipédia ainsi que des liens vers des sites externes.
+* '''Amélioration de la recherche :''' nous avons amélioré les suggestions de recherche pour vous aider à trouver la page que vous recherchez plus rapidement.
+* '''Autres nouvelles fonctionnalités :''' nous avons également introduit un assistant de tableaux pour créer des tableaux plus facilement et une fonctionnalité de remplacement pour simplifier la modification de page.
 * '''Globe en puzzle de Wikipédia''': nous avons mis à jour le globe en puzzle, lisez-en plus sur le [http://blog.wikimedia.org/2010/05/13/wikipedi... blog de Wikimedia].",
 	'prefswitch-main-anon' => '===Take Me Back===
 Si vous souhaitez désactiver les nouvelles fonctionnalités, <span class="plainlinks">[$1 cliquez ici]</span>.  Il vous sera demandé de vous connecter ou de vous créer un compte.',
@@ -1065,6 +1204,7 @@
 Si vous le désirez, vous pouvez remplir le sondage ci-dessous avant de cliquer sur « [[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]] ».',
 	'prefswitch-survey-intro-off' => "Merci d'avoir essayé nos nouvelles fonctionnalités.
 Pour nous aider à les améliorer, vous pouvez remplir le sondage optionnel ci-dessous avant de cliquer sur « [[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]] ».",
+	'prefswitch-feedbackpage' => "Wikipédia:Retours d'expérience sur l'utilisabilité",
 ); /** Galician (Galego)
@@ -1081,6 +1221,8 @@
 	'prefswitch-survey-cancel-feedback' => 'Se non quere dar a súa opinión, pode volver a "$1".',
 	'prefswitch-survey-question-like' => 'Que é o que lle gustou das novas características?',
 	'prefswitch-survey-question-dislike' => 'Que é o que non lle gustou das novas características?',
+	'prefswitch-survey-question-like' => 'Que é o que lle gustou das novas características?',
+	'prefswitch-survey-question-dislike' => 'Que é o que non lle gustou das novas características?',
 	'prefswitch-survey-question-whyoff' => 'Por que está a desactivar as novas características?
 Por favor, seleccione o que sexa conveniente.',
 	'prefswitch-survey-answer-whyoff-hard' => 'Foi moi difícil de usar.',
@@ -1104,7 +1246,7 @@
 	'prefswitch-success-off' => 'As novas características están agora desactivadas. Grazas por probalas. Pode activalas de novo premendo sobre a ligazón "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]" que aparecerá no canto superior de calquera páxina.',
 	'prefswitch-success-feedback' => 'Enviouse a súa opinión.',
 	'prefswitch-return' => '<hr style="clear:both">
-Voltar a "<span class="plainlinks">[$1 $2]</span>".',
+Volver a "<span class="plainlinks">[$1 $2]</span>".',
 	'prefswitch-main' => "Traballamos arreo para facerlles as cousas máis doadas aos nosos usuarios. Estamos encantados de compartir algunhas melloras, incluíndo entre elas unha nova aparencia e características de edición simplificadas. A mellora da usabilidade dos nosos proxectos é unha prioridade para a Fundación Wikimedia e traeremos máis actualizacións no futuro. Para obter máis información, visite [http://blog.wikimedia.org/2010/05/13/a-new-lo... esta entrada] do blogue da Wikimedia. [[File:UsabilityNavigation.png|right|link=|Captura de pantalla da nova navegación.]]
@@ -1143,6 +1285,8 @@
 	'prefswitch-survey-cancel-off' => 'Wänn di neje Funktione wyter bruche witt, chasch zu $1 zruckgoh.',
 	'prefswitch-survey-submit-feedback' => 'Ruckmäldig gee',
 	'prefswitch-survey-cancel-feedback' => 'Wänn kei Ruckmäldig witt gee, chasch zue $1 zruckgoh.',
+	'prefswitch-survey-question-like' => 'Was het Dir an dr neje Funktione gfalle?',
+	'prefswitch-survey-question-dislike' => 'Was het Dir an dr neje Funktione nit gfalle?',
 	'prefswitch-survey-question-whyoff' => 'Wurum schaltsch di neje Funktione ab?
 Bitte wehl alli Pinkt, wu zuedräffe uus.',
 	'prefswitch-survey-answer-whyoff-hard' => 'D Verwändig isch z schwirig gsi.',
@@ -1157,18 +1301,19 @@
 	'prefswitch-survey-question-os' => 'Wel Betribssyschtem bruchsch Du?',
 	'prefswitch-survey-answer-os-other' => 'Anders Betribssyschtem:',
 	'prefswitch-survey-question-res' => 'Was fir e Uflesig het Dyy Bildschirm?',
-	'prefswitch-title-on' => 'Was isch nej?',
+	'prefswitch-title-on' => 'Neji Funktione',
 	'prefswitch-title-switched-on' => 'Vil Spaß!',
 	'prefswitch-title-off' => 'Neji Funktione abschalte',
 	'prefswitch-title-switched-off' => 'Dankschen',
 	'prefswitch-title-feedback' => 'Ruckmäldig',
-	'prefswitch-success-on' => 'Di neje Funktione sin jetz yygschalte.',
-	'prefswitch-success-off' => 'Di neje Funktione sin jetz abgschalte.',
+	'prefswitch-success-on' => 'Di neje Funktione sin jetz yygschalte. Mir winsche Dir vil Freid dermit. Du chasch si jederzyt abschalte dur e Klick uf s Gleich „[[Special:UsabilityInitiativePrefSwitch|Beta verloo]]“ obe uf dr Websyte.',
+	'prefswitch-success-off' => 'Di neje Funktione sin jetz abgschalte. Dankschen fir s Uusbrobiere. Du chasch si jederzyt wider aaschalte dur e Klick uf s Gleich „[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]“ obe uf dr Websyte.',
 	'prefswitch-success-feedback' => 'Dyy Ruckmäldig isch gschickt wore.',
 	'prefswitch-return' => '<hr style="clear:both">
 Zruck zue <span class="plainlinks">[$1 $2]</span>.',
-	'prefswitch-main' => "Mi hän zimli dra gschafft, d Sache fir unsri Benutzer eifacher z mache. Mir freien is, ass mir e baar Verbesserige chenne aabiete, derzue e nej Uussäh un vereifachti Bearbeitigsfunktione. D Benutzerfrejndligkeit verbessere het Prioritet bi dr Wikimedia Foundation un mir stelle in dr Zuechumpft meh Update z Verfiegig.
+	'prefswitch-main' => "Mi hän zimli dra gschafft, d Sache fir unsri Benutzer eifacher z mache. Mir freien is, ass mir e baar Verbesserige chenne aabiete, derzue e nej Uussäh un vereifachti Bearbeitigsfunktione. D Benutzerfrejndligkeit verbessere het Prioritet bi dr Wikimedia Foundation un mir stelle in dr Zuechumpft meh Update z Verfiegig. Fir meh Informatione, kueg dr [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedia-Blog]-Yytrag. +
 [[File:UsabilityNavigation.png|right|link=|Screenshot vu dr neje Navigation]]
 [[File:UsabilityToolbar.png|right|link=|Screenshot vum verbesserete Wärchzyygchäschtli]]
 [[File:UsabilityDialogs.png|right|link=|Screenshot vu dr neje Inhaltsbearbeitigsdialog]]
@@ -1177,7 +1322,8 @@
 * '''Verbesserige vum Wärchzyygchäschtli:''' Mir hän s Wärchzyygchäschtli umorganisiert, ass es cha eifacher brucht wäre. Jetz isch s Formatiere eifacher un intuitiver.
 * '''Gleichhilf:'''  E eifach Wärchzyyg, wu Dir s megli macht, Gleicher zue andere Wikipediasyte un zue extärne Syte.
 * '''Verbesserige vu dr Suechi:''' Mir hän d Suechvorschleg verbesseret, ass Du schnäller uf die Syte chunnsch, wu Du suechsch.
-* '''Anderi neji Funktione:'''  Mir hän au ne Tabällehilf yygfiert, wu s Aalege vu Tabälle eifacher macht, un e Hilf zum Sueche un Ersetze, wu s Bearbeite vu Syte eifacher macht.",
+* '''Anderi neji Funktione:'''  Mir hän au ne Tabällehilf yygfiert, wu s Aalege vu Tabälle eifacher macht, un e Hilf zum Sueche un Ersetze, wu s Bearbeite vu Syte eifacher macht.
+* '''Wikipedia-Puzzle-Wältchugle: wir hän d Puzzle-Wältchugle nej gmacht, meh Informatione im [http://blog.wikimedia.org/2010/05/13/wikipedi... Wikimedia-Blog.]",
 	'prefswitch-main-anon' => '===Zruck===
 Wänn Du di neje Funktione witt abschalte, no <span class="plainlinks">[$1 druck do]</span>. Du wirsch derno bätte Di aazmälde oder zerscht e nej Benutzerkonto aazlege.',
 	'prefswitch-main-on' => '=== Ruckmäldig? ===
@@ -1188,9 +1334,9 @@
 	'prefswitch-main-off' => '=== Probier s uus! ===
 Wänn Du di neje Funktione witt yyschalte, <span class="plainlinks">[$1 druck do]</span>.',
 	'prefswitch-survey-intro-feedback' => 'Mir deeten is freie, vu Dir z here.
-Bitte fill di frejwillig Umfrog uus.',
+Bitte fill di frejwillig Umfrog uus, voreb Du uf „[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]“ drucksch.',
 	'prefswitch-survey-intro-off' => 'Dankschen fir s Uusprobiere vu unsre neje Funktione.
-Ass mir no besser chenne wäre, fill bitte di frejwillig Umfrog uus.',
+Ass mir no besser chenne wäre, fill bitte di frejwillig Umfrog uus, voreb Du uf „[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]“ drucksch.',
 ); /** Hebrew (עברית)
@@ -1210,7 +1356,7 @@
 	'prefswitch-survey-question-dislike' => 'מה לא אהבתם בתכונות החדשות?',
 	'prefswitch-survey-question-whyoff' => 'למה אתם עוזבים את הגרסה החדשה?
 אנא בחרו את כל האפשרויות המתאימות.',
-	'prefswitch-survey-answer-whyoff-hard' => 'היא הייתה קשה מדי לשימוש',
+	'prefswitch-survey-answer-whyoff-hard' => 'היא הייתה קשה מדי לשימוש.',
 	'prefswitch-survey-answer-whyoff-didntwork' => 'היא לא פעלה כראוי.',
 	'prefswitch-survey-answer-whyoff-notpredictable' => 'היא פעלה באופן בלתי צפוי.',
 	'prefswitch-survey-answer-whyoff-didntlike-look' => 'לא אהבתי את המראה החדש.',
@@ -1232,7 +1378,7 @@
 	'prefswitch-success-feedback' => 'המשוב שלכם נשלח.',
 	'prefswitch-return' => '<hr style="clear:both">
 חזרה אל <span class="plainlinks">[$1 $2].</span>',
-	'prefswitch-main' => "עבדנו קשה כדי שלמשתמשים שלנו יהיה קל יותר. אנו נרגשים לשתף אתכם במספר שיפורים, בהם מראה חדש ויכולות עריכה פשוטות יותר. שיפור השמישות במיזמים שלנו הוא משימה בעלת עדיפות גבוהה עבור קרן ויקימדיה ואנחנו נשתף אתכם בעדכונים נוספים בעתיד.
+	'prefswitch-main' => "עבדנו קשה כדי שלמשתמשים שלנו יהיה קל יותר. אנו נרגשים לשתף אתכם במספר שיפורים, בהם מראה חדש ויכולות עריכה פשוטות יותר. שיפור השמישות במיזמים שלנו הוא משימה בעלת עדיפות גבוהה עבור קרן ויקימדיה ואנחנו נשתף אתכם בעדכונים נוספים בעתיד. לפרטים נוספים, בקרו בהודעה בנושא ב[http://blog.wikimedia.org/2010/05/13/a-new-lo... בלוג של ויקימדיה]. [[File:UsabilityNavigation.png|left|link=|צילום מסך של דף הניווט החדש]]
 [[File:UsabilityToolbar.png|left|link=|צילום מסך של סרגל העריכה המורחב]]
@@ -1243,7 +1389,7 @@
 * '''אשף קישורים''': כלי קל לשימוש שמאפשר לכם להוסיף קישורים לדפים אחרים בוויקיפדיה וגם קישורים לאתרים חיצוניים.
 * '''שיפורים בחיפוש''': שיפרנו את ההשלמות בתיבת החיפוש כדי שתמצאו את הדף שאותו אתם מחפשים מהר יותר.
 * '''תכונות חדשות אחרות''': הוספנו גם אשף טבלאות כדי שיהיה קל יותר ליצור טבלאות ויכולת חיפוש והחלפה כדי להקל על עריכת דפים.
-* '''סמל תצרף הגלובוס של ויקיפדיה''': עדכנּו את הסמל של ויקיפדיה עם תצרף הגלובוס. למידע נוסף ר' את יומן הרשת של ויקיפדיה: [http://blog.wikimedia.org/2010/05/13/wikipedi...  Wikimedia blog] (באנגלית).",
+* '''סמל פאזל הגלובוס של ויקיפדיה''': עדכנּו את הסמל של ויקיפדיה עם פאזל הגלובוס. למידע נוסף ראו את [http://blog.wikimedia.org/2010/05/13/wikipedi...  הבלוג של ויקימדיה] (באנגלית).",
 	'prefswitch-main-anon' => '==תחזירו אותי==
 אם תרצו לבטל את התכונות החדשות, <span class="plainlinks">[$1 לחצו כאן]</span>. לפני כן תתבקשו להיכנס לחשבונכם או ליצור חשבון.',
 	'prefswitch-main-on' => '===יש לכם מה לספר לנו?===
@@ -1440,14 +1586,20 @@
 	'prefswitch-survey-false' => 'Tidak',
 	'prefswitch-survey-submit-off' => 'Matikan fitur baru',
 	'prefswitch-survey-submit-feedback' => 'Kirim umpan balik',
+	'prefswitch-survey-question-like' => 'Apa yang Anda sukai tentang fitur baru ini?',
+	'prefswitch-survey-question-dislike' => 'Apa yang Anda tidak sukai tentang fitur baru ini?',
+	'prefswitch-survey-question-whyoff' => 'Mengapa Anda mematikan fitur baru ini?
+Harap pilih semua yang benar.',
 	'prefswitch-survey-answer-whyoff-hard' => 'Terlalu sulit untuk digunakan.',
 	'prefswitch-survey-answer-whyoff-didntwork' => 'Tidak berfungsi dengan baik.',
+	'prefswitch-survey-answer-whyoff-didntlike-toolbar' => 'Saya tidak menyukai kotak peralatan yang baru.',
 	'prefswitch-survey-answer-whyoff-other' => 'Alasan lainnya:',
 	'prefswitch-survey-question-browser' => 'Penjelajah web apa yang Anda gunakan?',
 	'prefswitch-survey-answer-browser-other' => 'Penjelajah web lainnya:',
 	'prefswitch-survey-question-os' => 'Sistem operasi apa yang Anda gunakan?',
 	'prefswitch-survey-answer-os-other' => 'Sistem operasi lainnya:',
 	'prefswitch-survey-question-res' => 'Berapa besar resolusi layar Anda?',
+	'prefswitch-title-on' => 'Fitur baru',
 	'prefswitch-title-switched-on' => 'Selamat menikmati!',
 	'prefswitch-title-off' => 'Matikan fitur baru',
 	'prefswitch-title-switched-off' => 'Terima kasih',
@@ -1455,9 +1607,12 @@
 	'prefswitch-success-on' => 'Fitur baru sekarang telah dihidupkan.',
 	'prefswitch-success-off' => 'Fitur baru sekarang telah dimatikan.',
 	'prefswitch-success-feedback' => 'Umpan balik Anda telah terkirim.',
+	'prefswitch-return' => '<hr style="clear:both">
+Kembali ke <span class="plainlinks">[$1 $2]</span>.',
 ); /** Italian (Italiano)
+ * @author Beta16
  * @author Una giornata uggiosa '94
  */
 $messages['it'] = array(
@@ -1469,6 +1624,8 @@
 	'prefswitch-survey-cancel-off' => 'Se vuoi continuare ad usare le nuove funzioni, puoi tornare a $1.',
 	'prefswitch-survey-submit-feedback' => 'Invia feedback',
 	'prefswitch-survey-cancel-feedback' => 'Se non vuoi fornire un feedback, puoi tornare a $1.',
+	'prefswitch-survey-question-like' => 'Cosa ti è piaciuto delle nuove funzionalità?',
+	'prefswitch-survey-question-dislike' => 'Cosa non ti è piaciuto delle nuove funzionalità?',
 	'prefswitch-survey-question-whyoff' => 'Perché stai disattivando le nuove funzioni?
 Si prega di selezionare tutte le motivazioni pertinenti.',
 	'prefswitch-survey-answer-whyoff-hard' => 'Era troppo difficile da usare.',
@@ -1483,37 +1640,41 @@
 	'prefswitch-survey-question-os' => 'Quale sistema operativo usi?',
 	'prefswitch-survey-answer-os-other' => 'Altro sistema operativo:',
 	'prefswitch-survey-question-res' => 'Qual è la risoluzione del tuo schermo?',
-	'prefswitch-title-on' => "Cosa c'è di nuovo?",
+	'prefswitch-title-on' => 'Nuove funzionalità',
 	'prefswitch-title-switched-on' => 'Buon divertimento!',
 	'prefswitch-title-off' => 'Disattiva le nuove funzioni',
 	'prefswitch-title-switched-off' => 'Grazie',
 	'prefswitch-title-feedback' => 'Feedback',
-	'prefswitch-success-on' => 'Le nuove funzioni sono state attivate.',
-	'prefswitch-success-off' => 'Le nuove funzioni sono state disattivate.',
+	'prefswitch-success-on' => 'Le nuove funzionalità sono attive. Ci auguriamo che ti piacciano. Puoi sempre disattivarle cliccando sul link "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]" sulla parte superiore della pagina.',
+	'prefswitch-success-off' => 'Le nuove funzionalità sono state disattivate. Grazie per averle provate. Puoi sempre riattivarle cliccando sul link "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]" nella parte superiore della pagina.',
 	'prefswitch-success-feedback' => 'Il tuo feedback è stato inviato.',
 	'prefswitch-return' => '<hr style="clear:both">
 Torna a <span class="plainlinks">[$1 $2]</span>.',
-	'prefswitch-main' => "Abbiamo lavorato duramente per rendere le cose più semplici ai nostri utenti. Siamo entusiasti di condividere alcuni miglioramenti, tra cui un nuovo aspetto grafico e delle funzioni di modifica semplificate.  Migliorare l'usabilità dei progetti wiki è una priorità della fondazione Wikimedia, e condivideremo altri aggiornamenti in futuro.
+	'prefswitch-main' => "Abbiamo lavorato duramente per rendere le cose più semplici ai nostri utenti. Siamo entusiasti di condividere alcuni miglioramenti, tra cui un nuovo aspetto grafico e delle funzioni di modifica semplificate.  Migliorare l'usabilità dei progetti wiki è una priorità della fondazione Wikimedia, e condivideremo altri aggiornamenti in futuro. Per maggiori dettagli, visita il relativo post del [http://blog.wikimedia.org/2010/05/13/a-new-lo... blog Wikimedia].  [[File:UsabilityNavigation.png|right|link=|Screenshot del nuovo sistema di navigazione]]
 [[File:UsabilityToolbar.png|right|link=|Screenshot della nuova barra degli strumenti]]
 [[File:UsabilityDialogs.png|right|link=|Screenshot delle nuove finestre di dialogo per la generazione del contenuto]]
 ===Ecco cosa abbiamo cambiato===
-* '''Navigazione:''' Abbiamo migliorato il sistema di navigazione per leggere e modificare voci. Adesso, le schede nella parte superiore di ogni voce indicano più chiaramente se stai visualizzando la voce o la pagina di discussione, e se stai leggendo o modificando una voce.
-* '''Miglioramenti alla barra degli strumenti:'''  Abbiamo riorganizzato la barra degli strumenti di modifica per renderla più semplice da usare.  Adesso, formattare le voci è più semplice e intuitivo.
-* '''Procedura guidata per i link:'''  Uno strumento semplice da utilizzare ti permette di aggiungere link ad altre pagine di Wikipedia e link a siti esterni.
-* '''Miglioramenti alla ricerca:''' Abbiamo migliorato i suggerimenti della ricerca per portarti più velocemente alla pagina che stai cercando.
-* '''Altre nuove funzioni:'''  Abbiamo introdotto anche una procedura guidata per le tabelle per rendere la loro creazione più semplice e una funzione \"trova e sostituisci\" per semplificare la modifica delle pagine.",
+* '''Navigazione''': Abbiamo migliorato il sistema di navigazione per leggere e modificare voci. Adesso, le schede nella parte superiore di ogni voce indicano più chiaramente se stai visualizzando la voce o la pagina di discussione, e se stai leggendo o modificando una voce.
+* '''Miglioramenti alla barra degli strumenti''':  Abbiamo riorganizzato la barra degli strumenti di modifica per renderla più semplice da usare.  Adesso, formattare le voci è più semplice e intuitivo.
+* '''Procedura guidata per i link''':  Uno strumento semplice da utilizzare ti permette di aggiungere link ad altre pagine di Wikipedia e link a siti esterni.
+* '''Miglioramenti alla ricerca''': Abbiamo migliorato i suggerimenti della ricerca per portarti più velocemente alla pagina che stai cercando.
+* '''Altre nuove funzioni''':  Abbiamo introdotto anche una procedura guidata per le tabelle per rendere la loro creazione più semplice e una funzione \"trova e sostituisci\" per semplificare la modifica delle pagine.
+* '''Globo-puzzle di Wikipedia''': Abbiamo aggiornato il globo-puzzle. Leggi altre informazioni sul [http://blog.wikimedia.org/2010/05/13/wikipedi... blog Wikimedia].",
+	'prefswitch-main-anon' => '===Riportami indietro===
+Se vorresti disattivare le nuove funzionalità, <span class="plainlinks">[$1 clicca qui]</span>. Ti sarà chiesto di entrare o di creare un account.',
 	'prefswitch-main-on' => '===Feedback?===
-Ci piacerebbe ascoltarvi.  Per favore visita la nostra <span class="plainlinks">[$1 pagina di feedback]</span>.
+Ci piacerebbe ascoltare il tuo parere.  Per favore visita la nostra <span class="plainlinks">[$1 pagina di feedback]</span>.
 ===Riportami indietro!===
 Se vuoi disattivare le nuove funzioni, <span class="plainlinks">[$2 clicca qui]</span>.',
 	'prefswitch-main-off' => '===Provale!===
 Se vuoi attivare le nuove funzioni, <span class="plainlinks">[$1 clicca qui]</span>.',
-	'prefswitch-survey-intro-feedback' => 'Ci piacerebbe ascoltarvi.
-Per favore riempi il seguente questionario facoltativo.',
+	'prefswitch-survey-intro-feedback' => 'Ci piacerebbe ascoltare il tuo parere.
+Per favore, compila il seguente sondaggio facoltativo prima di cliccare "[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]".',
 	'prefswitch-survey-intro-off' => 'Grazie per aver provato le nostre nuove funzioni.
-Per aiutarci a migliorarle, per favore riempi il seguente questionario facoltativo.',
+Per aiutarci a migliorarle, per favore riempi il seguente questionario facoltativo prima di fare clic su "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]".',
+	'prefswitch-feedbackpage' => 'Progetto:Coordinamento/Usabilità',
 ); /** Japanese (日本語)
@@ -1522,7 +1683,7 @@
  * @author 青子守歌
  */
 $messages['ja'] = array(
-	'prefswitch' => 'ユーザビリティイニシアティブ設定スイッチ',
+	'prefswitch' => '使用性改善の設定スイッチ',
 	'prefswitch-desc' => '利用者が個人設定の組み合わせを切り替えられるようにする',
 	'prefswitch-survey-true' => 'はい',
 	'prefswitch-survey-false' => 'いいえ',
@@ -1556,7 +1717,7 @@
 	'prefswitch-success-feedback' => 'フィードバックが送信されました。',
 	'prefswitch-return' => '<hr style="clear:both">
 <span class="plainlinks">[$1 $2]</span>に戻る。',
-	'prefswitch-main' => "私たちは、より使いやすいサイトを利用者の皆さまにお届けするために努力してまいりました。そして新しい外観や雰囲気、わかりやすくなった編集機能などの改善を皆さまと共有できることを大変うれしく思っています。私たちのプロジェクトの使いやすさを改善することは、ウィキメディア財団の優先課題の一つであり、今後も更なるアップデートを実施していく予定です。詳細は、[http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimediaブログ]の関連投稿をご覧下さい。
+	'prefswitch-main' => "私たちは、より使いやすいサイトを利用者の皆さまにお届けするために努力してまいりました。そして新しい外観や使い勝手、わかりやすくなった編集機能などの改善を皆さまと共有できることを大変うれしく思っています。私たちのプロジェクトの使いやすさを改善することは、ウィキメディア財団の優先課題の一つであり、今後も更なるアップデートを実施していく予定です。詳細は、[http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimediaブログ]の関連投稿(英語)をご覧ください。 [[File:UsabilityNavigation.png|right|link=|新しいナビゲーションのスクリーンショット]]
 [[File:UsabilityToolbar.png|right|link=|拡張編集ツールバーのスクリーンショット]]
@@ -1567,7 +1728,7 @@
 * '''リンクウィザード:''' ウィキペディア内の他のページや外部サイトへのリンクを追加できる、使いやすいツールを備えました。
 * '''検索機能の改善:''' 検索結果の候補予想の提示を改善し、お探しのページにより素早くたどり着けるようにしました。
 * '''その他の新機能:''' その他にも、ページ編集を簡潔化するために、表の作成を簡単にする表ウィザード、検索・置換機能を追加しました。
-* '''ウィキペディアのパズル地球儀''': パズル地球儀が更新されました。詳細は[http://blog.wikimedia.org/2010/05/13/wikipedi... Wikimedia blog]をご覧下さい。",
+* '''ウィキペディアのパズル地球儀''': パズル地球儀が更新されました。詳細は[http://blog.wikimedia.org/2010/05/13/wikipedi... Wikimedia blog](英語)をご覧ください。",
 	'prefswitch-main-anon' => '===以前の状態に戻す===
 新機能の数々を停止したい場合、<span class="plainlinks">[$1 こちらをクリック]</span>してください。まずログインするかアカウントを作るか尋ねられます。',
 	'prefswitch-main-on' => '===フィードバック===
@@ -1580,10 +1741,12 @@
 「[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]」をクリックする前に、下記の調査に任意でご協力ください。',
 	'prefswitch-survey-intro-off' => '新機能をお試しいただきありがとうございます。
 更なる改善のために、「[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]」をクリックする前に下記の調査に任意でご協力ください。',
+	'prefswitch-feedbackpage' => 'WP:WUI/F',
 ); /** Georgian (ქართული)
  * @author BRUTE
+ * @author ITshnik
  * @author გიორგიმელა
  */
 $messages['ka'] = array(
@@ -1595,6 +1758,8 @@
 	'prefswitch-survey-cancel-off' => 'თუ გსურთ გააგრძელოთ ბეტას გამოყენება, შეგიძლიათ დაბრუნდეთ  $1-ზე.',
 	'prefswitch-survey-submit-feedback' => 'გამოხმაურება',
 	'prefswitch-survey-cancel-feedback' => 'თუ არ გსურთ პროტოტიპზე გამოხმაურების დატოვება, უბრალოდ დაბრუნდით $1.',
+	'prefswitch-survey-question-like' => 'რა მოგეწონათ ახალ შესაძლებლობებში?',
+	'prefswitch-survey-question-dislike' => 'რა არ მოგეწონათ ახალ შესაძლებლობებში?',
 	'prefswitch-survey-question-whyoff' => 'რატომ თიშავთ ახალ შესაძლებლობებს? 
 გთხოვთ აირჩიოთ პასუხი.',
 	'prefswitch-survey-answer-whyoff-hard' => 'ძალიან რთული იყო გამოსაყენებლად.',
@@ -1609,16 +1774,20 @@
 	'prefswitch-survey-question-os' => 'რომელ ოპერაციულ სისტემას იყენებთ?',
 	'prefswitch-survey-answer-os-other' => 'სხვა ოპერაციული სისტემა:',
 	'prefswitch-survey-question-res' => 'თქვენი მონიტორის გაფართოება:',
-	'prefswitch-title-on' => 'რა არის ახალი?',
+	'prefswitch-title-on' => 'ახალი შესაძლებლობები',
 	'prefswitch-title-switched-on' => 'ისიამოვნეთ!',
 	'prefswitch-title-off' => 'გათიშეთ ახალი შესაძლებლობები',
 	'prefswitch-title-switched-off' => 'მადლობა',
 	'prefswitch-title-feedback' => 'კონტაქტი',
-	'prefswitch-success-on' => 'ახალი შესაძლებლობები ჩართულია.',
-	'prefswitch-success-off' => 'ახალი შესაძლებლობები გათიშულია.',
+	'prefswitch-success-on' => 'ახალი შესაძლებლობები ჩაირთო. ვიმედოვნებთ, ისიამოვნებთ მათი გამოყენებით. თქვენ ყოველთვის შეგიძლიათ გამორთათ ისინი ბმულზე "[[სპეციალური: UsabilityInitiativePrefSwitch | ((int: prefswitch-link-on }}]]" დაწკაპუნებით, რომელიც ამ გვერდის თავში მდებარეობს.',
+	'prefswitch-success-off' => 'ახალი ფუნქციები ამჟამად გამორთულია. მადლობთ ახალი შესაძლებლობების მოსინჯვისათვის. თქვენ ყოველთვის შეგიძლიათ ჩართათ ისინი ბმულზე "[[სპეციალური: UsabilityInitiativePrefSwitch | ((int: prefswitch-link-off }}]]" დაწკაპებით, რომელიც ამ გვერდის თავში მდებარეობს.',
 	'prefswitch-success-feedback' => 'თქვენი გამოხმაურება გაგზავნილია.',
 	'prefswitch-return' => '<hr style="clear:both">
 დაბრუნება <span class="plainlinks">[$1 $2]</span>.',
+	'prefswitch-main-anon' => '===დაბრუნება===
+თუ გსურთ გამორთოთ ბეტა, <span class="plainlinks">[$1 დააჭირეთ აქ]</span>. შემდეგ კი გაიარეთ ავტორიზაცია ან შექმენით ანგარიში.',
+	'prefswitch-main-off' => '=== მოსინჯეთ! === 
+თუ გსურთ, რომ ჩართათ ახალი ფუნქციები, <span class="plainlinks">[$ 1 დააწკაპეთ აქ].</span>',
 ); /** Korean (한국어)
@@ -1796,22 +1965,41 @@
 	'prefswitch-success-feedback' => 'Вашите примедби се испратени.',
 	'prefswitch-return' => '<hr style="clear:both">
 Назад кон <span class="plainlinks">[$1 $2]</span>.',
-	'prefswitch-main' => "Работевме напорно за да им олесниме на корисниците. Со задоволство ги претставуваме направените подобрувања, меѓу кои се и новиот изглед и чувство и упростените функции за уредување. Подобрувањето на употребливоста на проектите е голем приоритет на фондацијата Викимедија и во иднина очекувајте да известуваме за други унапредувања. За повеќе информации, посетете го [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedia блогот].
+	'prefswitch-main' => "{| border=\"0\" align=\"right\" style=\"margin-left:1em\"
+| align=\"center\" |
+{| border=\"0\" style=\"background:#F3F3F3;border: 1px solid #CCCCCC;padding:10px;\" 
+| [[Image:VectorNavigation-en.png|401px|]]
+|-
+| Изглед на новиот навигациски посредник на Википедија <small>[[Media:VectorNavigation.png|(зголеми)]]</small>
+|}
+|-
+| align=\"center\" |
+{| border=\"0\" style=\"background:#F3F3F3;border: 1px solid #CCCCCC;padding:10px;\"
+| [[Image:VectorEditorBasic-en.png|401px|]]
+|-
+| Изглед на основниот посредник за уредување на страници <small>[[Media:VectorEditorBasic.png|(зголеми)]]</small>
+|}
+|-
+| align=\"center\" |
+{| border=\"0\" style=\"background:#F3F3F3;border: 1px solid #CCCCCC;padding:10px;\"
+| [[Image:VectorLinkDialog-en.png|401px|]]
+|-
+| Изглед на новата кутија за внесување врски
+|}
+|}
+Екипата за корисничко искуство на Фондацијата Викимедија работеше со доброволци од заедницата за да ви ги олесни нештата. Со задоволство ве известуваме за направените подобрувања, новиот изглед и чувство, како и упростените функции за уредување. Овие промени имаат за цел да им го олеснат почетокот на новите учесници, и се засноваат на [http://usability.wikimedia.org/wiki/Usability... ланските испитувања на употребливоста]. Подобрувањето на употребливоста на проектите претставува приоритет за Фондацијата Викимедија и во иднина ќе продолжиме да ве известуваме за воведените новини. За повеќе информации, посетете го соодветниот [http://blog.wikimedia.org/2010/05/13/a-new-lo... блог-напис на Викимедија].-[[File:UsabilityNavigation.png|right|link=|Нов начин на навигација]]
-[[File:UsabilityToolbar.png|right|link=|Подобрен алатник за уредување]]
-[[File:UsabilityDialogs.png|right|link=|Нови дијалози за создавање содржини]]
 ===Еве што променивме===
 * '''Навигација:''' Ја подобривме навигацијата за читање и уредување на страниците. Сега менијата над секоја страница појасно укажуваат на тоа дали ја гледате страницата или страница за разговор, и дали ја читате или уредувате страницата.
 * '''Подобрен алатник за уредување:'''  Го реорганизиравме алатникот за полесна употреба. Сега форматирањето на страниците е упростено и поинтуитивно.
-* '''Волшебник за врски:'''  Едноставна алатка која овозможува додавање врски до други вики-страници како и до надворешни веб-страни.
+* '''Помошник за врски:'''  Едноставна алатка која овозможува додавање врски до други вики-страници како и до надворешни мрежни места.
 * '''Подобрено пребарување:''' Ги подобривме предлозите при пребарување за што побрзо да ви ја најдеме страницата што ја барате.
-* '''Други нови својства:''' Воведовме и волшебник за табели со чија помош табелите се прават полесно, а има и можност за пронаоѓање и заменување, со што се упростува уредувањето на страницата.
-* '''Википедија глобус''': го променивме логото, дознајте повеќе на [http://blog.wikimedia.org/2010/05/13/wikipedi...  Викимедија блогот.]",
+* '''Други нови функции:''' Воведовме и помошник за табели со чија помош табелите се прават полесно, а има и можност за пронаоѓање и заменување, со што се упростува уредувањето на страницата.
+* '''Лого на Википедија:''' Го подновивме и логото. Прочитахте повеќе на [http://blog.wikimedia.org/2010/05/13/wikipedi... блогот на Викимедија].",
 	'prefswitch-main-anon' => '===Врати ме===
 Ако сакате да ги исклучите новите функции, <span class="plainlinks">[$1 кликнете тука]</span>. Ќе ви биде побарано најпрвин да се најавите или да создадете сметка.',
 	'prefswitch-main-on' => '===Примедби?===
-Со задоволство го очекуваме вашето мислење.  Посетете ја нашата <span class="plainlinks">[$1 страница за примедби]</span>.
+Со задоволство го очекуваме вашето мислење.  Посетете ја нашата [$1 feedback страница за примедби], а доколку сте заинтересирани за нашите постојани напори за подобрување на програмот, посетете го нашето [http://usability.wkimedia.org вики посветено на употребливоста].
 ===Врати ме!===
 Ако сакате да ги исклучите новите функции, тогаш <span class="plainlinks">[$2 кликнете тука]</span>.',
 	'prefswitch-main-off' => '===Испробајте ги!===
@@ -1988,29 +2176,49 @@
 	'prefswitch-success-feedback' => 'Uw terugkoppeling is verzonden.',
 	'prefswitch-return' => '<hr style="clear:both">
 Terug naar <span class="plainlinks">[$1 $2]</span>.',
-	'prefswitch-main' => "We hebben hard gewerkt om dingen makkelijker te maken voor onze gebruikers.
-We zijn verheugd om een aantal verbeteringen met u te delen, inclusief een nieuw uiterlijk en een vereenvoudigde manier om pagina's te bewerken.
+	'prefswitch-main' => "{| border=\"0\" align=\"right\" style=\"margin-left:1em\"
+| align=\"center\" |
+{| border=\"0\" style=\"background:#F3F3F3;border: 1px solid #CCCCCC;padding:10px;\" 
+| [[Image:VectorNavigation-nl.png|401px|]]
+|-
+| De nieuwe navigatie voor Wikipedia. <small>[[Media:VectorNavigation-nl.png|(vergroten)]]</small>
+|}
+|-
+| align=\"center\" |
+{| border=\"0\" style=\"background:#F3F3F3;border: 1px solid #CCCCCC;padding:10px;\"
+| [[Image:VectorEditorBasic-nl.png|401px|]]
+|-
+| Het eenvoudige bewerkingsvenster. <small>[[Media:VectorEditorBasic-nl.png|(vergroten)]]</small>
+|}
+|-
+| align=\"center\" |
+{| border=\"0\" style=\"background:#F3F3F3;border: 1px solid #CCCCCC;padding:10px;\"
+| [[Image:VectorLinkDialog-nl.png|401px]]
+|-
+| Het nieuwe dialoog voor het toevoegen van verwijzingen.
+|}
+|}
+Het Bruikbaarheidsteam van de Wikimedia Foundation hard gewerkt om dingen makkelijker te maken voor u. We zijn verheugd om een aantal verbeteringen met u te delen, inclusief een nieuw uiterlijk en een vereenvoudigde manier om pagina's te bewerken.
+De wijzigingen beogen het eenvoudiger te maken voor nieuwelingen om bij te dragen en zijn gebaseerd op onze [http://usability.wikimedia.org/wiki/Usability... bruikbaarheidstests van het afgelopen jaar].
 Het verbeteren van de gebruiksvriendelijkheid van onze projecten is een prioriteit van de Wikimedia Foundation en we verwachten in de toekomst nog verder te kunnen gaan.
-Op de [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedia blog] kunt u hier meer over lezen.
+In het [http://blog.wikimedia.org/2010/05/13/a-new-lo... blogbericht] kunt u meer lezen.-[[File:UsabilityNavigation.png|right|link=|Schermafbeelding van de nieuwe navigatie]]
-[[File:UsabilityToolbar.png|right|link=|Schermafbeelding van de uitgebreide bewerkingswerkbalk]]
-[[File:UsabilityDialogs.png|right|link=|Schermafbeelding van de nieuwe inhoudsbewerkingsdialogen]]
-=== Hier is wat we hebben veranderd ===
+=== Dit hebben we veranderd ===
 * '''Navigatie:''' We hebben de navigatie voor het lezen en bewerken van pagina's verbeterd.
 De tabbladen bovenaan de pagina geven beter aan of u een pagina bekijkt of een overlegpagina, en of u een pagina aan het bekijken of aan het bewerken bent.
-* '''Verbeteringen aan de werkbalk:''' We hebben de werkbalk volledig herontworpen zodat deze eenvoudiger te gebruiken is. Nu is het bewerken van pagina's eenvoudiger en intuïtiever.
-* '''Hulp bij verwijzingen:''' een eenvoudig hulpmiddel bij het toevoegen van verwijzingen naar andere pagina's in Wikipedia en externe websites.
+* '''Verbeteringen aan de werkbalk:''' We hebben de werkbalk volledig herontworpen zodat deze eenvoudiger te gebruiken is.
+Nu is het bewerken van pagina's eenvoudiger en intuïtiever.
+* '''Hulp bij verwijzingen:''' een hulpje voor het eenvoudig toevoegen van verwijzingen naar andere wikipagina's en externe websites.
 * '''Verbeteringen in het zoeken:''' we hebben zoeksuggesties verbeterd zodat u de pagina die u zoekt sneller vindt.
 * '''Andere nieuwe mogelijkheden:''' Wij hebben ook een tabelhulpmiddel toegevoegd om het maken van tabellen te vereenvoudigen en een hulpmiddel voor zoeken en vervangen om het bewerken van pagina's te vereenvoudigen.
-* '''Wikipedia puzzelglobe''': We hebben de puzzel bijgewerkt. Op de [http://blog.wikimedia.org/2010/05/13/wikipedi... Wikimedia blog] kunt u meer lezen.",
+* '''Wikipedia logo''': We hebben ons logo. Op de [http://blog.wikimedia.org/2010/05/13/wikipedi... Wikimedia blog] kunt u meer lezen.
+
+=== Terugkoppeling? ===
+Wij horen graag van u.
+Bezoek onze [[$1|pagina voor terugkoppeling]], of ga naar de [http://usability.wkimedia.org bruikbaarheidswiki] voor meer informatie als u geïnteresseerd bent in onze toekomstige plannen.",
 	'prefswitch-main-anon' => '===Terug===
 <span class="plainlinks">[$1 U kunt de nieuwe functionaliteit uitschakelen]</span>. U wordt dan gevraagd om aan te melden of te registreren.',
-	'prefswitch-main-on' => '=== Terugkoppeling? ===
-Wij horen graag van u.
-Bezoek onze <span class="plainlinks">[$1 pagina voor terugkoppeling].</span>
-
-=== Nee, bedankt! ===
+	'prefswitch-main-on' => '=== Nee, bedankt! ===
 <span class="plainlinks">[$2 Klik om de nieuwe mogelijkheden uit te schakelen]</span>.',
 	'prefswitch-main-off' => '===Uitproberen!===
 <span class="plainlinks">[$1 Klik hier om de nieuwe mogelijkheden in te schakelen]</span>.',
@@ -2018,6 +2226,7 @@
 Vul alstublieft de optionele vragenlijst hieronder in voordat u klikt op "[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]".',
 	'prefswitch-survey-intro-off' => 'Bedankt voor het uitproberen van de nieuwe mogelijkheden.
 Vul alstublieft de onderstaande vragenlijst in om ons te helpen ze verder te verbeteren voordat u klikt op "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]".',
+	'prefswitch-feedbackpage' => 'Wikipedia:Feedback voor het User Experience Team',
 ); /** Norwegian Nynorsk (‪Norsk (nynorsk)‬)
@@ -2028,6 +2237,7 @@
 ); /** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Jon Harald Søby
  * @author Nghtwlkr
  */
 $messages['no'] = array(
@@ -2065,17 +2275,18 @@
 	'prefswitch-success-feedback' => 'Tilbakemeldingen din er sendt.',
 	'prefswitch-return' => '<hr style="clear:both">
 Tilbake til <span class="plainlinks">[$1 $2]</span>.',
-	'prefswitch-main' => "Vi har jobbet hardt for å gjøre ting lettere for våre brukere. Vi er glade for å dele noen forbedringer, inkludert et nytt utseende og forenklede redigeringsfunksjoner. Å forbedre brukeligheten av våre prosjekt er en prioritet for Wikimedia Foundation og vi vil dele flere oppdateringer med dere i fremtiden.
+	'prefswitch-main' => "Vi har jobbet hardt for å gjøre ting lettere for brukerne våre. Vi er glade for å dele noen forbedringer, blant annet et nytt utseende og enklere redigeringsfunksjoner. Å forbedre brukervennligheten til prosjektene våre er en prioritet for Wikimedia Foundation og vi vil dele flere oppdateringer med dere i fremtiden. Se [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedia-bloggen] (engelsk) for mer informasjon.-[[File:UsabilityNavigation.png|right|link=|Screenshot of the new navigation]]
-[[File:UsabilityToolbar.png|right|link=|Screenshot of the enhanced edit toolbar]]
-[[File:UsabilityDialogs.png|right|link=|Screenshot of the new content generation dialogs]]
+[[File:UsabilityNavigation.png|right|link=|Skjermbilde av den nye navigasjonen]]
+[[File:UsabilityToolbar.png|right|link=|Skjermbilde av den nye verktøylinja]]
+[[File:UsabilityDialogs.png|right|link=|Skjermbilde av de nye dialogboksene]]
 ===Dette har vi endret===
-* '''Navigering:''' Vi har forbedret navigeringen for lesing og redigering av sider. Nå viser fanene på toppen av siden klarere om du ser på siden eller på en diskusjonsside, og hvorvidt du leser eller redigerer en side.
-* '''Forbedring av verktøylinje for redigering:''' Vi har omorganisert verktøyslinjen for redigering for å gjøre den lettere å bruke. Nå er det lettere og mer intuitivt å formatere sider.
-* '''Lenkehjelp:''' Et verktøy som er lett å bruke tillater deg å legge til lenker til andre Wikipediasider og andre eksterne nettsteder.
+* '''Navigasjon:''' Vi har forbedret navigeringen for lesing og redigering av sider. Nå viser fanene på toppen av siden klarere om du ser på siden eller på en diskusjonsside, og hvorvidt du leser eller redigerer en side.
+* '''Forbedring av redigeringsverktøylinja:''' Vi har omorganisert verktøyslinja for redigering for å gjøre den lettere å bruke. Nå er det lettere og mer intuitivt å formatere sider.
+* '''Lenkehjelp:''' Et verktøy som er lett å bruke tillater deg å legge til lenker til andre wikisider og eksterne nettsteder.
 * '''Forbedring av søk:''' Vi har forbedret søkeforslagene for å hjelpe deg til siden du leter etter raskere.
-* '''Andre nye funksjoner:''' Vi har også introdusert en tabellhjelper for å gjøre det lettere å opprette tabeller og en finn og erstatt-funksjon for å gjøre sideredigering lettere.",
+* '''Andre nye funksjoner:''' Vi har også introdusert en tabellhjelper for å gjøre det lettere å opprette tabeller og en finn og erstatt-funksjon for å gjøre sideredigering lettere.
+* '''Logoen:''' Vi har oppgradert logoen. Les mer på [http://blog.wikimedia.org/2010/05/13/wikipedi... Wikimedia-bloggen] (engelsk).",
 	'prefswitch-main-anon' => '===Ta meg tilbake===
 Om du vil slå av de nye funksjonene, <span class="plainlinks">[$1 klikk her]</span>. Du vil bli spurt om å logge inn eller opprette en konto først.',
 	'prefswitch-main-on' => '===Tilbakemelding?===
@@ -2090,6 +2301,13 @@
 For å hjelpe oss med å forbedre dem kan du fylle ut det valgfrie skjemaet under før du klikker på «[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]».',
 );+/** Deitsch (Deitsch)
+ * @author Xqt
+ */
+$messages['pdc'] = array(
+	'prefswitch-survey-answer-whyoff-other' => 'Annerer Grund:',
+);
+
 /** Polish (Polski)
  * @author Nux
  * @author Sp5uhe
@@ -2124,26 +2342,26 @@
 	'prefswitch-title-off' => 'Wyłącz nowe funkcjonalności',
 	'prefswitch-title-switched-off' => 'Dziękujemy',
 	'prefswitch-title-feedback' => 'Opinia',
-	'prefswitch-success-on' => 'Nowe funkcjonalności są obecnie włączone. Mamy nadzieję, że spodobają Ci się najnowsze zmiany. W każdej chwili możesz jednak cofnąć się do poprzedniej wersji klikając na link „[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]” znajdujący się na górze strony.',
-	'prefswitch-success-off' => 'Nowe funkcjonalności są obecnie wyłączone. Dziękujemy za wypróbowanie nowych funkcjonalności. Jeśli zechcesz możesz przywrócić zmiany klikając na link „[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]” znajdujący się na górze strony.',
+	'prefswitch-success-on' => 'Nowe funkcjonalności są obecnie włączone. Mamy nadzieję, że spodobają Ci się najnowsze zmiany. W każdej chwili możesz wrócić do poprzedniej wersji klikając na link „[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]” znajdujący się na górze strony.',
+	'prefswitch-success-off' => 'Nowe funkcjonalności są obecnie wyłączone. Dziękujemy za ich wypróbowanie. Jeśli zechcesz możesz z nich ponownie skorzystać klikając na link „[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]” znajdujący się na górze strony.',
 	'prefswitch-success-feedback' => 'Twoja opinia została przesłana.',
 	'prefswitch-return' => '<hr style="clear:both">
 Powrót do <span class="plainlinks">[$1 $2]</span>.',
-	'prefswitch-main' => "Ciężko pracowaliśmy, żeby ułatwić życie naszym użytkownikom. Cieszymy się, że możemy zaprezentować część udoskonaleń, wliczając w to nowy wygląd i nowe, uproszczone funkcjonalności edycyjne. Zwiększanie użyteczności naszych projektów jest priorytetem dla Fundacji Wikimedia i z pewności w przyszłości pojawi się więcej nowych funkcjonalności. Więcej (w języku angielskim) można przeczytać w poście poście na [http://blog.wikimedia.org/2010/05/13/a-new-lo... blogu Wikimedia].
+	'prefswitch-main' => "Ciężko pracowaliśmy, aby ułatwić życie naszym użytkownikom. Cieszymy się, że możemy zaprezentować część udoskonaleń, wliczając w to nowy wygląd i nowe, uproszczone funkcjonalności edycyjne. Zwiększanie użyteczności naszych projektów jest priorytetem dla Fundacji Wikimedia – z pewności w przyszłości pojawi się więcej nowych funkcjonalności. Więcej (w języku angielskim) można przeczytać na [http://blog.wikimedia.org/2010/05/13/a-new-lo... blogu Wikimedia]. [[File:UsabilityNavigation.png|right|link=|Nowy układ strony]]
 [[File:UsabilityToolbar.png|right|link=|Nowy pasek narzędziowy]]
-[[File:UsabilityDialogs.png|right|link=|Nowe okienka do edycji]]
+[[File:UsabilityDialogs.png|right|link=|Nowe okienka edycyjne]] ===Oto co zmieniliśmy===
-* '''Układ strony''': Poprawiliśmy układ strony zarówno przy edycji jak i przeglądaniu. Zakładki na górze strony w bardziej oczywisty sposób informują o tym czy oglądasz właściwą stronę czy stronę dyskusji oraz czy tylko przeglądasz czy edytujesz daną stronę.
-* '''Udoskonalenia paska narzędziowego''': Zreorganizowaliśmy pasek narzędziowy, aby łatwiej było się nim posługiwać. Formatowanie stron powinno być teraz prostsze i bardziej intuicyjne.
-* '''Kreator linków''':  Łatwe w użyciu narzędzie pozwala na tworzeni linków zarówno do stron wiki, jak i zewnętrznych serwisów.
-* '''Udoskonalenia wyszukiwania''': Dzięki nowym, udoskonalonym podpowiedziom szybko znajdziesz to czego szukasz.
-* '''Inne nowe funkcjonalności''': Nowy kreator tworzenia tabelek oraz okienko wyszukiwania i zamiany ułatwi edycję stron.
-* '''Wikipedyczny globus z puzzli''': Zaktualizowaliśmy globus z puzzli będący logo Wikipedii. Więcej informacji (w języku angielskim) znajdiesz w poście na [http://blog.wikimedia.org/2010/05/13/wikipedi... blogu Wikimedia].",
+* '''Układ strony''' – Poprawiliśmy układ strony zarówno przy edycji jak i przeglądaniu. Zakładki na górze strony w bardziej czytelny sposób informują o tym czy oglądasz właściwą stronę czy stronę dyskusji oraz czy tylko przeglądasz czy edytujesz daną stronę.
+* '''Udoskonalenia paska narzędziowego''' – Przeorganizowaliśmy pasek narzędziowy, aby łatwiej było się nim posługiwać. Formatowanie stron powinno być teraz prostsze i bardziej intuicyjne.
+* '''Kreator linków''' – Łatwe w użyciu narzędzie pozwala na tworzenie linków zarówno do stron wiki, jak i zewnętrznych serwisów.
+* '''Udoskonalenia wyszukiwania''' – Dzięki nowym, udoskonalonym podpowiedziom szybko znajdziesz to czego szukasz.
+* '''Inne nowe funkcjonalności''' – Nowy kreator tworzenia tabel oraz okno wyszukiwania i zamiany ułatwia edycję stron.
+* '''Wikipedyczny globus z puzzli''' – Zaktualizowaliśmy globus z puzzli będący logo Wikipedii. Więcej informacji (w języku angielskim) znajdziesz na [http://blog.wikimedia.org/2010/05/13/wikipedi... blogu Wikimedia].",
 	'prefswitch-main-anon' => '=== Chcę wrócić ===
-<span class="plainlinks">[$1 Kliknij tutaj]</span>, jeśli chcesz wyłączyć nowe funkcjonalności. Przed powrotem do starego wyglądu interfejsu będziesz musiał(-a) utworzyć konto lub zalogować się.',
+<span class="plainlinks">[$1 Kliknij tutaj]</span>, jeśli chcesz wyłączyć nowe funkcjonalności. Przed powrotem do starego wyglądu interfejsu musisz utworzyć konto lub zalogować się.',
 	'prefswitch-main-on' => '===Opinia?===
 Chcielibyśmy poznać Twoją opinię. Odwiedź <span class="plainlinks">[$1 stronę przesyłania opinii]</span>.
 ===Chcę to wyłączyć!===
@@ -2154,6 +2372,7 @@
 Będziemy wdzięczni za wypełnienie poniższej ankiety zanim klikniesz „[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]”.',
 	'prefswitch-survey-intro-off' => 'Dziękujemy za wypróbowanie nowych funkcjonalności.
 Jeśli chcesz nam pomóc je udoskonalić, przed kliknięciem „[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]” wypełnij poniższą ankietę.',
+	'prefswitch-feedbackpage' => 'Wikipedia:Użyteczność – księga skarg, zażaleń i pomysłów',
 ); /** Piedmontese (Piemontèis)
@@ -2169,6 +2388,8 @@
 	'prefswitch-survey-cancel-off' => "S'a veul continué a dovré le possibilità neuve, a peul torné a $1.",
 	'prefswitch-survey-submit-feedback' => 'Mandé dij sugeriment',
 	'prefswitch-survey-cancel-feedback' => "S'a veul pa dé ëd sugeriment, a peul torné a $1.",
+	'prefswitch-survey-question-like' => "Lòn ch'at pias ëd le neuve funsionalità?",
+	'prefswitch-survey-question-dislike' => "Lòn ch'at pias pa ëd le neuve funsionalità?",
 	'prefswitch-survey-question-whyoff' => "Përchè a veul disativé le possibilità neuve?
 Për piasì, ch'a selession-a tute le motivassion.",
 	'prefswitch-survey-answer-whyoff-hard' => "A l'era tròp malfé dovrelo.",
@@ -2188,12 +2409,12 @@
 	'prefswitch-title-off' => 'Disativa le possibilità neuve',
 	'prefswitch-title-switched-off' => 'Mersì',
 	'prefswitch-title-feedback' => 'Sugeriment',
-	'prefswitch-success-on' => 'Le neuve funsionalità a son adess ativà. I speroma ch\'at piasa dovré le neuve funsionalità. It peule sempe gaveje via an sgnacand dzora al colegament "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]" a la sima dla pàgina.',
-	'prefswitch-success-off' => 'Le neuve funsionalità a son adess disativà. Mersì për avèj provà le neuve funsionalità. It peule sempe torna buteje an sgnacand dzora al colegament "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]" a la sima dla pàgina.',
+	'prefswitch-success-on' => 'Le neuve funsionalità a son adess ativà. I speroma ch\'a-j piasa dovré le neuve funsionalità. A peul sempe gaveje via an sgnacand dzora al colegament "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]" an cò dla pàgina.',
+	'prefswitch-success-off' => 'Le neuve funsionalità a son adess disativà. Mersì për avèj provà le neuve funsionalità. A peul sempe torna buteje an sgnacand dzora al colegament "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]" an cò dla pàgina.',
 	'prefswitch-success-feedback' => 'Ij sò coment a son ëstàit mandà.',
 	'prefswitch-return' => '<hr style="clear:both">
 Artorna a <span class="plainlinks">[$1 $2]</span>.',
-	'prefswitch-main' => "I l'oma travajà sech për fé le ròbe belfé për ij nòstri utent. I l'oma gòj ëd condivide chèich ameliorament, comprèis na presentassion neuva e dle possibilità ëd modìfica neuve. Amelioré la comodità d'utilisassion dij nòstri proget a l'é na priorità dla Fondassion Wikimedia e noi i condivideroma d'àutre modìfiche ant l'avnì.
+	'prefswitch-main' => "I l'oma travajà sech për fé le ròbe belfé për ij nòstri utent. I l'oma gòj ëd condivide chèich ameliorament, comprèis na presentassion neuva e dle possibilità ëd modìfica neuve. Amelioré la comodità d'utilisassion dij nòstri proget a l'é na priorità dla Fondassion Wikimedia e noi i condivideroma d'àutre modìfiche ant l'avnì. Për savèjne ëd pi, ch'a vìsita ël sit colegà [http://blog.wikimedia.org/2010/05/13/a-new-lo... scartari ëd Wikimedia] [[File:UsabilityNavigation.png|right|link=|Scren ëd la neuva navigassion]]
 [[File:UsabilityToolbar.png|right|link=|Scren ëd la bara dj'utiss ëd modìfica ameliorà]]
@@ -2203,19 +2424,31 @@
 * '''Ameliorament ëd la bara dj'utiss ëd modìfica:''' I l'oma riorganisà la bara dj'utiss ëd modìfica për ch'a fussa pi belfé dovrela. Adess, l'ampaginassion a l'é pi sempia e pi intuitiva.
 * '''Assistent dij colegament:''' N'utiss bel da dovré a-j përmët ëd gionté d'anliure a d'àutre pàgine ëd Wikipedia e ëd colegament a d'àutri sit.
 * '''Ameliorament ëd l'arserca:''' I l'oma ameliorà ij sugeriment d'arserca për portelo pi an pressa a la pàgina ch'a sërca.
-* '''Àutre possibilità neuve:''' I l'oma ëdcò giontà n'assistent për le tàule për rende pì bel fé creé e trové le tàule e na possibilità ëd rimpiass për semplifiché la modìfica ëd le pàgine.",
+* '''Àutre possibilità neuve:''' I l'oma ëdcò giontà n'assistent për le tàule për rende pì bel fé creé e trové le tàule e na possibilità ëd rimpiass për semplifiché la modìfica ëd le pàgine.
+* '''Wikipedia puzzle globe''': I l'oma modificà ël puzzle globe. Les ëd pi an sël [http://blog.wikimedia.org/2010/05/13/wikipedi... blog ëd Wikimedia].",
+	'prefswitch-main-anon' => '===Pòrtme andré===
+S\'it veule disabilité le neuve funsionalità, <span class="plainlinks">[$1 sgnaca sì]</span>. At sarà ciamà d\'intré o ëd creé prima un cont.',
 	'prefswitch-main-on' => '===Sugeriment?===
 An piasrìa sente soa opinion. Për piasì, ch\'a vìsita nòstra <span class="plainlinks">[$1 pàgina dij coment]</span>.
 ===Porteme andré===
 S\'a veul disativé le possibilità neuve, për piasì <span class="plainlinks">[$2 ch\'a sgnaca ambelessì]</span>.',
 	'prefswitch-main-off' => '===Preuvje!===
 S\'it veule ativé le possibilità neuve, për piasì <span class="plainlinks">[$1 sgnaca ambelessì]</span>.',
-	'prefswitch-survey-intro-feedback' => "An piasrìa sente soa opinion.
-Për piasì, ch'a ampinissa ël sondagi opsional sì-sota.",
-	'prefswitch-survey-intro-off' => "Mersì ëd prové nòstre neuve fonsionalità.
-Për giutene a amelioreje, për piasì ch'a ampinissa ël sondagi opsional sì-sota.",
+	'prefswitch-survey-intro-feedback' => 'An piasrìa sente soa opinion.
+Për piasì, ch\'a ampinissa ël sondagi opsional sì-sota an sgnacand "[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]".',
+	'prefswitch-survey-intro-off' => 'Mersì ëd prové nòstre neuve funsionalità.
+Për giutene a amelioreje, për piasì ch\'a ampinissa ël sondagi opsional sì-sota an sgnacand "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]".',
 );+/** Pashto (پښتو)
+ * @author Ahmed-Najib-Biabani-Ibrahimkhel
+ */
+$messages['ps'] = array(
+	'prefswitch-survey-true' => 'هو',
+	'prefswitch-survey-false' => 'نه',
+	'prefswitch-title-switched-off' => 'مننه',
+);
+
 /** Portuguese (Português)
  * @author Giro720
  * @author Hamilton Abreu
@@ -2231,27 +2464,27 @@
 	'prefswitch-survey-cancel-feedback' => 'Se não quiser fazer um comentário, pode voltar à $1.',
 	'prefswitch-survey-question-like' => 'De que coisas gostou nas funcionalidades novas?',
 	'prefswitch-survey-question-dislike' => 'De que coisas não gostou nas funcionalidades novas?',
-	'prefswitch-survey-question-whyoff' => 'Por que é que quer desligar as novas funcionalidades?
-Seleccione todas as opções que se aplicam, por favor.',
-	'prefswitch-survey-answer-whyoff-hard' => 'As funcionalidades foram demasiado difíceis de utilizar.',
-	'prefswitch-survey-answer-whyoff-didntwork' => 'As funcionalidades não funcionam correctamente.',
-	'prefswitch-survey-answer-whyoff-notpredictable' => 'As funcionalidades não tiveram o comportamento esperado.',
+	'prefswitch-survey-question-whyoff' => 'Pode é que quer desligar as novas funcionalidades?
+Seleccione todas as opções aplicáveis.',
+	'prefswitch-survey-answer-whyoff-hard' => 'Foi demasiado difícil de utilizar.',
+	'prefswitch-survey-answer-whyoff-didntwork' => 'Não funcionou correctamente.',
+	'prefswitch-survey-answer-whyoff-notpredictable' => 'Não funciona da forma espectável.',
 	'prefswitch-survey-answer-whyoff-didntlike-look' => 'Não gostei da aparência.',
-	'prefswitch-survey-answer-whyoff-didntlike-layout' => 'Não gostei dos novos separadores e da disposição dos elementos na página. \\',
+	'prefswitch-survey-answer-whyoff-didntlike-layout' => 'Não gostei dos novos separadores e da disposição dos elementos na página.',
 	'prefswitch-survey-answer-whyoff-didntlike-toolbar' => 'Não gostei da nova barra de ferramentas.',
 	'prefswitch-survey-answer-whyoff-other' => 'Outro motivo:',
 	'prefswitch-survey-question-browser' => 'Qual é o browser que usa?',
 	'prefswitch-survey-answer-browser-other' => 'Outro browser:',
 	'prefswitch-survey-question-os' => 'Qual é o sistema operativo que usa?',
 	'prefswitch-survey-answer-os-other' => 'Outro sistema operativo:',
-	'prefswitch-survey-question-res' => 'Qual é a resolução do seu ecrã?',
+	'prefswitch-survey-question-res' => 'Qual é a resolução do seu monitor?',
 	'prefswitch-title-on' => 'Funcionalidades novas',
-	'prefswitch-title-switched-on' => 'Disfrute!',
+	'prefswitch-title-switched-on' => 'Desfrute!',
 	'prefswitch-title-off' => 'Desligar novas funcionalidades',
 	'prefswitch-title-switched-off' => 'Obrigado',
 	'prefswitch-title-feedback' => 'Comentário',
-	'prefswitch-success-on' => 'As funcionalidades novas estão agora activadas. Esperamos que goste de usá-las. Pode voltar a desactivá-las em qualquer altura, clicando o link "[[Special:UsabilityInitiativePrefSwitch|Voltar atrás]]" no topo da página.',
-	'prefswitch-success-off' => 'As funcionalidades novas estão agora desactivadas. Obrigado por tê-las experimentado. Pode voltar a activá-las em qualquer altura, clicando o link "[[Special:UsabilityInitiativePrefSwitch|Funcionalidades novas]]" no topo da página.',
+	'prefswitch-success-on' => 'As funcionalidades novas estão agora activadas. Esperamos que goste de usá-las. Pode voltar a desactivá-las em qualquer altura, clicando o link "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]" no topo da página.',
+	'prefswitch-success-off' => 'As funcionalidades novas estão agora desactivadas. Obrigado por tê-las experimentado. Pode voltar a activá-las em qualquer altura, clicando o link "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]" no topo da página.',
 	'prefswitch-success-feedback' => 'O seu comentário foi enviado.',
 	'prefswitch-return' => '<hr style="clear:both">
 Voltar para <span class="plainlinks">[$1 $2]</span>.',
@@ -2275,17 +2508,52 @@
 ===Voltar atrás!===
 Se quiser desligar as funcionalidades novas <span class="plainlinks">[$2 clique aqui]</span>, por favor.',
 	'prefswitch-main-off' => '===Experimente-as!===
-Se quiser desligar as funcionalidades novas <span class="plainlinks">[$1 clique aqui]</span>, por favor.',
+Se quiser activar as funcionalidades novas <span class="plainlinks">[$1 clique aqui]</span>, por favor.',
 	'prefswitch-survey-intro-feedback' => 'Gostariamos de saber a sua opinião.
 Preencha o questionário opcional abaixo, antes de clicar "[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]", por favor.',
 	'prefswitch-survey-intro-off' => 'Obrigado por ter experimentado as funcionalidades novas.
 Para ajudar-nos a melhorá-las preencha, por favor, o questionário opcional abaixo, antes de clicar "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]".',
+	'prefswitch-feedbacklink' => 'Wikipedia:Feedback de experiência de usuário',
 ); /** Brazilian Portuguese (Português do Brasil)
  * @author Giro720
  */
 $messages['pt-br'] = array(
+	'prefswitch' => 'Preferências da Iniciativa de Usabilidade',
+	'prefswitch-desc' => 'Permitir que os utilizadores mudem conjuntos de preferências',
+	'prefswitch-survey-true' => 'Sim',
+	'prefswitch-survey-false' => 'Não',
+	'prefswitch-survey-submit-off' => 'Desligar as funcionalidades novas',
+	'prefswitch-survey-cancel-off' => 'Se quiser continuar a usar as novas funcionalidades, você pode voltar à $1.',
+	'prefswitch-survey-submit-feedback' => 'Enviar comentário',
+	'prefswitch-survey-cancel-feedback' => 'Se não quiser fazer um comentário, pode voltar à $1.',
+	'prefswitch-survey-question-like' => 'De que coisas gostou nas funcionalidades novas?',
+	'prefswitch-survey-question-dislike' => 'De que coisas não gostou nas funcionalidades novas?',
+	'prefswitch-survey-question-whyoff' => 'Por que você está desligando as novas funcionalidades?
+Selecione todas as opções que se aplicam, por favor.',
+	'prefswitch-survey-answer-whyoff-hard' => 'As funcionalidades eram muito difíceis de utilizar.',
+	'prefswitch-survey-answer-whyoff-didntwork' => 'As funcionalidades não funcionaram corretamente.',
+	'prefswitch-survey-answer-whyoff-notpredictable' => 'As funcionalidades não tiveram o comportamento esperado.',
+	'prefswitch-survey-answer-whyoff-didntlike-look' => 'Não gostei da aparência.',
+	'prefswitch-survey-answer-whyoff-didntlike-layout' => 'Não gostei dos novos separadores e da disposição dos elementos na página.',
+	'prefswitch-survey-answer-whyoff-didntlike-toolbar' => 'Não gostei da nova barra de ferramentas.',
+	'prefswitch-survey-answer-whyoff-other' => 'Outro motivo:',
+	'prefswitch-survey-question-browser' => 'Qual é o navegador que você utiliza?',
+	'prefswitch-survey-answer-browser-other' => 'Outro navegador:',
+	'prefswitch-survey-question-os' => 'Qual é o sistema operacional que você usa?',
+	'prefswitch-survey-answer-os-other' => 'Outro sistema operacional:',
+	'prefswitch-survey-question-res' => 'Qual é a resolução do seu monitor?',
+	'prefswitch-title-on' => 'Funcionalidades novas',
+	'prefswitch-title-switched-on' => 'Desfrute!',
+	'prefswitch-title-off' => 'Desligar novas funcionalidades',
+	'prefswitch-title-switched-off' => 'Obrigado',
+	'prefswitch-title-feedback' => 'Comentários',
+	'prefswitch-success-on' => 'As funcionalidades novas estão agora ativadas. Esperamos que goste de usá-las. Você pode desativá-las a qualquer momento, clicando no link "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]" no topo da página.',
+	'prefswitch-success-off' => 'As funcionalidades novas estão agora desativadas. Obrigado por tê-las experimentado. Pode voltar a ativá-las em qualquer momento, clicando no link "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]" no topo da página.',
+	'prefswitch-success-feedback' => 'O seu comentário foi enviado.',
+	'prefswitch-return' => '<hr style="clear:both">
+Voltar para <span class="plainlinks">[$1 $2]</span>.',
 	'prefswitch-main' => "Temos trabalhado arduamente para facilitar a utilização do nosso software. É com prazer que agora partilhamos alguns melhoramentos, incluindo uma nova aparência e a simplificação das funcionalidades de edição. Melhorar a usabilidade dos nossos projetos é uma prioridade para a Wikimedia Foundation e mais alterações serão comunicadas no futuro. Para mais detalhes, visite esta [http://blog.wikimedia.org/2010/05/13/a-new-lo... publicação no blogue Wikimedia]. [[File:UsabilityNavigation.png|right|link=|Imagem da nova navegação]]
@@ -2298,6 +2566,18 @@
 * '''Melhoramentos da pesquisa:''' Melhoramos as sugestões da pesquisa para levá-lo mais rapidamente à página que procura.
 * '''Outras funcionalidades novas:''' Também introduzimos um assistente para facilitar a criação de tabelas, e a funcionalidade de procura e substituição para simplificar a edição de páginas.
 * '''Globo quebra-cabeça da Wikipédia:''' Atualizamos o globo em forma de quebra-cabeça. Leia mais sobre a atualização no [http://blog.wikimedia.org/2010/05/13/wikipedi... blogue Wikimedia].",
+	'prefswitch-main-anon' => '===Voltar atrás===
+Se pretende desativar as funcionalidades novas, <span class="plainlinks">[$1 clique aqui]</span>. Será pedido que se autentique ou crie uma conta.',
+	'prefswitch-main-on' => '===Opinião?===
+Gostaríamos de saber a sua opinião. Visite a nossa <span class="plainlinks">[$1 página de comentários]</span>, por favor.
+===Voltar atrás!===
+Se quiser desligar as funcionalidades novas <span class="plainlinks">[$2 clique aqui]</span>, por favor.',
+	'prefswitch-main-off' => '===Experimente-as!===
+Se você quiser ativar as funcionalidades novas <span class="plainlinks">[$1 clique aqui]</span>, por favor.',
+	'prefswitch-survey-intro-feedback' => 'Gostaríamos de saber a sua opinião.
+Preencha o questionário opcional abaixo, antes de clicar "[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]", por favor.',
+	'prefswitch-survey-intro-off' => 'Obrigado por ter experimentado as funcionalidades novas.
+Para ajudar-nos a melhorá-las preencha, por favor, o questionário opcional abaixo, antes de clicar "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]".',
 ); /** Russian (Русский)
@@ -2363,8 +2643,31 @@
 Пожалуйста, ответьте на несколько необязательных вопросов ниже, прежде чем нажмёте «[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]».',
 	'prefswitch-survey-intro-off' => 'Спасибо, что опробовали новые возможности.
 Чтобы помочь нам улучшить их, пожалуйста, ответьте на несколько необязательных вопросов, прежде чем нажмёте «[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]».',
+	'prefswitch-feedbackpage' => 'Википедия:Отзывы о новом оформлении',
 );+/** Sardinian (Sardu)
+ * @author Andria
+ */
+$messages['sc'] = array(
+	'prefswitch-survey-true' => 'Eja',
+	'prefswitch-survey-answer-whyoff-other' => 'Àteru motivu:',
+	'prefswitch-survey-answer-browser-other' => 'Àteru browser:',
+	'prefswitch-title-switched-off' => 'Gràtzias',
+);
+
+/** Sinhala (සිංහල)
+ * @author බිඟුවා
+ */
+$messages['si'] = array(
+	'prefswitch-survey-true' => 'ඔව්',
+	'prefswitch-survey-false' => 'නැත',
+	'prefswitch-survey-answer-whyoff-other' => 'වෙනත් හේතුවක්:',
+	'prefswitch-survey-question-browser' => 'ඔබ භාවිතා කරන්නේ කුමන බ්‍රවුසරයද?',
+	'prefswitch-survey-answer-browser-other' => 'අනෙක් බ්‍රවුසරය:',
+	'prefswitch-title-switched-off' => 'ස්තුතියි',
+);
+
 /** Slovak (Slovenčina)
  * @author Helix84
  */
@@ -2422,11 +2725,32 @@
 Da nam jih pomagate izboljšati, prosimo izpolnite neobvezno anketo spodaj, preden kliknete »[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]«.',
 );+/** Serbian Cyrillic ekavian (Српски (ћирилица))
+ * @author Михајло Анђелковић
+ */
+$messages['sr-ec'] = array(
+	'prefswitch-survey-true' => 'Да',
+	'prefswitch-survey-false' => 'Не',
+	'prefswitch-survey-answer-whyoff-other' => 'Други разлог:',
+	'prefswitch-survey-question-browser' => 'Који браузер користите?',
+	'prefswitch-survey-answer-browser-other' => 'Други браузер:',
+	'prefswitch-survey-question-os' => 'Који оперативни систем користите?',
+	'prefswitch-survey-answer-os-other' => 'Други оперативни систем:',
+	'prefswitch-survey-question-res' => 'Која је резолуција Вашег екрана?',
+	'prefswitch-title-on' => 'Нове могућности',
+	'prefswitch-title-switched-on' => 'Уживајте!',
+	'prefswitch-title-off' => 'Искључи нове могућности',
+	'prefswitch-title-switched-off' => 'Хвала',
+);
+
 /** Swedish (Svenska)
  * @author Ainali
+ * @author Boivie
  * @author Dafer45
  */
 $messages['sv'] = array(
+	'prefswitch' => 'Preferensväljare för Användbarhetsiniativet.',
+	'prefswitch-desc' => 'Tillåt användare att byta uppsättningar av preferenser',
 	'prefswitch-survey-true' => 'Ja',
 	'prefswitch-survey-false' => 'Nej',
 	'prefswitch-survey-submit-off' => 'Stäng av de nya funktionerna',
@@ -2458,6 +2782,18 @@
 	'prefswitch-success-off' => 'De nya funktionerna är nu avstängda. Tack för att du provade dessa. Du kan alltid sätta på dem igen genom att klicka på "[[Special:UsabilityInitiativePrefSwitch|nya funktioner]]" längst upp på sidan.',
 	'prefswitch-success-feedback' => 'Dina kommentarer har skickats.',
 	'prefswitch-return' => '<hr style="clear:both"> Återgå till <span class="plainlinks">[$1 $2].</span>',
+	'prefswitch-main' => "Vi har arbetat hårt för att göra det lättare för våra användare. Vi är glada över att kunna dela vissa förbättringar, inklusive ett nytt utseende och enklare redigeringsfunktioner. Att förbättra användbarheten för våra projekt är en prioritet för Wikimedia Foundation och vi kommer att göra fler uppdateringar i framtiden. För mer information, besök den relaterade [http://blog.wikimedia.org/2010/05/13/a-new-lo... Wikimedia blogg]-inlägget.
+
+[[File:UsabilityNavigation.png|right|link=|Skärmdump av den nya navigeringen]]
+[[File:UsabilityToolbar.png|right|link=|Skärmdump av det utökade redigeringsverktygsfältet]]
+[[File:UsabilityDialogs.png|right|link=|Skärmdump av de nya dialogrutorna för innehållsskapande]]
+===Detta är vad vi har ändrat===
+* '''Navigering''': Vi har förbättrat navigeringen för att läsa och redigera sidor. Nu definierar flikarna högst upp på varje sida tydligare om du tittar på sidan eller diskussionssidan, och om du läser eller redigerar en sida.
+* '''Förbättringar av redigeringsverktygsfältet''': Vi har omorganiserat redigeringsverktygsfältet att göra det lättare att använda. Nu är sidformatering enklare och mer intuitiv.
+* '''Länk-guiden''': Ett lättanvänt verktyg låter dig lägga till länkar till andra wiki-sidor samt länkar till externa webbplatser.
+* '''Sökningsförbättringar''': Vi har förbättrat sökförslag att snabbare få dig till den sida du söker.
+* '''Andra nya funktioner''': Vi har också infört en tabellguide för att göra tabellskapande lättare och en sök-och-ersätt-funktion för att förenkla sidredigering.
+* '''Wikipedia pussel-jordglob''': Vi har uppdaterat pusselgloben. Läs mer på [ttp://blog.wikimedia.org/2010/05/13/wikipedia-in-3d/ Wikimedia-bloggen].",
 	'prefswitch-main-anon' => '=== Ta Mig Tillbaka ===
 Om du vill stänga av de nya funktionerna, <span class="plainlinks">[$1 klicka här]</span>. Du blir ombedd att logga in eller skapa ett konto först.',
 	'prefswitch-main-on' => '===Feedback?===
@@ -2467,9 +2803,9 @@
 	'prefswitch-main-off' => '===Testa dem!===
 Om du vill slå på de nya funktioner, vänligen <span class="plainlinks">[$1 klicka här].</span>',
 	'prefswitch-survey-intro-feedback' => 'Vi vill gärna höra din åsikt.
-Vänligen fyll i den valfria undersökningen nedan.',
+Vänligen fyll i den frivilliga undersökningen nedan innan du klickar på "[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]".',
 	'prefswitch-survey-intro-off' => 'Tack för att du testar de nya funktionerna.
-Var vänlig och fyll i den valfria undersökningen nedan för att hjälpa oss göra dem bättre.',
+För att hjälpa oss förbättra dem, var vänlig och fyll i den frivilliga undersökningen nedan innan du klickar på "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]".',
 ); /** Telugu (తెలుగు)
@@ -2500,13 +2836,77 @@
 	'prefswitch-return' => '<hr style="clear:both">
 తిరిగి <span class="plainlinks">[$1 $2]</span>కి.',
 	'prefswitch-main-on' => '===సలహాలూ, సూచనలూ?===
-మేం మీ నుండి వినాలనుకుంటున్నాం.  దయచేసి మా <span class="plainlinks">[$1 ప్రతిస్పందన పుట]ని సందర్శించండి</span>.
+మేం మీ నుండి వినాలనుకుంటున్నాం.  దయచేసి మా [$1 ప్రతిస్పందన పుట]ని సందర్శించండి లేదా, సాఫ్ట్‌వేర్‌ని మెరుగుపరిచే మా ప్రయత్నాలలో మీకు ఆసక్తి ఉంటే, మరింత సమాచారం కోసం మా [http://usability.wkimedia.org ఉపయోగ్యత వికీ]ని సందర్శించండి.
 ===నన్ను వెనక్కి తీసుకెళ్ళు!===
 ఒకవేళ మీరు కొత్త సౌలభ్యాలని నిలిపివేసుకోవాలనుకుంటే, దయచేసి <span class="plainlinks">[$2 ఇక్కడ నొక్కండి]</span>.',
 	'prefswitch-main-off' => '===వాటిని ఉపయోగించి చూడండి!===
 మీరు కొత్త సౌలభ్యాలని చూడాలనుకుంటే, దయచేసి <span class="plainlinks">[$1 ఇక్కడ నొక్కండి]</span>.',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'prefswitch' => 'Pindutan ng nais sa Pampanimula ng Pagkanagagamit',
+	'prefswitch-desc' => 'Pahintulutan ang mga tagagamit na magpalit ng mga pangkat ng mga nais',
+	'prefswitch-survey-true' => 'Oo',
+	'prefswitch-survey-false' => 'Huwag',
+	'prefswitch-survey-submit-off' => 'Huwag buhayin ang bagong mga katasangkapang-katangian',
+	'prefswitch-survey-cancel-off' => 'Kung nais mong magpatuloy sa paggamit ng bagong mga kasangkapang-katangian, maaaring kang magbalik sa $1.',
+	'prefswitch-survey-submit-feedback' => 'Magpadala ng pabalik-sabi',
+	'prefswitch-survey-cancel-feedback' => 'Kung ayaw mong magbigay ng balik-puna, maaaring kang magbalik sa $1.',
+	'prefswitch-survey-question-like' => 'Ano ang nagustuhan mo tungkol sa bagong mga kasangkapang-katangian?',
+	'prefswitch-survey-question-dislike' => 'Ano ang hindi mo naibigan tungkol sa mga kasangkapang-katangian?',
+	'prefswitch-survey-question-whyoff' => 'Bakit mo hindi binubuhay ang bagong mga kasangkapang-katangian?
+Mangyaring piliin ang lahat ng maaari.',
+	'prefswitch-survey-answer-whyoff-hard' => 'Napakahirap gamitin ng mga kasangkapang-katangian.',
+	'prefswitch-survey-answer-whyoff-didntwork' => 'Hindi gumandar ng maayos ang mga kasangkapang-katangian.',
+	'prefswitch-survey-answer-whyoff-notpredictable' => 'Hindi maaasahan ang pagganap ng mga kasangkapang-katangian.',
+	'prefswitch-survey-answer-whyoff-didntlike-look' => 'Hindi ko nagustuhan ang hitsura ng mga kasangkapang-katangian.',
+	'prefswitch-survey-answer-whyoff-didntlike-layout' => 'Hindi ko gusto ang bagong mga panglaylay at pagkakaayos.',
+	'prefswitch-survey-answer-whyoff-didntlike-toolbar' => 'Hindi ko nagustuhan ang bagong kahong ng kasangkapan.',
+	'prefswitch-survey-answer-whyoff-other' => 'Ibang dahilan:',
+	'prefswitch-survey-question-browser' => 'Anong pantingin-tingin ang ginagamit mo?',
+	'prefswitch-survey-answer-browser-other' => 'Ibang pantingin-tingin:',
+	'prefswitch-survey-question-os' => 'Anong sistema ng pagpapaandar ang ginagamit mo?',
+	'prefswitch-survey-answer-os-other' => 'Ibang sistemang pampaandar:',
+	'prefswitch-survey-question-res' => 'Ano ang resolusyon ng iyong tanawan?',
+	'prefswitch-title-on' => 'Bagong mga kasangkapang-katangian',
+	'prefswitch-title-switched-on' => 'Lasapin!',
+	'prefswitch-title-off' => 'Huwag buhayin ang bagong mga katasangkapang-katangian',
+	'prefswitch-title-switched-off' => 'Salamat',
+	'prefswitch-title-feedback' => 'Balik-sabi',
+	'prefswitch-success-on' => 'Binuhay na ang bagong mga kasangkapang-katangian.  Umaasa kaming masisiyahan ka sa paggamit ng bagong mga tampok.  Palaging maaari mong huwag buhayin ang mga ito sa pamamagitan ng pagpindot sa kawing na "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]" na nasa itaas ng pahina.',
+	'prefswitch-success-off' => 'Hindi na binuhay ang mga kasangkapang-katangian.  Salamat sa pagsubok mo ng bagong mga tampok.  Palaging maaari mong silang buhaying muli sa pamamagitan ng pagpindot ng kawing na "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]" na nasa itaas ng pahina.',
+	'prefswitch-success-feedback' => 'Naipadala na ang iyong pabalik-sabi.',
+	'prefswitch-return' => 'Bumalik sa <span class="plainlinks">[$1 $2]</span>.',
+	'prefswitch-main' => "Nasusumikap kami upang mapaginhawa ang mga bagay para sa aming mga tagagamit.  Nasasabik kaming ipamahagi ang ilang mga pagpapainam, kabilang ang isang bagong pagmumukha at pinapayak na mga kasangkapang-katangian sa pamamatnugot.  Ang pagpapaigi ng pagkanagagamit ng aming mga proyekto ang inuuna ng Pundasyong Wikimedia at magpapamahagi pa kami ng marami pang mga pagsasapanahon sa hinaharap.  Para sa mas marami pang mga detalye, dumalaw sa kaugnay na paskil sa [http://blog.wikimedia.org/2010/05/13/a-new-lo... Blog ng Wikimedia].
+
+[[File:UsabilityNavigation.png|right|link=|Larawan ng bagong panlibot]]
+[[File:UsabilityToolbar.png|right|link=|Larawan ng pinainam na kahong ng kasangkapan na pampatnugot]]
+[[File:UsabilityDialogs.png|right|link=|Larawan ng bagong mga salitaan na panglikha ng bagong nilalaman]]
+===Naririto ang mga binago namin===
+===Here's what we have changed===
+* '''Panglibot''': Pinainam namin ang nabigasyon para sa pagbasa at pagbago ng mga pahina. Ngayon, mas malinaw na nilalarawan ng mga panglaylay na nasa itaas ng bawat pahina kung tinitingnan ba ang pahina o isang pahina ng usapan, at kung binabasa mo ba o binabago ang isang pahina.
+* '''Mga pagpapainam ng kahon ng kasangkapan na pampatnugot''':  Muli naming inayos ang kahon ng kasangkapan na pampatnugot upang maging mas maginhawa ang paggamit nito.  Ngayon, mas payak na ang pag-aayos ng pahina at mas mapangpadama.
+* '''Mahiwagang kawing''':  Isang kasangkapang madaling gamitin na nagpapahintulot sa iyo na magdagdag ng mga kawing sa iba pang mga pahina ng wiki pati na mga kawing sa mga sityong nasa labas.
+* '''Mga pagpapainam sa paghahanap''': Pinainam namin ang mga mungkahi sa paghahanap upang mas mabilis kang makapunta sa pahinang hinahanap mo.
+* '''Iba pang bagong mga kasangkapang-katangian''':  Ipinakilala rin namin ang isang mahiwagang tabla upang maging maginhawa ang paggawa ng mga tabla at kasangkapang-katangiang panghanap at pampalit upang mapapayak ang pagbago sa pahina.
+* '''Palaisipang globo ng Wikipedia''': Isinapanahon namin ang palaisipang globo. Magbasa pa ng marami sa [http://blog.wikimedia.org/2010/05/13/wikipedi...  Blog ng Wikimedia].",
+	'prefswitch-main-anon' => '===Ibalik ako===
+Kung nais mong patayin ang bagong mga kasangkapang-katangian, <span class="plainlinks">[$1 pindutin dito]</span>. Hihilingin sa iyong lumagda ka o lumikha muna ng isang akawnt.',
+	'prefswitch-main-on' => '===Balik-sabi?===
+Ibig naming makarinig mula sa iyo.  Mangyaring dalawin ang aming span class="plainlinks">[$1 pahina ng pabalik-sabi]</span>.
+===Ibalik ako!===
+Kung nais mong huwag buhayin ang bagong mga kasangkapang-katangian, paki <span class="plainlinks">[$2 pindot dito]</span>.',
+	'prefswitch-main-off' => '===Subukin ang mga ito!=== 
+Kung nais mong buhayin ang mga bagong kasangkapang-katangian, mangyaring <span class="plainlinks">[$1 pindutin  dito].</span>',
+	'prefswitch-survey-intro-feedback' => 'Ibig naming marinig ka.
+Mangyaring sulatan ang maaaring hindi saguting pangangalap na nasa ibaba bago pindutin ang "[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]".',
+	'prefswitch-survey-intro-off' => 'Salamat sa pagsubok ng bago naming mga kasangkapang-katangian.
+Upang makatulong sa pagpapainam ng mga ito, mangyaring sulatan ang maaaring walang pangangalap na nasa ibaba bago pindutin ang "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]".',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  */
@@ -2519,6 +2919,8 @@
 	'prefswitch-survey-cancel-off' => 'Yeni özellikleri kullanmaya devam etmek isterseniz, $1 sayfasına geri dönebilirsiniz.',
 	'prefswitch-survey-submit-feedback' => 'Geribildirim verin',
 	'prefswitch-survey-cancel-feedback' => 'Eğer geribildirim vermek istemiyorsanız, $1 sayfasına geri dönebilirsiniz.',
+	'prefswitch-survey-question-like' => 'Yeni özellikler hakkında neleri sevdiniz?',
+	'prefswitch-survey-question-dislike' => 'Özellikler hakkında neleri sevmediniz?',
 	'prefswitch-survey-question-whyoff' => 'Neden yeni özellikleri kapatıyorsunuz?
 Lütfen uygun olanları seçin.',
 	'prefswitch-survey-answer-whyoff-hard' => 'Kullanımı çok zor.',
@@ -2543,6 +2945,30 @@
 	'prefswitch-success-feedback' => 'Geribildiriminiz gönderildi.',
 	'prefswitch-return' => '<hr style="clear:both">
 <span class="plainlinks">[$1 $2]</span> sayfasına geri dön.',
+	'prefswitch-main' => "Kullanıcılarımıza işleri kolaylaştırmak için çok çalışıyoruz. Yeni bir görünüm ve his ve basitleşitirlmiş değişiklik özelliklerini de içeren bazı geliştirmeleri paylaşmaktan heyecan duyuyoruz. Projelerimizi kullanılabilirliğini geliştirmek Vikimedya Kuruluşunun önceliği ve gelecekte de daha fazla güncelleme paylaşacağız. Daha fazla detay için, ilgili [http://blog.wikimedia.org/2010/05/13/a-new-lo... Vikimedya blog] gönderisini ziyaret edin.
+
+[[File:UsabilityNavigation.png|right|link=|Yeni dolaşım ekran görüntüsü]]
+[[File:UsabilityToolbar.png|right|link=|Geliştirilmiş değişiklik araç çubuğu ekran görüntüsü]]
+[[File:UsabilityDialogs.png|right|link=|Yeni içerik oluşturma diyalogları ekran görüntüsü]]
+===İşte değiştirdiklerimiz===
+* '''Dolaşım''': Sayfaları okurken ve değiştirirken dolaşımı iyileştirdik. Artık her sayfanın en üstündeki sekme sayfayı mı tartışma sayfasını mı görüntülediğinizi ya da değiştirdiğinizi açıkça belirtiyor.
+* '''Değişiklik araç çubuğu geliştirmeleri''':  Değişiklik araç çubuğunu kolay kullanım için yeniden düzenledik. Artık sayfalar daha basit ve sezgili.
+* '''Bağlantı sihirbazı''':  Diğer viki sayfalarına ve dış sitelere bağlantı eklemenizi sağlayan kolay kullanılabilir bir araç.
+* '''Arama geliştirmeleri''': Aradığınız sayfaya daha çabuk ulaşmanız için arama önerilerini iyileştirdik.
+* '''Diğer yeni özellikler''':  Kolay tablo oluşturmak için bir tablo sihirbazı ve sayfa değiştirmeyi kolaylaştıran bul ve değiştir özelliği sunuyoruz.
+* '''Vikipedi bulmaca küresi''': Bulmaca küresini güncelleştirdik. [http://blog.wikimedia.org/2010/05/13/wikipedi...  Vikimedya bloğunda] daha fazlasını okuyun.",
+	'prefswitch-main-anon' => '===Beni geri götür===
+Eğer yeni özellikleri kapatmak isterseniz, <span class="plainlinks">[$1 buraya tıklayın]</span>. Öncelikle giriş yapmanız veya bir hesap oluşturmanız istenecektir.',
+	'prefswitch-main-on' => '===Geridönüt?===
+Sizi dinlemek isteriz. Lütfen <span class="plainlinks">[$1 geridönüt sayfamızı]</span> ziyaret edin.
+===Beni geri götür!===
+Eğer yeni özellikleri kapatmak isterseniz, lütfen <span class="plainlinks">[$2 buraya tıklayın]</span>.',
+	'prefswitch-main-off' => '===Deneyin!===
+Yeni özellikleri açmak için lütfen <span class="plainlinks">[$1 buraya tıklayın]</span>.',
+	'prefswitch-survey-intro-feedback' => 'Sizi dinlemek isteriz.
+Lütfen "[[#prefswitch-survey-submit-feedback|{{int:Prefswitch-survey-submit-feedback}}]]" bağlantısına tıklamadan önce aşağıdaki isteğe bağlı anketimizi doldurun.',
+	'prefswitch-survey-intro-off' => 'Yeni özellikleri denediğiniz için teşekkürler.
+Bunları geliştirmemize yardımcı olmak için, lütfen "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]" bağlantısına tıklamadan önce aşağıdaki isteğe bağlı anketimizi doldurun.',
 ); /** Ukrainian (Українська)
@@ -2618,6 +3044,31 @@
 Để giúp chúng tôi cải tiến chúng hơn nữa, xin vui lòng điền vào bảng điều tra phía dưới trước khi bấm “[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]”.',
 );+/** Yiddish (ייִדיש)
+ * @author פוילישער
+ */
+$messages['yi'] = array(
+	'prefswitch-survey-true' => 'יא',
+	'prefswitch-survey-false' => 'ניין',
+	'prefswitch-survey-answer-whyoff-other' => 'אַנדער טעם:',
+	'prefswitch-survey-question-browser' => 'וועלכן בלעטערער ניצט איר?',
+	'prefswitch-survey-answer-browser-other' => 'אנדער בלעטערער:',
+	'prefswitch-survey-question-os' => 'וועלכע אפערירן סיסטעם ניצט איר?',
+	'prefswitch-survey-answer-os-other' => 'אנדער אפערירן סיסטעם:',
+	'prefswitch-survey-question-res' => 'וואָס איז די רעזאלוציע פֿון אײַער עקראַן?',
+	'prefswitch-title-on' => 'נײַע אייגנשאַפֿטן',
+	'prefswitch-title-switched-on' => 'האט הנאה!',
+	'prefswitch-title-off' => 'אַנולירן נ ײַע אייגנקייטן',
+	'prefswitch-title-switched-off' => 'א דאַנק',
+	'prefswitch-title-feedback' => 'פֿידבעק',
+	'prefswitch-success-on' => 'די נײַע אייגנקייטן זענען איצט אַקטיוו. מיר האָפן איר וועט האָבן הנאה פֿון ניצן די נײַע אייגנקייטן. איר קענט שטענדיק צוריקווענדן דורך געבן אַ קליק אויף דעם "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]" לינק אין דער הייך פונעם בלאַט.',
+	'prefswitch-success-feedback' => "מ'האט געשיקט אײַער פֿידבעק.",
+	'prefswitch-return' => '<hr style="clear:both">
+צוריק צו <span class="plainlinks">[$1 $2]</span>.',
+	'prefswitch-survey-intro-off' => 'א דאַנק פֿאַרן אויספרובירן אונזערע נײַע אייגנקייטן.
+בכדי צו העלפֿן אונז פֿאַרבעסערן זיי, זײַט אזוי גוט אויספֿילן דעם אפציאנאַלן אומפֿרעג אונטער איידער איר קליקט "[[#prefswitch-survey-submit-off|{{int:Prefswitch-survey-submit-off}}]]".',
+);
+
 /** Traditional Chinese (‪中文(繁體)‬)
  * @author Horacewai2
  */
@@ -2655,13 +3106,14 @@
 	'prefswitch-success-feedback' => '您的反饋已發送。',
 	'prefswitch-return' => '<hr style="clear:both">
 返回<span class="plainlinks">[$1 $2]</span>。',
-	'prefswitch-main' => "我們一直在努力使事情更容易為我們的用戶。我們很高興能夠分享一些改進,包括一個全新的外觀和簡化的編輯功能。提高可用性的一個優先項目是維基媒體基金會,我們將分享更多更新的未來。欲了解更多詳情,請訪問相關[http://blog.wikimedia.org/2010/05/13/a-new-lo...]職位。[[文件:UsabilityNavigation.png |右|友情鏈接= |截圖新的導航]] [[文件:UsabilityToolbar.png |權利|鏈接= |截圖編輯工具欄上的增強]] [[文件:UsabilityDialogs.png |權利|鏈接= |截圖新世代對話內容]] 
+	'prefswitch-main' => "我們一直在努力使事情更容易為我們的用戶。我們很高興能夠分享一些改進,包括一個全新的外觀和簡化的編輯功能。提高可用性的一個優先項目是維基媒體基金會,我們將分享更多更新的未來。欲了解更多詳情,請訪問相關[http://blog.wikimedia.org/2010/05/13/a-new-lo...]。[[file:UsabilityNavigation.png|right|link=|新的導航截圖]] [[file:UsabilityToolbar.png|right|link=|截圖編輯工具欄上的增強]] [[file:UsabilityDialogs.png|right|link=|新世代對話內容截圖]] 
 ===下面是我們改變了===
 [[File:UsabilityNavigation.png|right|link=|新導航]]
 [[File:UsabilityToolbar.png|right|link=|新編輯工具列]]
 [[File:UsabilityDialogs.png|right|link=|新內容精靈]]
 * '''導航''':我們已經改善了導航的閱讀和編輯網頁。現在,標籤上的每一頁的頂部更明確地界定你是否正在查看的頁或討論頁,以及你是否正在閱讀或編輯一個頁面。
-* '''編輯工具欄上的改善''':我們已經改組了編輯工具欄要更容易使用。現在,格式化網頁是更簡單,更直觀。* '''鏈接嚮導''':一個易於使用的工具可以讓你添加鏈接到其他維基頁面以及鏈接到外部網站。
+* '''編輯工具欄上的改善''':我們已經改組了編輯工具欄要更容易使用。現在,格式化網頁是更簡單,更直觀。
+* '''鏈接嚮導''':一個易於使用的工具可以讓你添加鏈接到其他維基頁面以及鏈接到外部網站。
 * '''搜索的改進''':我們有改進的搜索建議,讓你的網頁您正在尋找更迅速。
 * '''其他的新功能''':我們也推出了表嚮導,使創建表更容易,找一個替換功能來簡化頁面的編輯。
 * '''維基百科拼圖地球''':我們已經更新了世界標誌。閱讀更詳細的[http://blog.wikimedia.org/2010/05/13/wikipedi... 維基媒體基金會網誌]。",


Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/REL1_15/phase3/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php:51646
/branches/wmf-deployment/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php:60970
/trunk/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66331-66335,66337-66700
/trunk/phase3/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitchLink.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitchLink.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitchLink.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -31,6 +31,18 @@
 	'prefswitch-link-off' => 'A link in the personal tools menu which takes users to a page where they can turn the new features on',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'prefswitch-link-anon' => 'Tipare të reja',
+	'tooltip-pt-prefswitch-link-anon' => 'Mësoni rreth karakteristika të reja',
+	'prefswitch-link-on' => 'Merrni më mbrapa',
+	'tooltip-pt-prefswitch-link-on' => 'Disable karakteristika të reja',
+	'prefswitch-link-off' => 'Tipare të reja',
+	'tooltip-pt-prefswitch-link-off' => 'Provoni karakteristika të reja',
+);
+
 /** Arabic (العربية)
  * @author Meno25
  * @author OsamaK
@@ -79,8 +91,14 @@ /** Catalan (Català)
  * @author Paucabot
+ * @author Vriullop
  */
 $messages['ca'] = array(
+	'prefswitch-link-anon' => 'Noves característiques',
+	'tooltip-pt-prefswitch-link-anon' => 'Més informació sobre les noves característiques',
+	'prefswitch-link-on' => 'Torna-ho enrere',
+	'tooltip-pt-prefswitch-link-on' => 'Desactiva les noves característiques',
+	'prefswitch-link-off' => 'Noves característiques',
 	'tooltip-pt-prefswitch-link-off' => 'Proveu les noves funcions',
 );@@ -97,6 +115,18 @@
 	'tooltip-pt-prefswitch-link-off' => 'Vyzkoušejte nové funkce',
 );+/** Welsh (Cymraeg)
+ * @author Lloffiwr
+ */
+$messages['cy'] = array(
+	'prefswitch-link-anon' => 'Nodweddion newydd',
+	'tooltip-pt-prefswitch-link-anon' => 'Darllen am y nodweddion newydd',
+	'prefswitch-link-on' => 'Ewch â fi am nôl',
+	'tooltip-pt-prefswitch-link-on' => "Analluogi'r nodweddion newydd",
+	'prefswitch-link-off' => 'Nodweddion newydd',
+	'tooltip-pt-prefswitch-link-off' => 'Rhoi cynnig ar y nodweddion newydd',
+);
+
 /** German (Deutsch)
  * @author Kghbln
  */
@@ -113,6 +143,11 @@
  * @author Michawiki
  */
 $messages['dsb'] = array(
+	'prefswitch-link-anon' => 'Nowe funkcije',
+	'tooltip-pt-prefswitch-link-anon' => 'Wěcej wó nowych funkcijach zgóniś',
+	'prefswitch-link-on' => 'Slědk',
+	'tooltip-pt-prefswitch-link-on' => 'Nowe funkcije znjemóžniś',
+	'prefswitch-link-off' => 'Nowe funkcije',
 	'tooltip-pt-prefswitch-link-off' => 'Nowe funkcije wopytaś',
 );@@ -120,6 +155,11 @@
  * @author Απεργός
  */
 $messages['el'] = array(
+	'prefswitch-link-anon' => 'Καινούριες λειτουργίες',
+	'tooltip-pt-prefswitch-link-anon' => 'Ενημέρωση για καινούριες λειτουργίες',
+	'prefswitch-link-on' => 'Επιστροφή στις παλιές ρυθμίσεις',
+	'tooltip-pt-prefswitch-link-on' => 'Απενεργοποίηση καινούριων λειτουργιών',
+	'prefswitch-link-off' => 'Καινούριες λειτουργίες',
 	'tooltip-pt-prefswitch-link-off' => 'Δοκιμάστε καινούριες λειτουργίες',
 );@@ -129,6 +169,7 @@
 $messages['eo'] = array(
 	'prefswitch-link-anon' => 'Novaj ecoj',
 	'tooltip-pt-prefswitch-link-anon' => 'Lerni pri novaj ecoj',
+	'prefswitch-link-on' => 'Reveni al la antaŭa versio',
 	'tooltip-pt-prefswitch-link-on' => 'Malŝalti novajn ecojn',
 	'prefswitch-link-off' => 'Novaj ecoj',
 	'tooltip-pt-prefswitch-link-off' => 'Provi novajn funkciojn',
@@ -136,17 +177,30 @@ /** Spanish (Español)
  * @author Crazymadlover
+ * @author Muro de Aguas
  * @author Pertile
  */
 $messages['es'] = array(
 	'prefswitch-link-anon' => 'Nuevas características',
 	'tooltip-pt-prefswitch-link-anon' => 'Aprender acercadelasnuevas características',
-	'prefswitch-link-on' => 'Regresarme',
+	'prefswitch-link-on' => 'Volver a la versión anterior',
 	'tooltip-pt-prefswitch-link-on' => 'Deshabilitar nuevas características',
 	'prefswitch-link-off' => 'Nuevas características',
 	'tooltip-pt-prefswitch-link-off' => 'Probar las nuevas características',
 );+/** Estonian (Eesti)
+ * @author Pikne
+ */
+$messages['et'] = array(
+	'prefswitch-link-anon' => 'Uued funktsioonid',
+	'tooltip-pt-prefswitch-link-anon' => 'Lisateave uute funktsioonide kohta',
+	'prefswitch-link-on' => 'Tagasi',
+	'tooltip-pt-prefswitch-link-on' => 'Keela uued funktsioonid',
+	'prefswitch-link-off' => 'Uued funktsioonid',
+	'tooltip-pt-prefswitch-link-off' => 'Proovi uusi funktsioone',
+);
+
 /** Finnish (Suomi)
  * @author Crt
  */
@@ -200,6 +254,11 @@
  * @author Amire80
  */
 $messages['he'] = array(
+	'prefswitch-link-anon' => 'תכונות חדשות',
+	'tooltip-pt-prefswitch-link-anon' => 'מידע נוסף על התכונות החדשות',
+	'prefswitch-link-on' => 'תחזירו אותי',
+	'tooltip-pt-prefswitch-link-on' => 'ביטול התכונות החדשות',
+	'prefswitch-link-off' => 'תכונות חדשות',
 	'tooltip-pt-prefswitch-link-off' => 'לנסות תכונות חדשות',
 );@@ -207,6 +266,11 @@
  * @author Michawiki
  */
 $messages['hsb'] = array(
+	'prefswitch-link-anon' => 'Nowe funkcije',
+	'tooltip-pt-prefswitch-link-anon' => 'Wjace wo nowych funkcijach zhonić',
+	'prefswitch-link-on' => 'Wróćo',
+	'tooltip-pt-prefswitch-link-on' => 'Nowe funkcije znjemóžnić',
+	'prefswitch-link-off' => 'Nowe funkcije',
 	'tooltip-pt-prefswitch-link-off' => 'Nowe funkcije wupruwować',
 );@@ -214,6 +278,11 @@
  * @author Glanthor Reviol
  */
 $messages['hu'] = array(
+	'prefswitch-link-anon' => 'Új funkciók',
+	'tooltip-pt-prefswitch-link-anon' => 'Ismerd meg az új funkciókat',
+	'prefswitch-link-on' => 'Vissza a régire',
+	'tooltip-pt-prefswitch-link-on' => 'Az új funkciók letiltása',
+	'prefswitch-link-off' => 'Új funkciók',
 	'tooltip-pt-prefswitch-link-off' => 'Próbáld ki az új funkciókat',
 );@@ -221,6 +290,11 @@
  * @author McDutchie
  */
 $messages['ia'] = array(
+	'prefswitch-link-anon' => 'Nove functiones',
+	'tooltip-pt-prefswitch-link-anon' => 'Ulterior informationes super le nove functiones',
+	'prefswitch-link-on' => 'Porta me retro',
+	'tooltip-pt-prefswitch-link-on' => 'Disactivar le nove functiones',
+	'prefswitch-link-off' => 'Nove functiones',
 	'tooltip-pt-prefswitch-link-off' => 'Probar nove functiones',
 );@@ -228,6 +302,8 @@
  * @author Kenrick95
  */
 $messages['id'] = array(
+	'prefswitch-link-anon' => 'Fitur baru',
+	'prefswitch-link-off' => 'Fitur baru',
 	'tooltip-pt-prefswitch-link-off' => 'Coba fitur baru',
 );@@ -235,6 +311,11 @@
  * @author Una giornata uggiosa '94
  */
 $messages['it'] = array(
+	'prefswitch-link-anon' => 'Nuove funzionalità',
+	'tooltip-pt-prefswitch-link-anon' => 'Informazioni sulle nuove funzionalità',
+	'prefswitch-link-on' => 'Riportami indietro',
+	'tooltip-pt-prefswitch-link-on' => 'Disattiva le nuove funzionalità',
+	'prefswitch-link-off' => 'Nuove funzionalità',
 	'tooltip-pt-prefswitch-link-off' => 'Prova le nuove funzioni',
 );@@ -254,9 +335,15 @@
 ); /** Georgian (ქართული)
+ * @author BRUTE
  * @author გიორგიმელა
  */
 $messages['ka'] = array(
+	'prefswitch-link-anon' => 'ახალი შესაძლებლობები',
+	'tooltip-pt-prefswitch-link-anon' => 'გაიგეთ მეტი ახალ შესაძლებლობებზე',
+	'prefswitch-link-on' => 'გასვლა',
+	'tooltip-pt-prefswitch-link-on' => 'ახალი შესაძლებლობების გამორთვა',
+	'prefswitch-link-off' => 'ახალი შესაძლებლობები',
 	'tooltip-pt-prefswitch-link-off' => 'სცადეთ ახალი ხელსაწყოები',
 );@@ -266,7 +353,9 @@
  */
 $messages['ko'] = array(
 	'prefswitch-link-anon' => '새 기능',
+	'tooltip-pt-prefswitch-link-anon' => '새 기능에 대해 알아보기',
 	'prefswitch-link-on' => '돌아가기',
+	'tooltip-pt-prefswitch-link-on' => '새 기능 끄기',
 	'prefswitch-link-off' => '새 기능',
 	'tooltip-pt-prefswitch-link-off' => '새 기능 체험하기',
 );
@@ -275,19 +364,23 @@
  * @author Robby
  */
 $messages['lb'] = array(
+	'prefswitch-link-anon' => 'Nei Fonctiounen',
+	'tooltip-pt-prefswitch-link-anon' => 'Méi iwwer déi nei Fonctiounen',
+	'prefswitch-link-on' => 'Zréck',
+	'tooltip-pt-prefswitch-link-on' => 'Nei Fonctiounen ausschalten',
+	'prefswitch-link-off' => 'Nei Fonctiounen',
 	'tooltip-pt-prefswitch-link-off' => 'Probéiert déi nei Fonctionalitéiten aus',
 );-/** Latvian (Latviešu)
- * @author Papuass
- */
-$messages['lv'] = array(
-);
-
 /** Macedonian (Македонски)
  * @author Bjankuloski06
  */
 $messages['mk'] = array(
+	'prefswitch-link-anon' => 'Нови функции',
+	'tooltip-pt-prefswitch-link-anon' => 'Дознајте за новите функции',
+	'prefswitch-link-on' => 'Врати ме',
+	'tooltip-pt-prefswitch-link-on' => 'Оневозможи нови функции',
+	'prefswitch-link-off' => 'Нови функции',
 	'tooltip-pt-prefswitch-link-off' => 'Испробајте нови функции',
 );@@ -310,6 +403,7 @@
 	'prefswitch-link-anon' => 'Karatteristiċi ġodda',
 	'tooltip-pt-prefswitch-link-anon' => 'Tgħallem aktar dwar elementi ġodda',
 	'prefswitch-link-on' => 'Ħudni lura',
+	'tooltip-pt-prefswitch-link-on' => 'Itfi l-funzjonijiet il-ġodda',
 	'prefswitch-link-off' => 'Funzjonijiet ġodda',
 	'tooltip-pt-prefswitch-link-off' => 'Ipprova funzjonijiet ġodda',
 );
@@ -318,6 +412,11 @@
  * @author Siebrand
  */
 $messages['nl'] = array(
+	'prefswitch-link-anon' => 'Nieuwe functionaliteit',
+	'tooltip-pt-prefswitch-link-anon' => 'Meer over nieuwe functionaliteit',
+	'prefswitch-link-on' => 'Terug',
+	'tooltip-pt-prefswitch-link-on' => 'Nieuwe functionaliteit uitschakelen',
+	'prefswitch-link-off' => 'Nieuwe functionaliteit',
 	'tooltip-pt-prefswitch-link-off' => 'Nieuwe mogelijkheden uitproberen',
 );@@ -325,6 +424,11 @@
  * @author Nghtwlkr
  */
 $messages['no'] = array(
+	'prefswitch-link-anon' => 'Nye funksjoner',
+	'tooltip-pt-prefswitch-link-anon' => 'Lær mer om de nye funksjonene',
+	'prefswitch-link-on' => 'Ta meg tilbake',
+	'tooltip-pt-prefswitch-link-on' => 'Deaktiver nye funksjoner',
+	'prefswitch-link-off' => 'Nye funksjoner',
 	'tooltip-pt-prefswitch-link-off' => 'Prøv nye funksjoner',
 );@@ -336,16 +440,28 @@
 ); /** Polish (Polski)
+ * @author Nux
  * @author Sp5uhe
  */
 $messages['pl'] = array(
+	'prefswitch-link-anon' => 'Nowe funkcjonalności',
+	'tooltip-pt-prefswitch-link-anon' => 'Dowiedz się więcej o nowych funkcjach',
+	'prefswitch-link-on' => 'Chcę wrócić',
+	'tooltip-pt-prefswitch-link-on' => 'Wyłączenie nowych funkcjonalności',
+	'prefswitch-link-off' => 'Nowe funkcjonalności',
 	'tooltip-pt-prefswitch-link-off' => 'Wypróbuj nowe funkcjonalności',
 ); /** Piedmontese (Piemontèis)
+ * @author Borichèt
  * @author Dragonòt
  */
 $messages['pms'] = array(
+	'prefswitch-link-anon' => 'Neuve funsionalità',
+	'tooltip-pt-prefswitch-link-anon' => 'Ampara le neuve funsionalità',
+	'prefswitch-link-on' => 'Pòrtme andré',
+	'tooltip-pt-prefswitch-link-on' => 'Disabilité le neuve funsionalità',
+	'prefswitch-link-off' => 'Neuve funsionalità',
 	'tooltip-pt-prefswitch-link-off' => 'Preuva le neuve funsionalità',
 );@@ -353,9 +469,26 @@
  * @author Hamilton Abreu
  */
 $messages['pt'] = array(
+	'prefswitch-link-anon' => 'Funcionalidades novas',
+	'tooltip-pt-prefswitch-link-anon' => 'Descubra as funcionalidades novas',
+	'prefswitch-link-on' => 'Voltar atrás',
+	'tooltip-pt-prefswitch-link-on' => 'Desactivar as funcionalidades novas',
+	'prefswitch-link-off' => 'Funcionalidades novas',
 	'tooltip-pt-prefswitch-link-off' => 'Experimente novas funcionalidades',
 );+/** Brazilian Portuguese (Português do Brasil)
+ * @author Giro720
+ */
+$messages['pt-br'] = array(
+	'prefswitch-link-anon' => 'Funcionalidades novas',
+	'tooltip-pt-prefswitch-link-anon' => 'Descubra as funcionalidades novas',
+	'prefswitch-link-on' => 'Voltar atrás',
+	'tooltip-pt-prefswitch-link-on' => 'Desativar as funcionalidades novas',
+	'prefswitch-link-off' => 'Funcionalidades novas',
+	'tooltip-pt-prefswitch-link-off' => 'Experimente as novas funcionalidades',
+);
+
 /** Russian (Русский)
  * @author Александр Сигачёв
  */
@@ -368,10 +501,23 @@
 	'tooltip-pt-prefswitch-link-off' => 'Опробуйте новые возможности',
 );+/** Sinhala (සිංහල)
+ * @author බිඟුවා
+ */
+$messages['si'] = array(
+	'prefswitch-link-anon' => 'බීටා අනුවාදයේ ලක්ෂණ',
+	'prefswitch-link-off' => 'බීටා අනුවාදයේ ලක්ෂණ',
+	'tooltip-pt-prefswitch-link-off' => 'නවාංගයන් අත්හදා බලන්න',
+);
+
 /** Slovenian (Slovenščina)
  * @author Dbc334
  */
 $messages['sl'] = array(
+	'prefswitch-link-anon' => 'Nove funkcije',
+	'tooltip-pt-prefswitch-link-anon' => 'Izvedite več o novih funkcijah',
+	'tooltip-pt-prefswitch-link-on' => 'Onemogoči nove funkcije',
+	'prefswitch-link-off' => 'Nove funkcije',
 	'tooltip-pt-prefswitch-link-off' => 'Preizkusite nove funkcije',
 );@@ -392,14 +538,33 @@
  * @author Veeven
  */
 $messages['te'] = array(
+	'prefswitch-link-anon' => 'కొత్త సౌలభ్యాలు',
+	'tooltip-pt-prefswitch-link-anon' => 'కొత్త విశేషాల గురించి తెలుసుకోండి',
 	'prefswitch-link-off' => 'కొత్త సౌలభ్యాలు',
 	'tooltip-pt-prefswitch-link-off' => 'కొత్త సౌలభ్యాలను ప్రయత్నించండి',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'prefswitch-link-anon' => 'Bagong mga kasangkapang-katangian',
+	'tooltip-pt-prefswitch-link-anon' => 'Pag-aralan ang bagong mga kasangkapang-katangian',
+	'prefswitch-link-on' => 'Ibalik ako',
+	'tooltip-pt-prefswitch-link-on' => 'Huwag paganahin ang bagong mga kasangkapang-katangian',
+	'prefswitch-link-off' => 'Bagong mga kasangkapang-katangian',
+	'tooltip-pt-prefswitch-link-off' => 'Subukan ang bagong mga kasangkapang-katangian',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  */
 $messages['tr'] = array(
+	'prefswitch-link-anon' => 'Yeni özellikler',
+	'tooltip-pt-prefswitch-link-anon' => 'Yeni özellikleri öğren',
+	'prefswitch-link-on' => 'Beni geri götür',
+	'tooltip-pt-prefswitch-link-on' => 'Yeni özellikleri devre dışı bırak',
+	'prefswitch-link-off' => 'Yeni özellikler',
 	'tooltip-pt-prefswitch-link-off' => 'Yeni özellikleri dene',
 );@@ -407,6 +572,35 @@
  * @author Minh Nguyen
  */
 $messages['vi'] = array(
+	'prefswitch-link-anon' => 'Tính năng mới',
+	'tooltip-pt-prefswitch-link-anon' => 'Tìm hiểu về các tính năng mới',
+	'prefswitch-link-on' => 'Đưa tôi trở lại',
+	'tooltip-pt-prefswitch-link-on' => 'Tắt các tính năng mới',
+	'prefswitch-link-off' => 'Tính năng mới',
 	'tooltip-pt-prefswitch-link-off' => 'Hãy thử các tính năng mới',
 );+/** Yiddish (ייִדיש)
+ * @author פוילישער
+ */
+$messages['yi'] = array(
+	'prefswitch-link-anon' => 'נײַע אייגנשאַפֿטן',
+	'tooltip-pt-prefswitch-link-anon' => 'לערנען וועגן נײַע אייגנקייטן',
+	'prefswitch-link-on' => 'פֿירן מיך צוריק',
+	'tooltip-pt-prefswitch-link-on' => 'אַנולירן נײַע אייגנקייטן',
+	'prefswitch-link-off' => 'נײַע אייגנשאַפֿטן',
+	'tooltip-pt-prefswitch-link-off' => 'פרובירן נײַע אייגנקייטן',
+);
+
+/** Traditional Chinese (‪中文(繁體)‬)
+ * @author Horacewai2
+ */
+$messages['zh-hant'] = array(
+	'prefswitch-link-anon' => '新功能',
+	'tooltip-pt-prefswitch-link-anon' => '了解更多關於新功能',
+	'prefswitch-link-on' => '回到舊版',
+	'tooltip-pt-prefswitch-link-on' => '禁用新功能',
+	'prefswitch-link-off' => '新功能',
+	'tooltip-pt-prefswitch-link-off' => '嘗試新功能',
+);
+

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -110,6 +110,7 @@
 		UsabilityInitiativeHooks::initialize();
 		UsabilityInitiativeHooks::addScript( 'PrefSwitch/PrefSwitch.js', $wgPrefSwitchStyleVersion );
 		UsabilityInitiativeHooks::addStyle( 'PrefSwitch/PrefSwitch.css', $wgPrefSwitchStyleVersion );
+		$wgOut->addHtml( '<div class="plainlinks">' );
 		// Handle various modes
 		if ( $wgRequest->getCheck( 'mode' ) && $wgUser->isLoggedIn() ) {
 			switch ( $wgRequest->getVal( 'mode' ) ) {
@@ -192,6 +193,7 @@
 					break;
 			}
 		}
+		$wgOut->addHtml( '</div>' );
 	}
 	
 	/* Private Functions */
@@ -231,8 +233,8 @@
 			$html .= Xml::closeElement( 'form' );
 			$wgOut->addHtml( $html );
 		} else {
-			$wgOut->addWikiMsg(
-				'prefswitch-main', array( 'parse' )
+			$wgOut->addWikiMsgArray(
+				'prefswitch-main', wfMsg( 'prefswitch-feedbackpage' ), array( 'parse' )
 			);
 			$state = self::userState( $wgUser );
 			switch ( $state ) {

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UpdateMyPrefs/UpdateMyPrefs.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UpdateMyPrefs/UpdateMyPrefs.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UpdateMyPrefs/UpdateMyPrefs.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -19,12 +19,23 @@ /** Message documentation (Message documentation)
  * @author EugeneZelenko
+ * @author Umherirrender
  */
 $messages['qqq'] = array(
 	'prefs-updates' => 'In the context of software updates
 {{Identical|Update}}',
+	'updatemyprefs-desc' => '{{desc}}',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'prefs-updates' => 'Updates',
+	'updatemyprefs-desc' => 'Preferencë për përdoruesit për të përcaktuar nëse ato dëshirojnë periodikisht për ndërfaqen e përdoruesit si ata janë vënë në dispozicion',
+	'updatemyprefs-label-message' => 'Update automatikisht preferencat e mia me vlerat e prezgjedhura të reja dhe mjete si ato të bëhen të disponueshme',
+);
+
 /** Arabic (العربية)
  * @author OsamaK
  */
@@ -64,9 +75,12 @@ /** Catalan (Català)
  * @author Paucabot
+ * @author Vriullop
  */
 $messages['ca'] = array(
 	'prefs-updates' => 'Actualitzacions',
+	'updatemyprefs-desc' => 'Preferència pels usuaris per especificar si desitgen actualitzacions periòdiques de la interfície quan estiguin disponibles',
+	'updatemyprefs-label-message' => 'Actualitzar automàticament les meves preferències amb els nous valors i eines per defecte quan estiguin disponibles',
 ); /** Czech (Česky)
@@ -79,6 +93,15 @@
 	'updatemyprefs-label-message' => 'Automaticky aktualizovat moje nastavení na nové implicitní hodnoty a použití nových nástrojů, jakmile se stanou dostupné',
 );+/** Welsh (Cymraeg)
+ * @author Lloffiwr
+ */
+$messages['cy'] = array(
+	'prefs-updates' => 'Diweddaru',
+	'updatemyprefs-desc' => "Dewis defnyddiwr i ddiweddaru'r rhyngwyneb cyn gynted ag y caiff newidiadau i'r rhyngwyneb eu rhyddhau",
+	'updatemyprefs-label-message' => "Newid fy newisiadau'n syth bin i gyfateb â gosodiadau ac offer rhagosodedig newydd",
+);
+
 /** German (Deutsch) */
 $messages['de'] = array(
 	'prefs-updates' => 'Aktualisierungen',
@@ -125,9 +148,11 @@ /** Finnish (Suomi)
  * @author Crt
+ * @author Str4nd
  */
 $messages['fi'] = array(
 	'prefs-updates' => 'Päivitykset',
+	'updatemyprefs-label-message' => 'Päivitä asetukseni automaattisesti uusilla oletusasetuksilla ja työkaluilla, kun niitä tulee saataville',
 ); /** French (Français)
@@ -246,7 +271,7 @@
  */
 $messages['mk'] = array(
 	'prefs-updates' => 'Подновување',
-	'updatemyprefs-desc' => 'Нагодување со кое корисниците назначуваат дали сакаат повремени подновувања (ажурирања) на корисничкиот интерфејс кога тие ќе бидат достапни',
+	'updatemyprefs-desc' => 'Нагодување со кое корисниците назначуваат дали сакаат повремени подновувања (ажурирања) на корисничкиот посредник кога тие ќе бидат достапни',
 	'updatemyprefs-label-message' => 'Автоматски подновувај ми ги нагодувањата со нови поставки по основно и нови алатки, кога ќе станат достапни',
 );@@ -321,6 +346,15 @@
 	'updatemyprefs-label-message' => 'Actualizar automaticamente as minhas preferências com novas configurações predefinidas e ferramentas, à medida que estas estejam disponíveis',
 );+/** Brazilian Portuguese (Português do Brasil)
+ * @author Giro720
+ */
+$messages['pt-br'] = array(
+	'prefs-updates' => 'Atualizações',
+	'updatemyprefs-desc' => 'Preferência para os utilizadores especificarem se desejam atualizações periódicas da interface à medida que estas estejam disponíveis',
+	'updatemyprefs-label-message' => 'Atualizar automaticamente as minhas preferências com novas configurações predefinidas e ferramentas, à medida que estas estejam disponíveis',
+);
+
 /** Russian (Русский)
  * @author Александр Сигачёв
  */
@@ -330,6 +364,13 @@
 	'updatemyprefs-label-message' => 'Автоматически обновлять мои настройки новыми настройками по умолчанию и инструментами, по мере их появления',
 );+/** Sinhala (සිංහල)
+ * @author බිඟුවා
+ */
+$messages['si'] = array(
+	'prefs-updates' => 'යාවත්කාලීන කළ',
+);
+
 /** Swedish (Svenska)
  * @author Ainali
  * @author Dafer45
@@ -340,6 +381,15 @@
 	'updatemyprefs-label-message' => 'Uppdatera mina inställningar automatiskt med nya standardinställningarna och verktyg när de blir tillgängliga',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'prefs-updates' => 'Mga pagsasapanahon',
+	'updatemyprefs-desc' => 'Mga pagpipilian para sa mga tagagamit upang matukoy kung nais nila ang panapanahong pagsasapanahon ng dugtungang-mukha na pangtagagamit kapag nagawang makukuha na ang mga ito',
+	'updatemyprefs-label-message' => 'Kusang isapanahon ang mga nais ko na may kusang nakatakdang mga pagtatakda at mga kasangkapan kapag makukuha na ang mga ito',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  */
@@ -359,3 +409,12 @@
 	'updatemyprefs-label-message' => 'Tự động cập nhật các tùy chọn của tôi với những thiết lập và công cụ mặc định mới khi chúng ra mắt',
 );+/** Traditional Chinese (‪中文(繁體)‬)
+ * @author Horacewai2
+ */
+$messages['zh-hant'] = array(
+	'prefs-updates' => '更新',
+	'updatemyprefs-desc' => '供用戶選擇是否要定期更新的用戶界面',
+	'updatemyprefs-label-message' => '自動更新我的喜好與新的默認設置和工具如果它們可用',
+);
+

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -18,8 +18,9 @@
 	private static $styleFiles = array(
 		'base_sets' => array(
 			'raw' => array(
-				array( 'src' => 'css/suggestions.css', 'version' => 13 ),
-				array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 9 ),
+				array( 'src' => 'css/suggestions.css', 'version' => 14 ),
+				array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 12 ),
+				array( 'src' => 'css/vector.expandableSearch.css', 'version' => 3 ),
 				array( 'src' => 'css/vector.footerCleanup.css', 'version' => 2 ),
 				array( 'src' => 'css/wikiEditor.css', 'version' => 14 ),
 				array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 29 ),
@@ -29,11 +30,11 @@
 				array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
 			),
 			'combined' => array(
-				array( 'src' => 'css/combined.css', 'version' => 95 ),
+				array( 'src' => 'css/combined.css', 'version' => 101 ),
 				array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
 			),
 			'minified' => array(
-				array( 'src' => 'css/combined.min.css', 'version' => 95 ),
+				array( 'src' => 'css/combined.min.css', 'version' => 101 ),
 				array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
 			),
 		)
@@ -64,30 +65,33 @@ 				// Core functionality of extension scripts
 				array( 'src' => 'js/plugins/jquery.async.js', 'version' => 3 ),
-				array( 'src' => 'js/plugins/jquery.autoEllipsis.js', 'version' => 11 ),
-				array( 'src' => 'js/plugins/jquery.browser.js', 'version' => 6 ),
+				array( 'src' => 'js/plugins/jquery.autoEllipsis.js', 'version' => 9 ),
+				array( 'src' => 'js/plugins/jquery.browser.js', 'version' => 8 ),
 				array( 'src' => 'js/plugins/jquery.collapsibleTabs.js', 'version' => 6 ),
 				array( 'src' => 'js/plugins/jquery.color.js', 'version' => 1 ),
 				array( 'src' => 'js/plugins/jquery.cookie.js', 'version' => 4 ),
 				array( 'src' => 'js/plugins/jquery.delayedBind.js', 'version' => 1 ),
-				array( 'src' => 'js/plugins/jquery.expandableField.js', 'version' => 15 ),
-				array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 18 ),
-				array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 33 ),
-				array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 187 ),
+				array( 'src' => 'js/plugins/jquery.expandableField.js', 'version' => 16 ),
+				array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 21 ),
+				array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 35 ),
+				array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 192 ),
 				array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 53 ),
-				array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 64 ),
-				array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 24 ),
+				array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 66 ),
+				array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 25 ),
 				array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 98 ),
 				array( 'src' => 'js/plugins/jquery.wikiEditor.preview.js', 'version' => 11 ),
 				array( 'src' => 'js/plugins/jquery.wikiEditor.templateEditor.js', 'version' => 77 ),
 				array( 'src' => 'js/plugins/jquery.wikiEditor.templates.js', 'version' => 1 ),
 				array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 5 ),
+				
+				// thirdparty javascript libraries we use
+				array( 'src' => 'js/thirdparty/contentCollector.js', 'version' => 2 ),
 			),
 			'combined' => array(
-				array( 'src' => 'js/plugins.combined.js', 'version' => 413 ),
+				array( 'src' => 'js/plugins.combined.js', 'version' => 421 ),
 			),
 			'minified' => array(
-				array( 'src' => 'js/plugins.combined.min.js', 'version' => 413 ),
+				array( 'src' => 'js/plugins.combined.min.js', 'version' => 421 ),
 			),
 		),
 	);
@@ -103,7 +107,7 @@
 	 * Adds scripts
 	 */
 	public static function addResources( $out ) {
-		global $wgExtensionAssetsPath, $wgJsMimeType;
+		global $wgExtensionAssetsPath;
 		global $wgUsabilityInitiativeResourceMode;
 		global $wgEnableJS2system, $wgEditToolbarRunTests;
 		global $wgStyleVersion;
@@ -162,25 +166,15 @@
 		}
 		// Add javascript to document
 		if ( count( self::$messages ) > 0 ) {
-			$out->addScript(
-				Xml::tags(
-					'script',
-					array( 'type' => $wgJsMimeType ),
-					'mw.usability.addMessages({' . implode( ',', self::$messages ) . '});'
-				)
-			);
+			$out->addScript( Html::inlineScript(
+				'mw.usability.addMessages({' . implode( ',', self::$messages ) . '});'
+			) );
 		}
 		// Loops over each style
 		foreach ( self::$styles as $style ) {
 			// Add css for various styles
-			$out->addLink(
-				array(
-					'rel' => 'stylesheet',
-					'type' => 'text/css',
-					'href' => $wgExtensionAssetsPath .
-							"/UsabilityInitiative/" .
-								"{$style['src']}?{$style['version']}",
-				)
+			$out->addExtensionStyle( $wgExtensionAssetsPath .
+				"/UsabilityInitiative/{$style['src']}?{$style['version']}"
 			);
 		}
 		return true;

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -36,6 +36,16 @@
 	'usabilityinitiative-desc' => 'Funksionaliteit wat deur Wikipedia se Bruikbaarheid-inisiatief ontwikkel is om MediaWiki meer bruikbaarheid te maak',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'usabilityinitiative' => 'Përdorshmërisë Nisma',
+	'usabilityinitiative-desc' => 'Karakteristika të zhvilluar nga Iniciativa përdorshmërisë Wikipedia për të rritur përdorshmërisë së MediaWiki',
+	'prefs-beta' => 'karakteristika Beta',
+	'prefs-labs' => 'Laboratorë karakteristika',
+);
+
 /** Arabic (العربية)
  * @author OsamaK
  */
@@ -73,6 +83,8 @@
 $messages['bg'] = array(
 	'usabilityinitiative' => 'Инициатива по ползваемост',
 	'usabilityinitiative-desc' => 'Софтуерни възможности, разработени от Инициативата за ползваемост на Уикипедия с цел за подобряване ползваемостта на МедияУики',
+	'prefs-beta' => 'Функционалности на Бета',
+	'prefs-labs' => 'Функционалности на Labs',
 ); /** Bengali (বাংলা)
@@ -231,6 +243,15 @@
 	'usabilityinitiative-desc' => 'Wikipediaren Erabilgarritasun Iniziatibak garatutako ezaugarriak MediaWikiren erabilgarritasuna hobetzeko.',
 );+/** Persian (فارسی)
+ * @author Ebraminio
+ */
+$messages['fa'] = array(
+	'usabilityinitiative' => 'گام مقدماتی قابلیت استفاده',
+	'prefs-beta' => 'امکانات بتا',
+	'prefs-labs' => 'امکانات آزمایشگاهی',
+);
+
 /** Finnish (Suomi)
  * @author Crt
  * @author Str4nd
@@ -238,6 +259,7 @@
 $messages['fi'] = array(
 	'usabilityinitiative' => 'Käytettävyyshanke',
 	'usabilityinitiative-desc' => 'Wikipedian käytettävyyshankkeen kehittämät MediaWikin helppokäyttöisyyttä parantavat ominaisuudet.',
+	'prefs-beta' => 'Beta-ominaisuudet',
 	'prefs-labs' => 'Kokeelliset ominaisuudet',
 );@@ -364,8 +386,8 @@
  * @author 青子守歌
  */
 $messages['ja'] = array(
-	'usabilityinitiative' => 'ユーザビリティ・イニシアティブ',
-	'usabilityinitiative-desc' => 'ウィキペディア・ユーザビリティ・イニシアティブによって MediaWiki の使いやすさを向上させるために開発された各種機能',
+	'usabilityinitiative' => '使用性改善',
+	'usabilityinitiative-desc' => 'Wikipedia Usability Initiativeによって MediaWiki の使いやすさを向上させるために開発された各種機能',
 	'prefs-beta' => 'ベータ版機能',
 	'prefs-labs' => 'ラボの機能',
 );
@@ -511,11 +533,12 @@ /** Polish (Polski)
  * @author Leinad
+ * @author Nux
  * @author Sp5uhe
  */
 $messages['pl'] = array(
 	'usabilityinitiative' => 'Inicjatywa Użyteczności',
-	'usabilityinitiative-desc' => 'Funkcje rozwijane przez Inicjatywę Użyteczności Wikipedii w celu poszerzenia przydatności oprogramowania MediaWiki',
+	'usabilityinitiative-desc' => 'Funkcjonalności rozwijane przez Inicjatywę Użyteczności Wikipedii w celu poszerzenia przydatności oprogramowania MediaWiki',
 	'prefs-beta' => 'Funkcjonalności testowe',
 	'prefs-labs' => 'Funkcjonalności doświadczalne',
 );
@@ -559,8 +582,8 @@
  * @author Stelistcristi
  */
 $messages['ro'] = array(
-	'usabilityinitiative' => 'Iniţiativa de utilizabilitate',
-	'usabilityinitiative-desc' => 'Funcţionalităţi dezvoltate de Wikipedia Usability Initiative pentru a spori gradul de folosire a MediaWiki',
+	'usabilityinitiative' => 'Inițiativa de utilizabilitate',
+	'usabilityinitiative-desc' => 'Funcționalități dezvoltate de Wikipedia Usability Initiative pentru a spori gradul de folosire a MediaWiki',
 ); /** Tarandíne (Tarandíne)
@@ -593,10 +616,12 @@ /** Sinhala (සිංහල)
  * @author Calcey
+ * @author බිඟුවා
  */
 $messages['si'] = array(
 	'usabilityinitiative' => 'පරිශීලන හැකියා මුල් පිරුම',
 	'usabilityinitiative-desc' => 'මීඩියාවිකියෙහි පරිශීලන හැකියාව වර්ධනය කිරීමට විකිපීඩියා පරිශීලන හැකියා මුල් පිරීම මඟින් සංවර්ධනය කළ විශේෂාංග',
+	'prefs-beta' => 'බීටා අනුවාදයේ ලක්ෂණ',
 ); /** Slovak (Slovenčina)
@@ -650,6 +675,16 @@
 	'usabilityinitiative-desc' => 'MediaWikiniň oňaýlylygyny güýçlendirmek maksady bilen Oňaýlylyk Başlangyjy tarapyndan taýýarlanylan funksiýalar',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'usabilityinitiative' => 'Pasimulang Pangpagkanagagamit',
+	'usabilityinitiative-desc' => 'Mga katangiang-kasangkapang pinaunlat ng Pampanimula ng Pagkanagagamit ng Wikipedia upang mapahusay ang paggamit ng MediaWiki',
+	'prefs-beta' => 'Mga kaangkapang-katangiang pang-beta',
+	'prefs-labs' => 'Mga kasangkapang-katangiang pang-Labs',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  */
@@ -723,14 +758,18 @@
 	'usabilityinitiative' => 'Usability Initiative',
 	'usabilityinitiative-desc' => '由维基百科可用性小组开发的新功能,用以增强MediaWiki的可用性',
 	'prefs-beta' => 'Beta特性',
+	'prefs-labs' => '实验室功能',
 ); /** Traditional Chinese (‪中文(繁體)‬)
  * @author Gaoxuewei
+ * @author Horacewai2
  * @author Shinjiman
  */
 $messages['zh-hant'] = array(
 	'usabilityinitiative' => 'Usability Initiative',
 	'usabilityinitiative-desc' => '由維基百科可用性小組開發的新功能,用以增強MediaWiki的可用性',
+	'prefs-beta' => 'Beta特性',
+	'prefs-labs' => '實驗中的功能',
 );
Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UserDailyContribs/UserDailyContribs.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UserDailyContribs/UserDailyContribs.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UserDailyContribs/UserDailyContribs.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -31,6 +31,13 @@
 	'userdailycontribs-desc' => 'Daaglikse gebruikersbydraes vir die uitbreiding om gebruikers se klieks mee te volg',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'userdailycontribs-desc' => 'Kontributet e përdoruesit çdo ditë për ndjekjen klikoni extension',
+);
+
 /** Arabic (العربية)
  * @author Meno25
  */
@@ -73,6 +80,13 @@
 	'userdailycontribs-desc' => 'Dnevni doprinosi korisnka za proširenje praćenja klikova',
 );+/** Catalan (Català)
+ * @author Vriullop
+ */
+$messages['ca'] = array(
+	'userdailycontribs-desc' => "Contribucions diàries dels usuaris per a l'extensió de seguiment de clics",
+);
+
 /** Czech (Česky)
  * @author Mormegil
  */
@@ -310,7 +324,7 @@
  * @author Stelistcristi
  */
 $messages['ro'] = array(
-	'userdailycontribs-desc' => 'Contribuţiile zilnice ale contribuitorilor pentru monitorizarea gradului de click-uri',
+	'userdailycontribs-desc' => 'Contribuțiile zilnice ale contribuitorilor pentru monitorizarea gradului de click-uri',
 ); /** Tarandíne (Tarandíne)
@@ -362,6 +376,13 @@
 	'userdailycontribs-desc' => 'Dagliga användarbidrag för tilläggsfunktionen klickningsspårning',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'userdailycontribs-desc' => 'Pang-araw-araw na ambag ng tagagamit para sa pagpindot ng dugtong na pangsubaybay',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  */

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -13,8 +13,16 @@
  */
 $messages['en'] = array(
 	'vector-collapsiblenav-preference' => 'Enable collapsible left navigation menu',
+	'vector-collapsiblenav-more' => 'More languages',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'vector-collapsiblenav-preference' => 'Aktivizo paloset la navigacion menu',
+);
+
 /** Arabic (العربية)
  * @author OsamaK
  */
@@ -29,6 +37,13 @@
 	'vector-collapsiblenav-preference' => 'Дазволіць згортваць навігацыйнае мэню зьлева',
 );+/** Bulgarian (Български)
+ * @author Spiritia
+ */
+$messages['bg'] = array(
+	'vector-collapsiblenav-preference' => 'Включване на сгъваемо/разгъваемо меню за навигация вляво',
+);
+
 /** Bengali (বাংলা)
  * @author Bellayet
  */
@@ -104,6 +119,20 @@
 	'vector-collapsiblenav-preference' => 'Ezkerreko nabigazio menua irekigarri bihurtzen du',
 );+/** Persian (فارسی)
+ * @author Ebraminio
+ */
+$messages['fa'] = array(
+	'vector-collapsiblenav-preference' => 'فعال‌کردن منوی تاشوی ناوبری  سمت چپ',
+);
+
+/** Finnish (Suomi)
+ * @author Str4nd
+ */
+$messages['fi'] = array(
+	'vector-collapsiblenav-preference' => 'Ota käyttöön vasemman navigaatiovalikon piilottaminen',
+);
+
 /** French (Français)
  * @author IAlex
  */
@@ -123,6 +152,7 @@
  */
 $messages['gsw'] = array(
 	'vector-collapsiblenav-preference' => 'Yyklappbar Navgationsmenü yyschalte',
+	'vector-collapsiblenav-more' => 'Meh Sproche',
 ); /** Hebrew (עברית)
@@ -181,6 +211,13 @@
 	'vector-collapsiblenav-preference' => '左寄りの折り畳めるナビゲーションメニューを使用する',
 );+/** Georgian (ქართული)
+ * @author BRUTE
+ */
+$messages['ka'] = array(
+	'vector-collapsiblenav-preference' => 'მარცხენა სანავიგაციო მენიუს ჩაკეცვა',
+);
+
 /** Korean (한국어)
  * @author Kwj2772
  */
@@ -209,6 +246,13 @@
 	'vector-collapsiblenav-preference' => 'ഇടതുവശത്തെ വഴികാട്ടി മെനു ചുരുക്കാവുന്നതാക്കി സജ്ജീകരിക്കുക',
 );+/** Malay (Bahasa Melayu)
+ * @author Aurora
+ */
+$messages['ms'] = array(
+	'vector-collapsiblenav-preference' => 'Aktifkan menu navigasi kiri boleh kuncup',
+);
+
 /** Maltese (Malti)
  * @author Chrisportelli
  */
@@ -287,6 +331,13 @@
 	'vector-collapsiblenav-preference' => 'Gör den vänstra navigeringsmenyn ihopfällbar',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'vector-collapsiblenav-preference' => 'Paganahin ang natitiklop na pangkaliwang menu na panlibot',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  */
@@ -301,3 +352,17 @@
 	'vector-collapsiblenav-preference' => 'Bật trình đơn chuyển hướng gấp lại được ở bên phải',
 );+/** Yiddish (ייִדיש)
+ * @author פוילישער
+ */
+$messages['yi'] = array(
+	'vector-collapsiblenav-preference' => 'אַקטיווירן צונויפֿלייגבאַרן מעניו לינקס',
+);
+
+/** Traditional Chinese (‪中文(繁體)‬)
+ * @author Horacewai2
+ */
+$messages['zh-hant'] = array(
+	'vector-collapsiblenav-preference' => '啟用可折疊左側導航菜單',
+);
+

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -14,7 +14,8 @@
 				'konqueror': [['>=', 4.0]],
 				'blackberry': false,
 				'ipod': false,
-				'iphone': false
+				'iphone': false,
+				'ps3': false
 			},
 			// Right-to-left languages
 			'rtl': {
@@ -22,25 +23,139 @@
 				'konqueror': [['>=', 4.0]],
 				'blackberry': false,
 				'ipod': false,
-				'iphone': false
+				'iphone': false,
+				'ps3': false
 			}
 		}
 	};
 	if ( !$j.wikiEditor.isSupported( mod ) ) {
 		return true;
 	}
+	// Fallback to old version
+	var version = 1;
+	// Allow new version override
+	if ( wgCollapsibleNavForceNewVersion ) {
+		version = 2;
+	} else {
+		// Make bucket testing optional
+		if ( wgCollapsibleNavBucketTest ) {
+			// This is be determined randomly, and then stored in a cookie
+			version = $j.cookie( 'vector-nav-pref-version' );
+			// If the cookie didn't exist, or the value is out of range, generate a new one and save it
+			if ( version == null ) {
+				// 50% of the people will get the new version
+				version = Math.round( Math.random() + 1 );
+				$j.cookie( 'vector-nav-pref-version', version, { 'expires': 30, 'path': '/' } );
+			}
+		}
+	}
+	// Language portal splitting feature (if it's turned on)
+	if ( version == 2 ) {
+		// How many links to show in the primary languages portal
+		var limit = 5;
+		// How many links there must be in the secondary portal to justify having a secondary portal
+		var threshold = 3;
+		// Make the interwiki language links list a secondary list, and create a new list before it as primary list
+		$j( '#p-lang ul' ).addClass( 'secondary' ).before( '<ul class="primary"></ul>' );
+		// This is a list of languages in order of Wikipedia project size. This is the lowest fallback for choosing
+		// which links to show in the primary list. Ideally the browser's accept-language headers should steer this
+		// list, and we should fallback on a site configured (MediaWiki:Common.js) list of prefered languages.
+		var languages = [
+			'en', 'fr', 'de', 'es', 'pt', 'it', 'ru', 'ja', 'nl', 'pl', 'zh', 'sv', 'ar', 'tr', 'uk', 'fi', 'no', 'ca',
+			'ro', 'hu', 'ksh', 'id',  'he', 'cs', 'vi', 'ko', 'sr', 'fa', 'da', 'eo', 'sk', 'th', 'lt', 'vo', 'bg',
+			'sl', 'hr', 'hi', 'et', 'mk', 'simple', 'new', 'ms', 'nn', 'gl', 'el', 'eu', 'ka', 'tl', 'bn', 'lv', 'ml',
+			'bs', 'te', 'la', 'az', 'sh', 'war', 'br', 'is', 'mr', 'be-x-old', 'sq', 'cy', 'lb', 'ta', 'zh-classical',
+			'an', 'jv', 'ht', 'oc', 'bpy', 'ceb', 'ur', 'zh-yue', 'pms', 'scn', 'be', 'roa-rup', 'qu', 'af', 'sw',
+			'nds', 'fy', 'lmo', 'wa', 'ku', 'hy', 'su', 'yi', 'io', 'os', 'ga', 'ast', 'nap', 'vec', 'gu', 'cv',
+			'bat-smg', 'kn', 'uz', 'zh-min-nan', 'si', 'als', 'yo', 'li', 'gan', 'arz', 'sah', 'tt', 'bar', 'gd', 'tg',
+			'kk', 'pam', 'hsb', 'roa-tara', 'nah', 'mn', 'vls', 'gv', 'mi', 'am', 'ia', 'co', 'ne', 'fo', 'nds-nl',
+			'glk', 'mt', 'ang', 'wuu', 'dv', 'km', 'sco', 'bcl', 'mg', 'my', 'diq', 'tk', 'szl', 'ug', 'fiu-vro', 'sc',
+			'rm', 'nrm', 'ps', 'nv', 'hif', 'bo', 'se', 'sa', 'pnb', 'map-bms', 'lad', 'lij', 'crh', 'fur', 'kw', 'to',
+			'pa', 'jbo', 'ba', 'ilo', 'csb', 'wo', 'xal', 'krc', 'ckb', 'pag', 'ln', 'frp', 'mzn', 'ce', 'nov', 'kv',
+			'eml', 'gn', 'ky', 'pdc', 'lo', 'haw', 'mhr', 'dsb', 'stq', 'tpi', 'arc', 'hak', 'ie', 'so', 'bh', 'ext',
+			'mwl', 'sd', 'ig', 'myv', 'ay', 'iu', 'na', 'cu', 'pi', 'kl', 'ty', 'lbe', 'ab', 'got', 'sm', 'as', 'mo',
+			'ee', 'zea', 'av', 'ace', 'kg', 'bm', 'cdo', 'cbk-zam', 'kab', 'om', 'chr', 'pap', 'udm', 'ks', 'zu', 'rmy',
+			'cr', 'ch', 'st', 'ik', 'mdf', 'kaa', 'aa', 'fj', 'srn', 'tet', 'or', 'pnt', 'bug', 'ss', 'ts', 'pcd',
+			'pih', 'za', 'sg', 'lg', 'bxr', 'xh', 'ak', 'ha', 'bi', 've', 'tn', 'ff', 'dz', 'ti', 'ki', 'ny', 'rw',
+			'chy', 'tw', 'sn', 'tum', 'ng', 'rn', 'mh', 'ii', 'cho', 'hz', 'kr', 'ho', 'mus', 'kj'
+		];
+		// If the user has an Accept-Language cookie, use it. Otherwise, set it asynchronously but keep the default behavior
+		// for this page view.
+		var acceptLangCookie = $j.cookie( 'accept-language' );
+		if ( acceptLangCookie != null ) {
+			// Put the user's accepted languages before the list ordered by wiki size
+			if ( acceptLangCookie != '' ) {
+				languages = acceptLangCookie.split( ',' ).concat( languages );
+			}
+		} else {
+			$j.getJSON( wgScriptPath + '/api.php?action=query&meta=userinfo&uiprop=acceptlang&format=json', function( data ) {
+				var langs = [];
+				if ( typeof data.query != 'undefined' && typeof data.query.userinfo != 'undefined' &&
+						typeof data.query.userinfo.acceptlang != 'undefined' ) {
+					for ( var j = 0; j < data.query.userinfo.acceptlang.length; j++ ) {
+						if ( data.query.userinfo.acceptlang[j].q != 0 ) {
+							langs.push( data.query.userinfo.acceptlang[j]['*'] );
+						}
+					}
+				}
+				$j.cookie( 'accept-language', langs.join( ',' ), { 'path': '/', 'expires': 30 } );
+			} );
+		}
+		// Shortcuts to the two lists
+		var $primary = $j( '#p-lang ul.primary' );
+		var $secondary = $j( '#p-lang ul.secondary' );
+		// Adjust the limit based on the threshold
+		if ( $secondary.children().length < limit + threshold ) {
+			limit += threshold;
+		}
+		// Move up to 5 of the links into the primary list, based on the priorities set forth in the languages list
+		var count = 0;
+		for ( var i = 0; i < languages.length; i++ ) {
+			var $link = $secondary.find( '.interwiki-' + languages[i] );
+			if ( $link.length ) {
+				if ( count++ < limit ) {
+					$link.appendTo( $primary );
+				} else {
+					break;
+				}
+			}
+		}
+		// If there's still links in the secondary list and we havn't filled the primary list to it's limit yet, move links
+		// into the primary list in order of appearance
+		if ( count < limit ) {
+			$secondary.children().each( function() {
+				if ( count++ < limit ) {
+					$j(this).appendTo( $primary );
+				} else {
+					return false;
+				}
+			} );
+		}
+		// Hide the more portal if it's now empty, otherwise make the list into it's very own portal
+		if ( $secondary.children().length == 0 ) {
+			$secondary.remove();
+		} else {
+			$j( '#p-lang' ).after( '<div id="p-lang-more" class="portal"><h5></h5><div class="body"></div></div>' );
+			$j( '#p-lang-more h5' ).text( mw.usability.getMsg( 'vector-collapsiblenav-more' ) );
+			$secondary.appendTo( $j( '#p-lang-more div.body' ) );
+		}
+		// Always show the primary interwiki language portal
+		$j( '#p-lang' ).addClass( 'persistent' );
+	}
 	
-	$j( '#panel' ).addClass( 'collapsible-nav' );
+	/* General Portal Modification */
+	
 	// Always show the first portal
-	$j( '#panel > div.portal:first' )
-		.addClass( 'expanded' )
-		.find( 'div.body' )
-		.show();
-	// Remember which portals to hide and show
-	$j( '#panel > div.portal:not(:first)' )
+	$j( '#mw-panel > div.portal:first' ).addClass( 'first persistent' );
+	// Apply a class to the entire panel to activate styles
+	$j( '#mw-panel' ).addClass( 'collapsible-nav' );
+	// Use cookie data to restore preferences of what to show and hide
+	$j( '#mw-panel > div.portal:not(.persistent)' )
 		.each( function( i ) {
-			var state = $j.cookie( 'vector-nav-' + $j(this).attr( 'id' ) );
-			if ( state == 'true' || ( state == null && (i < 1 || ( $j(this).attr( 'id' ) == 'p-lang' ) ) ) ) {
+			var id = $j(this).attr( 'id' );
+			var state = $j.cookie( 'vector-nav-' + id );
+			// In the case that we are not showing the new version, let's show the languages by default
+			if ( state == 'true' || ( state == null && i < 1 ) || version == 1 && id == 'p-lang' ) {
 				$j(this)
 					.addClass( 'expanded' )
 					.find( 'div.body' )
@@ -50,12 +165,16 @@
 			}
 			// Re-save cookie
 			if ( state != null ) {
-				$j.cookie( 'vector-nav-' + $j(this).attr( 'id' ), state, { expires: 30, path: '/' } );
+				$j.cookie( 'vector-nav-' + $j(this).attr( 'id' ), state, { 'expires': 30, 'path': '/' } );
 			}
 		} );
 	// Use the same function for all navigation headings - don't repeat yourself
 	function toggle( $element ) {
-		$j.cookie( 'vector-nav-' + $element.parent().attr( 'id' ), $element.parent().is( '.collapsed' ), { expires: 30, path: '/' } );
+		$j.cookie(
+			'vector-nav-' + $element.parent().attr( 'id' ),
+			$element.parent().is( '.collapsed' ),
+			{ 'expires': 30, 'path': '/' }
+		);
 		$element
 			.parent()
 			.toggleClass( 'expanded' )
@@ -63,7 +182,7 @@
 			.find( 'div.body' )
 			.slideToggle( 'fast' );
 	}
-	var $headings = $j( '#panel > div.portal > h5' );
+	var $headings = $j( '#mw-panel > div.portal:not(.persistent) > h5' );
 	/** Copy-pasted from jquery.wikiEditor.dialogs - :( */
 	// Find the highest tabindex in use
 	var maxTI = 0;

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -24,6 +24,14 @@
 	'vector-editwarning-preference' => "Waarsku my as ek 'n gewysigde bladsy verlaat alvorens dit gestoor is",
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'vector-editwarning-warning' => 'Duke e lënë këtë faqe mund të bëjë që ju të humbni ndonjë ndryshim që keni bërë. Nëse ju jeni regjistruar, ju mund ta çaktivizoni këtë paralajmërim në "{{int:prefs-editing}}" seksionin e preferencave tuaja.',
+	'vector-editwarning-preference' => 'Paralajmëron mua kur unë të lë një redakto faqe me ndryshimet e para shpëtimit',
+);
+
 /** Arabic (العربية)
  * @author OsamaK
  */
@@ -60,7 +68,7 @@
 $messages['bg'] = array(
 	'vector-editwarning-warning' => 'Ако излезете от тази страница, може да загубите всички незапазени промени, които сте направили. 
 Ако сте влезли в системата, можете да изключите това предупреждение през меню "{{int:prefs-editing}}" във вашите лични настройки.',
-	'vector-editwarning-preference' => 'Предупреди ме, ако понеча да изляза от страница в режим на редактиране без да запазя промените',
+	'vector-editwarning-preference' => 'Предупреждаване при опит за напускане на страница, отворена в режим на редактиране, без да са запазени промените',
 ); /** Bengali (বাংলা)
@@ -226,6 +234,14 @@
 	'vector-editwarning-preference' => 'Abisa nazazu gorde gabeko aldaketak eginez orrialde bat uzten dudanean',
 );+/** Persian (فارسی)
+ * @author Ebraminio
+ * @author Huji
+ */
+$messages['fa'] = array(
+	'vector-editwarning-preference' => 'زمان خروج از صفحهٔ ویرایش در صورت داشتن ویرایش‌های‌ ذخیره‌نشده به من هشدار بده',
+);
+
 /** Finnish (Suomi)
  * @author Crt
  * @author Str4nd
@@ -537,8 +553,8 @@
  * @author Stelistcristi
  */
 $messages['ro'] = array(
-	'vector-editwarning-warning' => 'Părăsind această pagină se poate provoca ca să pierdeţi orice schimbare aţi făcut dvs.
-Dacă sunteţi logat, puteţi dezactiva această avertizare în secţiunea „{{int:prefs-editing}}” a preferinţelor dvs.',
+	'vector-editwarning-warning' => 'Părăsind această pagină se poate provoca ca să pierdeți orice schimbare ați făcut dvs.
+Dacă sunteți logat, puteți dezactiva această avertizare în secțiunea „{{int:prefs-editing}}” a preferințelor dvs.',
 	'vector-editwarning-preference' => 'Avertizează-mă când voi părăsi o pagină de editare cu schimbări nesalvate',
 );@@ -638,6 +654,15 @@
 	'vector-editwarning-preference' => 'เตือนฉัน เมื่อฉันกำลังจะออกจากหน้าแก้ไขโดยมีข้อมูลที่ยังไม่ได้บันทึก',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'vector-editwarning-warning' => 'Ang paglisan mula sa pahinang ito ay maaaring makasanhi sa iyo ng pagkawala ng anumang mga pagbabagong ginawa mo.
+Kung nakalagda ka, maaari mong huwag paganahin ang babalang ito sa loob ng seksyong "{{int:prefs-editing}}" ng mga nais mo.',
+	'vector-editwarning-preference' => 'Magbabala sa akin kapag umalis ako sa isang pahina ng pampatnugot na hindi pa nasasagip ang mga pagbabago',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  */

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -13,7 +13,7 @@
 	fallbackWindowOnBeforeUnload = window.onbeforeunload;
 	window.onbeforeunload = function() {
 		var fallbackResult = undefined;
-		// Check if someone already set on onbeforunload hook
+		// Check if someone already set on onbeforeunload hook
 		if ( fallbackWindowOnBeforeUnload ) {
 			// Get the result of their onbeforeunload hook
 			fallbackResult = fallbackWindowOnBeforeUnload();

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/ExpandableSearch/ExpandableSearch.js
===================================================================
--- trunk/extensions/UsabilityInitiative/Vector/Modules/ExpandableSearch/ExpandableSearch.js	2010-06-01 23:30:17 UTC (rev 67203)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/ExpandableSearch/ExpandableSearch.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -39,5 +39,7 @@
 					$j.collapsibleTabs.handleResize();
 				}
 			}
-		} );
+		} )
+		.siblings( 'button' )
+		.css( 'float', 'right' );
 });

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -36,6 +36,14 @@
 	'vector-simplesearch-containing' => 'bevat...',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'vector-simplesearch-search' => 'Kërkim',
+	'vector-simplesearch-containing' => 'përmban ...',
+);
+
 /** Arabic (العربية)
  * @author OsamaK
  */
@@ -149,7 +157,7 @@
  */
 $messages['de'] = array(
 	'vector-simplesearch-search' => 'Suche',
-	'vector-simplesearch-containing' => 'enthält …',
+	'vector-simplesearch-containing' => 'Volltextsuche nach …',
 ); /** Zazaki (Zazaki)
@@ -157,8 +165,8 @@
  * @author Xoser
  */
 $messages['diq'] = array(
-	'vector-simplesearch-search' => 'cıgêr',
-	'vector-simplesearch-containing' => 'tede esto...',
+	'vector-simplesearch-search' => 'Çekuye binuse',
+	'vector-simplesearch-containing' => 'înan tede estê...',
 ); /** Lower Sorbian (Dolnoserbski)
@@ -200,9 +208,11 @@ /** Estonian (Eesti)
  * @author Avjoska
+ * @author Pikne
  */
 $messages['et'] = array(
 	'vector-simplesearch-search' => 'Otsi',
+	'vector-simplesearch-containing' => 'sisalduv...',
 ); /** Basque (Euskara)
@@ -215,10 +225,12 @@
 ); /** Persian (فارسی)
+ * @author Ebraminio
  * @author Mardetanha
  */
 $messages['fa'] = array(
 	'vector-simplesearch-search' => 'جستجو',
+	'vector-simplesearch-containing' => 'صفحه‌های دربردارنده...',
 ); /** Finnish (Suomi)
@@ -426,6 +438,14 @@
 	'vector-simplesearch-search' => 'Ieškoti',
 );+/** Latvian (Latviešu)
+ * @author GreenZeb
+ */
+$messages['lv'] = array(
+	'vector-simplesearch-search' => 'Meklēt',
+	'vector-simplesearch-containing' => 'Meklējamā frāze:',
+);
+
 /** Macedonian (Македонски)
  * @author Bjankuloski06
  */
@@ -451,10 +471,12 @@
 ); /** Malay (Bahasa Melayu)
+ * @author Aurora
  * @author Diagramma Della Verita
  */
 $messages['ms'] = array(
 	'vector-simplesearch-search' => 'Cari',
+	'vector-simplesearch-containing' => 'mengandungi...',
 ); /** Maltese (Malti)
@@ -573,8 +595,8 @@
  * @author Firilacroco
  */
 $messages['ro'] = array(
-	'vector-simplesearch-search' => 'Căutaţi',
-	'vector-simplesearch-containing' => 'conţinând...',
+	'vector-simplesearch-search' => 'Căutați',
+	'vector-simplesearch-containing' => 'conținând...',
 ); /** Tarandíne (Tarandíne)
@@ -602,6 +624,13 @@
 	'vector-simplesearch-containing' => 'иһинээҕи...',
 );+/** Sardinian (Sardu)
+ * @author Andria
+ */
+$messages['sc'] = array(
+	'vector-simplesearch-search' => 'Chirca',
+);
+
 /** Sicilian (Sicilianu)
  * @author Melos
  */
@@ -701,6 +730,14 @@
 	'vector-simplesearch-containing' => 'öz içine alýar...',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'vector-simplesearch-search' => 'Maghanap',
+	'vector-simplesearch-containing' => 'naglalaman ng ...',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  */

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -57,6 +57,11 @@
 				$j(this).parent().find( 'label' ).fadeIn( 100 );
 			}
 		})
+		.bind( 'keypress', function() {
+			// just in case the text field was focus before our handler was bound to it
+			if ( $j(this).parent().find( 'label:visible' ).size() > 0 )
+				$j(this).parent().find( 'label' ).fadeOut( 100 );
+		})
 		.focus( function() {
 			$j(this).parent().find( 'label' ).fadeOut( 100 );
 		})
@@ -65,6 +70,13 @@
 				$j(this).parent().find( 'label' ).fadeIn( 100 );
 			}
 		});
+		// listen for dragend events in order to clear the label from the search field if
+		// text is dragged into it. Only works for mozilla
+		$j( document ).bind( 'dragend', function( event ) {
+			if ( $j( 'div#simpleSearch > label:visible' ).size() > 0 
+				&& $j( 'div#simpleSearch > input#searchInput' ).val().length > 0 )
+					$j( 'div#simpleSearch > label' ).fadeOut( 100 );
+		} );
 	$j( '#searchInput, #searchInput2, #powerSearchText, #searchText' ).suggestions( {
 		fetch: function( query ) {
 			var $this = $j(this);
@@ -99,7 +111,10 @@
 		},
 		delay: 120,
 		positionFromLeft: $j( 'body' ).is( '.rtl' )
-	} );
+	} )
+		.bind( 'paste cut click', function() {
+			$j( this ).trigger( 'keypress' );
+		} );
 	$j( '#searchInput' ).suggestions( {
 		result: {
 			select: function( $textbox ) {
@@ -134,5 +149,8 @@
 			}
 		},
 		$region: $j( '#simpleSearch' )
-	} );
+	} )
+		.bind( 'paste cut click', function() {
+			$j( this ).trigger( 'keypress' );
+		} );
 });

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -14,7 +14,8 @@
 				'konqueror': [['>=', 4.0]],
 				'blackberry': false,
 				'ipod': false,
-				'iphone': false
+				'iphone': false,
+				'ps3': false
 			},
 			// Right-to-left languages
 			'rtl': {
@@ -22,25 +23,139 @@
 				'konqueror': [['>=', 4.0]],
 				'blackberry': false,
 				'ipod': false,
-				'iphone': false
+				'iphone': false,
+				'ps3': false
 			}
 		}
 	};
 	if ( !$j.wikiEditor.isSupported( mod ) ) {
 		return true;
 	}
+	// Fallback to old version
+	var version = 1;
+	// Allow new version override
+	if ( wgCollapsibleNavForceNewVersion ) {
+		version = 2;
+	} else {
+		// Make bucket testing optional
+		if ( wgCollapsibleNavBucketTest ) {
+			// This is be determined randomly, and then stored in a cookie
+			version = $j.cookie( 'vector-nav-pref-version' );
+			// If the cookie didn't exist, or the value is out of range, generate a new one and save it
+			if ( version == null ) {
+				// 50% of the people will get the new version
+				version = Math.round( Math.random() + 1 );
+				$j.cookie( 'vector-nav-pref-version', version, { 'expires': 30, 'path': '/' } );
+			}
+		}
+	}
+	// Language portal splitting feature (if it's turned on)
+	if ( version == 2 ) {
+		// How many links to show in the primary languages portal
+		var limit = 5;
+		// How many links there must be in the secondary portal to justify having a secondary portal
+		var threshold = 3;
+		// Make the interwiki language links list a secondary list, and create a new list before it as primary list
+		$j( '#p-lang ul' ).addClass( 'secondary' ).before( '<ul class="primary"></ul>' );
+		// This is a list of languages in order of Wikipedia project size. This is the lowest fallback for choosing
+		// which links to show in the primary list. Ideally the browser's accept-language headers should steer this
+		// list, and we should fallback on a site configured (MediaWiki:Common.js) list of prefered languages.
+		var languages = [
+			'en', 'fr', 'de', 'es', 'pt', 'it', 'ru', 'ja', 'nl', 'pl', 'zh', 'sv', 'ar', 'tr', 'uk', 'fi', 'no', 'ca',
+			'ro', 'hu', 'ksh', 'id',  'he', 'cs', 'vi', 'ko', 'sr', 'fa', 'da', 'eo', 'sk', 'th', 'lt', 'vo', 'bg',
+			'sl', 'hr', 'hi', 'et', 'mk', 'simple', 'new', 'ms', 'nn', 'gl', 'el', 'eu', 'ka', 'tl', 'bn', 'lv', 'ml',
+			'bs', 'te', 'la', 'az', 'sh', 'war', 'br', 'is', 'mr', 'be-x-old', 'sq', 'cy', 'lb', 'ta', 'zh-classical',
+			'an', 'jv', 'ht', 'oc', 'bpy', 'ceb', 'ur', 'zh-yue', 'pms', 'scn', 'be', 'roa-rup', 'qu', 'af', 'sw',
+			'nds', 'fy', 'lmo', 'wa', 'ku', 'hy', 'su', 'yi', 'io', 'os', 'ga', 'ast', 'nap', 'vec', 'gu', 'cv',
+			'bat-smg', 'kn', 'uz', 'zh-min-nan', 'si', 'als', 'yo', 'li', 'gan', 'arz', 'sah', 'tt', 'bar', 'gd', 'tg',
+			'kk', 'pam', 'hsb', 'roa-tara', 'nah', 'mn', 'vls', 'gv', 'mi', 'am', 'ia', 'co', 'ne', 'fo', 'nds-nl',
+			'glk', 'mt', 'ang', 'wuu', 'dv', 'km', 'sco', 'bcl', 'mg', 'my', 'diq', 'tk', 'szl', 'ug', 'fiu-vro', 'sc',
+			'rm', 'nrm', 'ps', 'nv', 'hif', 'bo', 'se', 'sa', 'pnb', 'map-bms', 'lad', 'lij', 'crh', 'fur', 'kw', 'to',
+			'pa', 'jbo', 'ba', 'ilo', 'csb', 'wo', 'xal', 'krc', 'ckb', 'pag', 'ln', 'frp', 'mzn', 'ce', 'nov', 'kv',
+			'eml', 'gn', 'ky', 'pdc', 'lo', 'haw', 'mhr', 'dsb', 'stq', 'tpi', 'arc', 'hak', 'ie', 'so', 'bh', 'ext',
+			'mwl', 'sd', 'ig', 'myv', 'ay', 'iu', 'na', 'cu', 'pi', 'kl', 'ty', 'lbe', 'ab', 'got', 'sm', 'as', 'mo',
+			'ee', 'zea', 'av', 'ace', 'kg', 'bm', 'cdo', 'cbk-zam', 'kab', 'om', 'chr', 'pap', 'udm', 'ks', 'zu', 'rmy',
+			'cr', 'ch', 'st', 'ik', 'mdf', 'kaa', 'aa', 'fj', 'srn', 'tet', 'or', 'pnt', 'bug', 'ss', 'ts', 'pcd',
+			'pih', 'za', 'sg', 'lg', 'bxr', 'xh', 'ak', 'ha', 'bi', 've', 'tn', 'ff', 'dz', 'ti', 'ki', 'ny', 'rw',
+			'chy', 'tw', 'sn', 'tum', 'ng', 'rn', 'mh', 'ii', 'cho', 'hz', 'kr', 'ho', 'mus', 'kj'
+		];
+		// If the user has an Accept-Language cookie, use it. Otherwise, set it asynchronously but keep the default behavior
+		// for this page view.
+		var acceptLangCookie = $j.cookie( 'accept-language' );
+		if ( acceptLangCookie != null ) {
+			// Put the user's accepted languages before the list ordered by wiki size
+			if ( acceptLangCookie != '' ) {
+				languages = acceptLangCookie.split( ',' ).concat( languages );
+			}
+		} else {
+			$j.getJSON( wgScriptPath + '/api.php?action=query&meta=userinfo&uiprop=acceptlang&format=json', function( data ) {
+				var langs = [];
+				if ( typeof data.query != 'undefined' && typeof data.query.userinfo != 'undefined' &&
+						typeof data.query.userinfo.acceptlang != 'undefined' ) {
+					for ( var j = 0; j < data.query.userinfo.acceptlang.length; j++ ) {
+						if ( data.query.userinfo.acceptlang[j].q != 0 ) {
+							langs.push( data.query.userinfo.acceptlang[j]['*'] );
+						}
+					}
+				}
+				$j.cookie( 'accept-language', langs.join( ',' ), { 'path': '/', 'expires': 30 } );
+			} );
+		}
+		// Shortcuts to the two lists
+		var $primary = $j( '#p-lang ul.primary' );
+		var $secondary = $j( '#p-lang ul.secondary' );
+		// Adjust the limit based on the threshold
+		if ( $secondary.children().length < limit + threshold ) {
+			limit += threshold;
+		}
+		// Move up to 5 of the links into the primary list, based on the priorities set forth in the languages list
+		var count = 0;
+		for ( var i = 0; i < languages.length; i++ ) {
+			var $link = $secondary.find( '.interwiki-' + languages[i] );
+			if ( $link.length ) {
+				if ( count++ < limit ) {
+					$link.appendTo( $primary );
+				} else {
+					break;
+				}
+			}
+		}
+		// If there's still links in the secondary list and we havn't filled the primary list to it's limit yet, move links
+		// into the primary list in order of appearance
+		if ( count < limit ) {
+			$secondary.children().each( function() {
+				if ( count++ < limit ) {
+					$j(this).appendTo( $primary );
+				} else {
+					return false;
+				}
+			} );
+		}
+		// Hide the more portal if it's now empty, otherwise make the list into it's very own portal
+		if ( $secondary.children().length == 0 ) {
+			$secondary.remove();
+		} else {
+			$j( '#p-lang' ).after( '<div id="p-lang-more" class="portal"><h5></h5><div class="body"></div></div>' );
+			$j( '#p-lang-more h5' ).text( mw.usability.getMsg( 'vector-collapsiblenav-more' ) );
+			$secondary.appendTo( $j( '#p-lang-more div.body' ) );
+		}
+		// Always show the primary interwiki language portal
+		$j( '#p-lang' ).addClass( 'persistent' );
+	}
 	
-	$j( '#panel' ).addClass( 'collapsible-nav' );
+	/* General Portal Modification */
+	
 	// Always show the first portal
-	$j( '#panel > div.portal:first' )
-		.addClass( 'expanded' )
-		.find( 'div.body' )
-		.show();
-	// Remember which portals to hide and show
-	$j( '#panel > div.portal:not(:first)' )
+	$j( '#mw-panel > div.portal:first' ).addClass( 'first persistent' );
+	// Apply a class to the entire panel to activate styles
+	$j( '#mw-panel' ).addClass( 'collapsible-nav' );
+	// Use cookie data to restore preferences of what to show and hide
+	$j( '#mw-panel > div.portal:not(.persistent)' )
 		.each( function( i ) {
-			var state = $j.cookie( 'vector-nav-' + $j(this).attr( 'id' ) );
-			if ( state == 'true' || ( state == null && (i < 1 || ( $j(this).attr( 'id' ) == 'p-lang' ) ) ) ) {
+			var id = $j(this).attr( 'id' );
+			var state = $j.cookie( 'vector-nav-' + id );
+			// In the case that we are not showing the new version, let's show the languages by default
+			if ( state == 'true' || ( state == null && i < 1 ) || version == 1 && id == 'p-lang' ) {
 				$j(this)
 					.addClass( 'expanded' )
 					.find( 'div.body' )
@@ -50,12 +165,16 @@
 			}
 			// Re-save cookie
 			if ( state != null ) {
-				$j.cookie( 'vector-nav-' + $j(this).attr( 'id' ), state, { expires: 30, path: '/' } );
+				$j.cookie( 'vector-nav-' + $j(this).attr( 'id' ), state, { 'expires': 30, 'path': '/' } );
 			}
 		} );
 	// Use the same function for all navigation headings - don't repeat yourself
 	function toggle( $element ) {
-		$j.cookie( 'vector-nav-' + $element.parent().attr( 'id' ), $element.parent().is( '.collapsed' ), { expires: 30, path: '/' } );
+		$j.cookie(
+			'vector-nav-' + $element.parent().attr( 'id' ),
+			$element.parent().is( '.collapsed' ),
+			{ 'expires': 30, 'path': '/' }
+		);
 		$element
 			.parent()
 			.toggleClass( 'expanded' )
@@ -63,7 +182,7 @@
 			.find( 'div.body' )
 			.slideToggle( 'fast' );
 	}
-	var $headings = $j( '#panel > div.portal > h5' );
+	var $headings = $j( '#mw-panel > div.portal:not(.persistent) > h5' );
 	/** Copy-pasted from jquery.wikiEditor.dialogs - :( */
 	// Find the highest tabindex in use
 	var maxTI = 0;
@@ -188,7 +307,7 @@
 	fallbackWindowOnBeforeUnload = window.onbeforeunload;
 	window.onbeforeunload = function() {
 		var fallbackResult = undefined;
-		// Check if someone already set on onbeforunload hook
+		// Check if someone already set on onbeforeunload hook
 		if ( fallbackWindowOnBeforeUnload ) {
 			// Get the result of their onbeforeunload hook
 			fallbackResult = fallbackWindowOnBeforeUnload();
@@ -217,6 +336,51 @@
 });
 //Global storage of fallback for onbeforeunload hook
 var fallbackWindowOnBeforeUnload = null;
+/* JavaScript for ExpandableSearch extension */
+$j( document ).ready( function() {
+	
+	// Only use this function in conjuction with the Vector skin
+	if( !wgVectorEnabledModules.expandablesearch || skin != 'vector' ) {
+		return true;
+	}
+	$j( '#searchInput' )
+		.expandableField( { 
+			'beforeExpand': function( context ) {
+				// animate the containers border
+				$j( this )
+					.parent()
+					.animate( {
+						'borderTopColor': '#a0d8ff',
+						'borderLeftColor': '#a0d8ff',
+						'borderRightColor': '#a0d8ff',
+						'borderBottomColor': '#a0d8ff' }, 'fast' );
+			},
+			'beforeCondense': function( context ) {
+				// animate the containers border
+				$j( this )
+					.parent()
+					.animate( {
+						'borderTopColor': '#aaaaaa',
+						'borderLeftColor': '#aaaaaa',
+						'borderRightColor': '#aaaaaa',
+						'borderBottomColor': '#aaaaaa' }, 'fast' );
+			},
+			'afterExpand': function( context ) {
+				//trigger the collapsible tabs resize handler
+				if ( typeof $j.collapsibleTabs != 'undefined' ){
+					$j.collapsibleTabs.handleResize();
+				}
+			},
+			'afterCondense': function( context ) {
+				//trigger the collapsible tabs resize handler
+				if ( typeof $j.collapsibleTabs != 'undefined' ){
+					$j.collapsibleTabs.handleResize();
+				}
+			}
+		} )
+		.siblings( 'button' )
+		.css( 'float', 'right' );
+});
 /* Prototype code to demonstrate proposed edit page footer cleanups */
 /* First draft and will be changing greatly */@@ -347,6 +511,11 @@
 				$j(this).parent().find( 'label' ).fadeIn( 100 );
 			}
 		})
+		.bind( 'keypress', function() {
+			// just in case the text field was focus before our handler was bound to it
+			if ( $j(this).parent().find( 'label:visible' ).size() > 0 )
+				$j(this).parent().find( 'label' ).fadeOut( 100 );
+		})
 		.focus( function() {
 			$j(this).parent().find( 'label' ).fadeOut( 100 );
 		})
@@ -355,6 +524,13 @@
 				$j(this).parent().find( 'label' ).fadeIn( 100 );
 			}
 		});
+		// listen for dragend events in order to clear the label from the search field if
+		// text is dragged into it. Only works for mozilla
+		$j( document ).bind( 'dragend', function( event ) {
+			if ( $j( 'div#simpleSearch > label:visible' ).size() > 0 
+				&& $j( 'div#simpleSearch > input#searchInput' ).val().length > 0 )
+					$j( 'div#simpleSearch > label' ).fadeOut( 100 );
+		} );
 	$j( '#searchInput, #searchInput2, #powerSearchText, #searchText' ).suggestions( {
 		fetch: function( query ) {
 			var $this = $j(this);
@@ -389,7 +565,10 @@
 		},
 		delay: 120,
 		positionFromLeft: $j( 'body' ).is( '.rtl' )
-	} );
+	} )
+		.bind( 'paste cut click', function() {
+			$j( this ).trigger( 'keypress' );
+		} );
 	$j( '#searchInput' ).suggestions( {
 		result: {
 			select: function( $textbox ) {
@@ -424,5 +603,8 @@
 			}
 		},
 		$region: $j( '#simpleSearch' )
-	} );
+	} )
+		.bind( 'paste cut click', function() {
+			$j( this ).trigger( 'keypress' );
+		} );
 });

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.min.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.min.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -1,9 +1,17 @@ $j(document).ready(function(){if(!wgVectorEnabledModules.collapsiblenav){return true;}
-var mod={'browsers':{'ltr':{'opera':[['>=',9.6]],'konqueror':[['>=',4.0]],'blackberry':false,'ipod':false,'iphone':false},'rtl':{'opera':[['>=',9.6]],'konqueror':[['>=',4.0]],'blackberry':false,'ipod':false,'iphone':false}}};if(!$j.wikiEditor.isSupported(mod)){return true;}
-$j('#panel').addClass('collapsible-nav');$j('#panel > div.portal:first').addClass('expanded').find('div.body').show();$j('#panel > div.portal:not(:first)').each(function(i){var state=$j.cookie('vector-nav-'+$j(this).attr('id'));if(state=='true'||(state==null&&(i<1||($j(this).attr('id')=='p-lang')))){$j(this).addClass('expanded').find('div.body').show();}else{$j(this).addClass('collapsed');}
-if(state!=null){$j.cookie('vector-nav-'+$j(this).attr('id'),state,{expires:30,path:'/'});}});function toggle($element){$j.cookie('vector-nav-'+$element.parent().attr('id'),$element.parent().is('.collapsed'),{expires:30,path:'/'});$element.parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');}
-var $headings=$j('#panel > div.portal > h5');var maxTI=0;$j('[tabindex]').each(function(){var ti=parseInt($j(this).attr('tabindex'));if(ti>maxTI)
+var mod={'browsers':{'ltr':{'opera':[['>=',9.6]],'konqueror':[['>=',4.0]],'blackberry':false,'ipod':false,'iphone':false,'ps3':false},'rtl':{'opera':[['>=',9.6]],'konqueror':[['>=',4.0]],'blackberry':false,'ipod':false,'iphone':false,'ps3':false}}};if(!$j.wikiEditor.isSupported(mod)){return true;}
+var version=1;if(wgCollapsibleNavForceNewVersion){version=2;}else{if(wgCollapsibleNavBucketTest){version=$j.cookie('vector-nav-pref-version');if(version==null){version=Math.round(Math.random()+1);$j.cookie('vector-nav-pref-version',version,{'expires':30,'path':'/'});}}}
+if(version==2){var limit=5;var threshold=3;$j('#p-lang ul').addClass('secondary').before('<ul class="primary"></ul>');var languages=['en','fr','de','es','pt','it','ru','ja','nl','pl','zh','sv','ar','tr','uk','fi','no','ca','ro','hu','ksh','id','he','cs','vi','ko','sr','fa','da','eo','sk','th','lt','vo','bg','sl','hr','hi','et','mk','simple','new','ms','nn','gl','el','eu','ka','tl','bn','lv','ml','bs','te','la','az','sh','war','br','is','mr','be-x-old','sq','cy','lb','ta','zh-classical','an','jv','ht','oc','bpy','ceb','ur','zh-yue','pms','scn','be','roa-rup','qu','af','sw','nds','fy','lmo','wa','ku','hy','su','yi','io','os','ga','ast','nap','vec','gu','cv','bat-smg','kn','uz','zh-min-nan','si','als','yo','li','gan','arz','sah','tt','bar','gd','tg','kk','pam','hsb','roa-tara','nah','mn','vls','gv','mi','am','ia','co','ne','fo','nds-nl','glk','mt','ang','wuu','dv','km','sco','bcl','mg','my','diq','tk','szl','ug','fiu-vro','sc','rm','nrm','ps','nv','hif','bo','se','sa','pnb','map-bms','lad','lij','crh','fur','kw','to','pa','jbo','ba','ilo','csb','wo','xal','krc','ckb','pag','ln','frp','mzn','ce','nov','kv','eml','gn','ky','pdc','lo','haw','mhr','dsb','stq','tpi','arc','hak','ie','so','bh','ext','mwl','sd','ig','myv','ay','iu','na','cu','pi','kl','ty','lbe','ab','got','sm','as','mo','ee','zea','av','ace','kg','bm','cdo','cbk-zam','kab','om','chr','pap','udm','ks','zu','rmy','cr','ch','st','ik','mdf','kaa','aa','fj','srn','tet','or','pnt','bug','ss','ts','pcd','pih','za','sg','lg','bxr','xh','ak','ha','bi','ve','tn','ff','dz','ti','ki','ny','rw','chy','tw','sn','tum','ng','rn','mh','ii','cho','hz','kr','ho','mus','kj'];var acceptLangCookie=$j.cookie('accept-language');if(acceptLangCookie!=null){if(acceptLangCookie!=''){languages=acceptLangCookie.split(',').concat(languages);}}else{$j.getJSON(wgScriptPath+'/api.php?action=query&meta=userinfo&uiprop=acceptlang&format=json',function(data){var langs=[];if(typeof data.query!='undefined'&&typeof data.query.userinfo!='undefined'&&typeof data.query.userinfo.acceptlang!='undefined'){for(var j=0;j<data.query.userinfo.acceptlang.length;j++){if(data.query.userinfo.acceptlang[j].q!=0){langs.push(data.query.userinfo.acceptlang[j]['*']);}}}
+$j.cookie('accept-language',langs.join(','),{'path':'/','expires':30});});}
+var $primary=$j('#p-lang ul.primary');var $secondary=$j('#p-lang ul.secondary');if($secondary.children().length<limit+threshold){limit+=threshold;}
+var count=0;for(var i=0;i<languages.length;i++){var $link=$secondary.find('.interwiki-'+languages[i]);if($link.length){if(count++<limit){$link.appendTo($primary);}else{break;}}}
+if(count<limit){$secondary.children().each(function(){if(count++<limit){$j(this).appendTo($primary);}else{return false;}});}
+if($secondary.children().length==0){$secondary.remove();}else{$j('#p-lang').after('<div id="p-lang-more" class="portal"><h5></h5><div class="body"></div></div>');$j('#p-lang-more h5').text(mw.usability.getMsg('vector-collapsiblenav-more'));$secondary.appendTo($j('#p-lang-more div.body'));}
+$j('#p-lang').addClass('persistent');}
+$j('#mw-panel > div.portal:first').addClass('first persistent');$j('#mw-panel').addClass('collapsible-nav');$j('#mw-panel > div.portal:not(.persistent)').each(function(i){var id=$j(this).attr('id');var state=$j.cookie('vector-nav-'+id);if(state=='true'||(state==null&&i<1)||version==1&&id=='p-lang'){$j(this).addClass('expanded').find('div.body').show();}else{$j(this).addClass('collapsed');}
+if(state!=null){$j.cookie('vector-nav-'+$j(this).attr('id'),state,{'expires':30,'path':'/'});}});function toggle($element){$j.cookie('vector-nav-'+$element.parent().attr('id'),$element.parent().is('.collapsed'),{'expires':30,'path':'/'});$element.parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');}
+var $headings=$j('#mw-panel > div.portal:not(.persistent) > h5');var maxTI=0;$j('[tabindex]').each(function(){var ti=parseInt($j(this).attr('tabindex'));if(ti>maxTI)
 maxTI=ti;});var tabIndex=maxTI+1;$j('#searchInput').attr('tabindex',tabIndex++);$headings.each(function(){$j(this).attr('tabindex',tabIndex++);});$headings.keydown(function(event){if(event.which==13||event.which==32){toggle($j(this));}}).mousedown(function(){toggle($j(this));$j(this).blur();return false;});});$j(document).ready(function(){if(!wgVectorEnabledModules.collapsibletabs){return true;}
 var rtl=$j('body').is('.rtl');$j.collapsibleTabs.moveToCollapsed=function(ele){var $moving=$j(ele);$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=true;var data=$j.collapsibleTabs.getSettings($moving);var target=data.collapsedContainer;$moving.css("position","relative").css((rtl?'left':'right'),0).animate({width:'1px'},"normal",function(){$j(this).hide();$j('<span class="placeholder" style="display:none;"></span>').insertAfter(this);$j(this).remove().prependTo(target).data('collapsibleTabsSettings',data);$j(this).attr('style','display:list-item;');$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($j(ele)).expandedContainer)).shifting=false;$j.collapsibleTabs.handleResize();});};$j.collapsibleTabs.moveToExpanded=function(ele){var $moving=$j(ele);$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=true;var data=$j.collapsibleTabs.getSettings($moving);var $target=$j(data.expandedContainer).find('span.placeholder:first');var expandedWidth=data.expandedWidth;$moving.css("position","relative").css((rtl?'right':'left'),0).css('width','1px');$target.replaceWith($moving.remove().css('width','1px').data('collapsibleTabsSettings',data).animate({width:expandedWidth+"px"},"normal",function(){$j(this).attr('style','display:block;');$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=false;$j.collapsibleTabs.handleResize();}));};$j('#p-views ul').bind("beforeTabCollapse",function(){if($j('#p-cactions').css('display')=='none')
 $j("#p-cactions").addClass("filledPortlet").removeClass("emptyPortlet").find('h5').css('width','1px').animate({'width':'26px'},390);}).bind("beforeTabExpand",function(){if($j('#p-cactions li').length==1)
@@ -11,11 +19,14 @@
 $j('#wpTextbox1, #wpSummary').each(function(){$j(this).data('origtext',$j(this).val());});fallbackWindowOnBeforeUnload=window.onbeforeunload;window.onbeforeunload=function(){var fallbackResult=undefined;if(fallbackWindowOnBeforeUnload){fallbackResult=fallbackWindowOnBeforeUnload();}
 if(fallbackResult!==undefined){return fallbackResult;}
 if(wgAction=='submit'||$j('#wpTextbox1').data('origtext')!=$j('#wpTextbox1').val()||$j('#wpSummary').data('origtext')!=$j('#wpSummary').val()){return mw.usability.getMsg('vector-editwarning-warning');}}
-$j('form').submit(function(){window.onbeforeunload=fallbackWindowOnBeforeUnload;});});var fallbackWindowOnBeforeUnload=null;$j(document).ready(function(){if(!wgVectorEnabledModules.footercleanup){return true;}
+$j('form').submit(function(){window.onbeforeunload=fallbackWindowOnBeforeUnload;});});var fallbackWindowOnBeforeUnload=null;$j(document).ready(function(){if(!wgVectorEnabledModules.expandablesearch||skin!='vector'){return true;}
+$j('#searchInput').expandableField({'beforeExpand':function(context){$j(this).parent().animate({'borderTopColor':'#a0d8ff','borderLeftColor':'#a0d8ff','borderRightColor':'#a0d8ff','borderBottomColor':'#a0d8ff'},'fast');},'beforeCondense':function(context){$j(this).parent().animate({'borderTopColor':'#aaaaaa','borderLeftColor':'#aaaaaa','borderRightColor':'#aaaaaa','borderBottomColor':'#aaaaaa'},'fast');},'afterExpand':function(context){if(typeof $j.collapsibleTabs!='undefined'){$j.collapsibleTabs.handleResize();}},'afterCondense':function(context){if(typeof $j.collapsibleTabs!='undefined'){$j.collapsibleTabs.handleResize();}}}).siblings('button').css('float','right');});$j(document).ready(function(){if(!wgVectorEnabledModules.footercleanup){return true;}
 $j('#editpage-copywarn').add('.editOptions').wrapAll('<div id="editpage-bottom"></div>');$j('#wpSummary').data('hint',$j('#wpSummaryLabel span small').remove().text().replace(/\)|\(/g,'')).change(function(){if($j(this).val().length==0){$j(this).addClass('inline-hint').val($j(this).data('hint'));}else{$j(this).removeClass('inline-hint');}}).focus(function(){if($j(this).val()==$j(this).data('hint')){$j(this).removeClass('inline-hint').val("");}}).blur(function(){$j(this).trigger('change');}).trigger('change');$j('#wpSummary').add('.editCheckboxes').wrapAll('<div id="editpage-summary-fields"></div>');$j('#editpage-specialchars').remove();var transclusionCount=$j('.templatesUsed ul li').size();$j('.templatesUsed ul').wrap('<div id="transclusions-list" class="collapsible-list collapsed"></div>').parent().prepend('<label>This page contains <a href="http://en.wikipedia.org/wiki/transclusion">transclusions</a> of <strong>'
 +transclusionCount
 +'</strong> other pages.</label>');$j('.mw-templatesUsedExplanation').remove();$j('.collapsible-list label').click(function(){$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('ul').slideToggle('fast');return false;}).trigger('click');$j('#wpPreview, #wpDiff, .editHelp, #editpage-specialchars').remove();$j('#mw-editform-cancel').remove().appendTo('.editButtons');});if(wgVectorEnabledModules.simplesearch&&skin=='vector'&&typeof os_autoload_inputs!=='undefined'&&os_autoload_forms!=='undefined'){os_autoload_inputs=[];os_autoload_forms=[];}
 $j(document).ready(function(){if(!wgVectorEnabledModules.simplesearch||skin!='vector'){return true;}
 var mod={'browsers':{'ltr':{'opera':[['>=',9.6]],'blackberry':false,'ipod':false,'iphone':false},'rtl':{'opera':[['>=',9.6]],'blackberry':false,'ipod':false,'iphone':false}}};if(!$j.wikiEditor.isSupported(mod)){return true;}
-$j('div#simpleSearch > input#searchInput').each(function(){$j('<label />').text(mw.usability.getMsg('vector-simplesearch-search')).css({'display':'none','position':'absolute','bottom':0,'padding':'0.25em','color':'#999999','cursor':'text'}).css(($j('body').is('.rtl')?'right':'left'),0).click(function(){$j(this).parent().find('input#searchInput').focus();}).appendTo($j(this).parent());if($j(this).val()==''){$j(this).parent().find('label').fadeIn(100);}}).focus(function(){$j(this).parent().find('label').fadeOut(100);}).blur(function(){if($j(this).val()==''){$j(this).parent().find('label').fadeIn(100);}});$j('#searchInput, #searchInput2, #powerSearchText, #searchText').suggestions({fetch:function(query){var $this=$j(this);var request=$j.ajax({url:wgScriptPath+'/api.php',data:{'action':'opensearch','search':query,'namespace':0,'suggest':''},dataType:'json',success:function(data){$this.suggestions('suggestions',data[1]);}});$j(this).data('request',request);},cancel:function(){var request=$j(this).data('request');if(request&&typeof request.abort=='function'){request.abort();$j(this).removeData('request');}},result:{select:function($textbox){$textbox.closest('form').submit();}},delay:120,positionFromLeft:$j('body').is('.rtl')});$j('#searchInput').suggestions({result:{select:function($textbox){$textbox.closest('form').submit();}},special:{render:function(query){if($j(this).children().size()==0){$j(this).show()
-$label=$j('<div />').addClass('special-label').text(mw.usability.getMsg('vector-simplesearch-containing')).appendTo($j(this));$query=$j('<div />').addClass('special-query').text(query).appendTo($j(this));$query.autoEllipsis();}else{$j(this).find('.special-query').empty().text(query).autoEllipsis();}},select:function($textbox){$textbox.closest('form').append($j('<input />').attr({'type':'hidden','name':'fulltext','value':1}));$textbox.closest('form').submit();}},$region:$j('#simpleSearch')});});
\ No newline at end of file
+$j('div#simpleSearch > input#searchInput').each(function(){$j('<label />').text(mw.usability.getMsg('vector-simplesearch-search')).css({'display':'none','position':'absolute','bottom':0,'padding':'0.25em','color':'#999999','cursor':'text'}).css(($j('body').is('.rtl')?'right':'left'),0).click(function(){$j(this).parent().find('input#searchInput').focus();}).appendTo($j(this).parent());if($j(this).val()==''){$j(this).parent().find('label').fadeIn(100);}}).bind('keypress',function(){if($j(this).parent().find('label:visible').size()>0)
+$j(this).parent().find('label').fadeOut(100);}).focus(function(){$j(this).parent().find('label').fadeOut(100);}).blur(function(){if($j(this).val()==''){$j(this).parent().find('label').fadeIn(100);}});$j(document).bind('dragend',function(event){if($j('div#simpleSearch > label:visible').size()>0&&$j('div#simpleSearch > input#searchInput').val().length>0)
+$j('div#simpleSearch > label').fadeOut(100);});$j('#searchInput, #searchInput2, #powerSearchText, #searchText').suggestions({fetch:function(query){var $this=$j(this);var request=$j.ajax({url:wgScriptPath+'/api.php',data:{'action':'opensearch','search':query,'namespace':0,'suggest':''},dataType:'json',success:function(data){$this.suggestions('suggestions',data[1]);}});$j(this).data('request',request);},cancel:function(){var request=$j(this).data('request');if(request&&typeof request.abort=='function'){request.abort();$j(this).removeData('request');}},result:{select:function($textbox){$textbox.closest('form').submit();}},delay:120,positionFromLeft:$j('body').is('.rtl')}).bind('paste cut click',function(){$j(this).trigger('keypress');});$j('#searchInput').suggestions({result:{select:function($textbox){$textbox.closest('form').submit();}},special:{render:function(query){if($j(this).children().size()==0){$j(this).show()
+$label=$j('<div />').addClass('special-label').text(mw.usability.getMsg('vector-simplesearch-containing')).appendTo($j(this));$query=$j('<div />').addClass('special-query').text(query).appendTo($j(this));$query.autoEllipsis();}else{$j(this).find('.special-query').empty().text(query).autoEllipsis();}},select:function($textbox){$textbox.closest('form').append($j('<input />').attr({'type':'hidden','name':'fulltext','value':1}));$textbox.closest('form').submit();}},$region:$j('#simpleSearch')}).bind('paste cut click',function(){$j(this).trigger('keypress');});});
\ No newline at end of file

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.hooks.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.hooks.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.hooks.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -12,17 +12,18 @@
 	
 	static $scripts = array(
 		'raw' => array(
-			array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 15 ),
+			array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 25 ),
 			array( 'src' => 'Modules/CollapsibleTabs/CollapsibleTabs.js', 'version' => 8 ),
+			array( 'src' => 'Modules/ExpandableSearch/ExpandableSearch.js', 'version' => 3 ),
 			array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 8 ),
 			array( 'src' => 'Modules/FooterCleanup/FooterCleanup.js', 'version' => 5 ),
-			array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 13 ),
+			array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 15 ),
 		),
 		'combined' => array(
-			array( 'src' => 'Vector.combined.js', 'version' => 37 ),
+			array( 'src' => 'Vector.combined.js', 'version' => 47 ),
 		),
 		'minified' => array(
-			array( 'src' => 'Vector.combined.min.js', 'version' => 37 ),
+			array( 'src' => 'Vector.combined.min.js', 'version' => 47 ),
 		),
 	);
 	static $modules = array(
@@ -38,6 +39,13 @@
 					),
 				),
 			),
+			'messages' => array(
+				'vector-collapsiblenav-more',
+			),
+			'variables' => array(
+				'wgCollapsibleNavBucketTest',
+				'wgCollapsibleNavForceNewVersion',
+			),
 		),
 		'collapsibletabs' => array(
 		),
@@ -58,6 +66,8 @@
 				'vector-editwarning-warning',
 			),
 		),
+		'expandablesearch' => array(
+		),
 		'footercleanup' => array(
 		),
 		'simplesearch' => array(
@@ -137,15 +147,11 @@
 				basename( dirname( __FILE__ ) ) . '/' . $script['src'], $script['version']
 			);
 		}
-		// Preferences (maybe the UsabilityInitiative class could do most of this for us?)
-		$wgOut->addScript(
-			Xml::tags(
-				'script',
-				array( 'type' => $wgJsMimeType ),
-				'var wgVectorPreferences = ' . FormatJson::encode( $preferences, true ) . ";\n" .
-				'var wgVectorEnabledModules = ' . FormatJson::encode( $enabledModules, true ) . ';'
-			)
-		);
+		// Preferences
+		UsabilityInitiativeHooks::addVariables( array(
+			'wgVectorPreferences' => $preferences,
+			'wgVectorEnabledModules' => $enabledModules,
+		) );
 		return true;
 	}
 	

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -33,6 +33,14 @@
 	'vector-desc' => 'Verbeter die gebruikerskoppelvlak-elemente van die Vektor omslag (skin).',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'vector' => 'përmirësime UI për Vektor',
+	'vector-desc' => 'Në elementet përmirëson ndërfaqen e përdoruesit të lëkurës Vektor.',
+);
+
 /** Arabic (العربية)
  * @author Meno25
  */
@@ -115,10 +123,11 @@ /** German (Deutsch)
  * @author Metalhead64
+ * @author Tischbeinahe
  */
 $messages['de'] = array(
-	'vector' => 'Benutzeroberflächenverbesserungen für den Vektor-Skin',
-	'vector-desc' => 'Verbesserungen an den Benutzeroberflächenelementen des Vektor-Skins',
+	'vector' => 'Verbesserungen für die Vektor-Benutzeroberfläche',
+	'vector-desc' => 'Verbesserungen an der Vektor-Benutzeroberfläche',
 ); /** Zazaki (Zazaki)
@@ -163,6 +172,14 @@
 	'vector-desc' => 'Mejora los elementos de la interfaz de usuario del skin Vector.',
 );+/** Persian (فارسی)
+ * @author Ebraminio
+ * @author Huji
+ */
+$messages['fa'] = array(
+	'vector' => 'بهبودهای رابط کاربر برای پوستهٔ برداری',
+);
+
 /** Finnish (Suomi)
  * @author Str4nd
  */
@@ -296,8 +313,8 @@
  * @author Bjankuloski06
  */
 $messages['mk'] = array(
-	'vector' => 'Подобрувања на интерфејсот на Vector',
-	'vector-desc' => 'Ги подобрува елементите на корисничкиот интерфејс на изгледот „Vector“.',
+	'vector' => 'Подобрувања на посредникот за изгледот „Векторски“',
+	'vector-desc' => 'Ги подобрува елементите на корисничкиот посредник на изгледот „Векторски“.',
 ); /** Malayalam (മലയാളം)
@@ -378,8 +395,8 @@
  * @author Stelistcristi
  */
 $messages['ro'] = array(
-	'vector' => 'Îmbunătăţiri la nivelul interfaţei pentru Vector',
-	'vector-desc' => 'Îmbunătăţiri la elementele interfaţei a temei Vector.',
+	'vector' => 'Îmbunătățiri la nivelul interfaței pentru Vector',
+	'vector-desc' => 'Îmbunătățiri la elementele interfaței a temei Vector.',
 ); /** Tarandíne (Tarandíne)
@@ -445,6 +462,14 @@
 	'vector' => 'వెక్టర్ కొరకు ముఖాంతరపు మెరుగులు',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'vector' => 'Mga pagpapainam na UI para sa Vector',
+	'vector-desc' => 'Nagpapainam sa mga sangkap ng dugtungang-mukha na pangtatagamit ng pabalat ng Vector.',
+);
+
 /** Turkish (Türkçe)
  * @author Vito Genovese
  */
@@ -477,6 +502,13 @@
 	'vector-desc' => 'Hoàn thiện các phần giao diện để tích hợp với hình dạng Vectơ.',
 );+/** Yiddish (ייִדיש)
+ * @author פוילישער
+ */
+$messages['yi'] = array(
+	'vector' => 'באַניצער־אויבערפֿלאַך פֿאַרבעסערונגען פֿאַר וועקטאר',
+);
+
 /** Simplified Chinese (‪中文(简体)‬)
  * @author Bencmq
  */

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -23,12 +23,18 @@
 	'collapsiblenav' => array( 'global' => true, 'user' => true ),
 	'collapsibletabs' => array( 'global' => true, 'user' => false ),
 	'editwarning' => array( 'global' => false, 'user' => true ),
+	'expandablesearch' => array( 'global' => true, 'user' => true ),
 	'footercleanup' => array( 'global' => false, 'user' => false ),
 	'simplesearch' => array( 'global' => true, 'user' => false ),
 ); /* Setup */+// Enable bucket testing for new version of collapsible nav
+$wgCollapsibleNavBucketTest = false;
+// Force the new version
+$wgCollapsibleNavForceNewVersion = false;
+
 // Credits
 $wgExtensionCredits['other'][] = array(
 	'path' => __FILE__,

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/AddMediaWizard/AddMediaWizard.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/AddMediaWizard/AddMediaWizard.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/AddMediaWizard/AddMediaWizard.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -15,6 +15,13 @@
     'wikieditor-addMediaWizard-preference' => 'Enable "Add media wizard" gadget',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'wikieditor-addMediaWizard-preference' => 'Aktivo "Shto mediat magjistar" vegël',
+);
+
 /** Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
  * @author EugeneZelenko
  */
@@ -36,6 +43,13 @@
 	'wikieditor-addMediaWizard-preference' => 'Gweredekaat ar bitrak "Ouzhpennañ ameiler mediaoù"',
 );+/** Catalan (Català)
+ * @author Vriullop
+ */
+$messages['ca'] = array(
+	'wikieditor-addMediaWizard-preference' => 'Habilita el giny «Assistent per afegir multimèdia»',
+);
+
 /** Czech (Česky)
  * @author Mormegil
  */
@@ -57,6 +71,13 @@
 	'wikieditor-addMediaWizard-preference' => 'Funkciju "Medijowy asistent pśidaś" zmóžniś',
 );+/** Greek (Ελληνικά)
+ * @author Απεργός
+ */
+$messages['el'] = array(
+	'wikieditor-addMediaWizard-preference' => 'Ενεργοποίηση του εργαλείου «Οδηγός προσθήκης πολυμέσων»',
+);
+
 /** Spanish (Español)
  * @author Crazymadlover
  */
@@ -64,6 +85,20 @@
 	'wikieditor-addMediaWizard-preference' => 'Habilitar gadget "Agregar asistente de medios"',
 );+/** Persian (فارسی)
+ * @author Huji
+ */
+$messages['fa'] = array(
+	'wikieditor-addMediaWizard-preference' => 'فعال کردن ابزارک «افزودن مدیا»',
+);
+
+/** Finnish (Suomi)
+ * @author Str4nd
+ */
+$messages['fi'] = array(
+	'wikieditor-addMediaWizard-preference' => 'Ota ”Lisää media ohjatusti” -pienoisohjelma käyttöön',
+);
+
 /** French (Français)
  * @author Peter17
  */
@@ -85,6 +120,14 @@
 	'wikieditor-addMediaWizard-preference' => 'Dr „Medienassischtänt“ aktiviere, as Hilfsprogramm zum Yyfiege vu Mediedateie',
 );+/** Hebrew (עברית)
+ * @author Amire80
+ * @author Rotemliss
+ */
+$messages['he'] = array(
+	'wikieditor-addMediaWizard-preference' => 'הפעלת הסקריפט "אשף הוספת מדיה"',
+);
+
 /** Upper Sorbian (Hornjoserbsce)
  * @author Michawiki
  */
@@ -92,6 +135,13 @@
 	'wikieditor-addMediaWizard-preference' => 'Funkciju "Medijowy asistent přidać" zmóžnić',
 );+/** Hungarian (Magyar)
+ * @author Glanthor Reviol
+ */
+$messages['hu'] = array(
+	'wikieditor-addMediaWizard-preference' => '„Média hozzáadása varázsló” segédeszköz engedélyezése',
+);
+
 /** Interlingua (Interlingua)
  * @author McDutchie
  */
@@ -120,6 +170,13 @@
 	'wikieditor-addMediaWizard-preference' => '「メディア追加ウィザード」ガジェットを有効化する',
 );+/** Georgian (ქართული)
+ * @author BRUTE
+ */
+$messages['ka'] = array(
+	'wikieditor-addMediaWizard-preference' => '"დაამატეთ მედია ოსტატი" გაჯეტის ჩართვა',
+);
+
 /** Korean (한국어)
  * @author Kwj2772
  */
@@ -162,6 +219,13 @@
 	'wikieditor-addMediaWizard-preference' => 'Uitbreiding "Wizard media toevoegen" inschakelen',
 );+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Laaknor
+ */
+$messages['no'] = array(
+	'wikieditor-addMediaWizard-preference' => 'Aktiver "Legg til media veiviser"-funksjonen.',
+);
+
 /** Occitan (Occitan)
  * @author Cedric31
  */
@@ -191,6 +255,13 @@
 	'wikieditor-addMediaWizard-preference' => 'Activar o gadget "Assistente de Adição de Multimédia"',
 );+/** Brazilian Portuguese (Português do Brasil)
+ * @author Giro720
+ */
+$messages['pt-br'] = array(
+	'wikieditor-addMediaWizard-preference' => 'Ativar o gadget "Assistente de Adição de Multimídia"',
+);
+
 /** Russian (Русский)
  * @author Александр Сигачёв
  */
@@ -205,6 +276,20 @@
 	'wikieditor-addMediaWizard-preference' => 'Aktivera "Lägg till media guiden" finessen',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'wikieditor-addMediaWizard-preference' => 'Paganahin ang gadyet na "Magdagdag ng media wizard"',
+);
+
+/** Turkish (Türkçe)
+ * @author Joseph
+ */
+$messages['tr'] = array(
+	'wikieditor-addMediaWizard-preference' => '"Ortam ekleme sihirbazı" gadget\'ını etkinleştir',
+);
+
 /** Vietnamese (Tiếng Việt)
  * @author Vinhtantran
  */
@@ -212,3 +297,10 @@
 	'wikieditor-addMediaWizard-preference' => 'Kích hoạt công cụ "Hướng dẫn từng bước để thêm tập tin phương tiện"',
 );+/** Traditional Chinese (‪中文(繁體)‬)
+ * @author Horacewai2
+ */
+$messages['zh-hant'] = array(
+	'wikieditor-addMediaWizard-preference' => '啟用「添加媒體嚮導」小工具',
+);
+

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Highlight/Highlight.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Highlight/Highlight.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Highlight/Highlight.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -15,6 +15,13 @@
 	'wikieditor-highlight-preference' => 'Enable syntax highlighting when editing',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'wikieditor-highlight-preference' => 'Sintaksa Aktivizo theksuar kur redaktimi',
+);
+
 /** Arabic (العربية)
  * @author OsamaK
  */
@@ -136,6 +143,13 @@
 	'wikieditor-highlight-preference' => 'Tõsta süntaks redigeerimise ajal esile',
 );+/** Persian (فارسی)
+ * @author Huji
+ */
+$messages['fa'] = array(
+	'wikieditor-highlight-preference' => 'فعال کردن برجسته‌نمایی نحوی در زمان ویرایش',
+);
+
 /** Finnish (Suomi)
  * @author ZeiP
  */
@@ -329,7 +343,7 @@
  * @author Firilacroco
  */
 $messages['ro'] = array(
-	'wikieditor-highlight-preference' => 'Activaţi evidenţierea sintaxei când modificaţi',
+	'wikieditor-highlight-preference' => 'Activați evidențierea sintaxei când modificați',
 ); /** Tarandíne (Tarandíne)
@@ -374,6 +388,13 @@
 	'wikieditor-highlight-preference' => 'Omogoči označevanje skladnje med urejanjem',
 );+/** Serbian Cyrillic ekavian (Српски (ћирилица))
+ * @author Charmed94
+ */
+$messages['sr-ec'] = array(
+	'wikieditor-highlight-preference' => 'Истакни текст у току уређивања',
+);
+
 /** Swedish (Svenska)
  * @author Boivie
  */
@@ -381,6 +402,13 @@
 	'wikieditor-highlight-preference' => 'Aktivera markering av syntax vid redigering',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'wikieditor-highlight-preference' => 'Paganahin ang pagpapatingkad-kulay ng sintaks kapag namamatnugot',
+);
+
 /** Turkish (Türkçe)
  * @author Vito Genovese
  */

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Preview/Preview.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Preview/Preview.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Preview/Preview.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -48,6 +48,16 @@
 	'wikieditor-preview-loading' => 'Besig om te laai...',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'wikieditor-preview-preference' => 'Aktivizo-krah për krah preview',
+	'wikieditor-preview-tab' => 'Preview',
+	'wikieditor-preview-changes-tab' => 'Ndryshimet',
+	'wikieditor-preview-loading' => 'Loading ...',
+);
+
 /** Arabic (العربية)
  * @author Meno25
  * @author OsamaK
@@ -125,13 +135,24 @@
 /** Catalan (Català)
  * @author Paucabot
  * @author Solde
+ * @author Vriullop
  */
 $messages['ca'] = array(
+	'wikieditor-preview-preference' => 'Habilita la previsualització costat per costat',
 	'wikieditor-preview-tab' => 'Previsualització',
 	'wikieditor-preview-changes-tab' => 'Canvis',
 	'wikieditor-preview-loading' => 'Carregant ...',
 );+/** Chechen (Нохчийн)
+ * @author Sasan700
+ */
+$messages['ce'] = array(
+	'wikieditor-preview-tab' => 'Хьалха муха ю хьажа',
+	'wikieditor-preview-changes-tab' => 'Хийцамаш',
+	'wikieditor-preview-loading' => 'Чуйолуш…',
+);
+
 /** Czech (Česky)
  * @author Mormegil
  */
@@ -256,6 +277,16 @@
 	'wikieditor-preview-loading' => 'Kargatzen...',
 );+/** Persian (فارسی)
+ * @author Ebraminio
+ */
+$messages['fa'] = array(
+	'wikieditor-preview-preference' => 'فعال‌سازی پیش‌نمایش کنار یک دیگر',
+	'wikieditor-preview-tab' => 'پیش‌نمایش',
+	'wikieditor-preview-changes-tab' => 'تغییرها',
+	'wikieditor-preview-loading' => 'در حال بارگذاری...',
+);
+
 /** Finnish (Suomi)
  * @author Crt
  * @author Str4nd
@@ -673,6 +704,13 @@
 	'wikieditor-preview-loading' => 'Nalaganje ...',
 );+/** Serbian Cyrillic ekavian (Српски (ћирилица))
+ * @author Михајло Анђелковић
+ */
+$messages['sr-ec'] = array(
+	'wikieditor-preview-loading' => 'Учитавање...',
+);
+
 /** Swedish (Svenska)
  * @author Boivie
  */
@@ -722,6 +760,16 @@
 	'wikieditor-preview-loading' => 'Ýüklenilýär...',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'wikieditor-preview-preference' => 'Paganahin ang magkatabing paunang-tingin',
+	'wikieditor-preview-tab' => 'Paunang tanaw',
+	'wikieditor-preview-changes-tab' => 'Mga pagbabago',
+	'wikieditor-preview-loading' => 'Ikinakarga...',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  * @author Vito Genovese

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Publish/Publish.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Publish/Publish.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Publish/Publish.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -68,6 +68,21 @@
 	'wikieditor-publish-dialog-goback' => 'Terug',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'wikieditor-publish-preference' => 'Aktivizo-hap pas hapi botuese',
+	'wikieditor-publish-button-publish' => 'Publikoj',
+	'wikieditor-publish-button-cancel' => 'Anuloj',
+	'wikieditor-publish-dialog-title' => 'Publikimi në {{SITENAME}}',
+	'wikieditor-publish-dialog-summary' => 'përmbledhje Edit (përshkruaj shkurtimisht ndryshimet që keni bërë):',
+	'wikieditor-publish-dialog-minor' => 'Minor redakto',
+	'wikieditor-publish-dialog-watch' => 'Watch këtë faqe',
+	'wikieditor-publish-dialog-publish' => 'Publikoj',
+	'wikieditor-publish-dialog-goback' => 'Kthehem',
+);
+
 /** Arabic (العربية)
  * @author Meno25
  * @author OsamaK
@@ -182,19 +197,27 @@
 /** Catalan (Català)
  * @author Paucabot
  * @author Solde
+ * @author Vriullop
  */
 $messages['ca'] = array(
 	'wikieditor-publish-preference' => 'Habilita la publicació pas a pas',
 	'wikieditor-publish-button-publish' => 'Publica',
-	'wikieditor-publish-button-cancel' => 'Cancel·la',
+	'wikieditor-publish-button-cancel' => 'Anuŀla',
 	'wikieditor-publish-dialog-title' => 'Publicar a {{SITENAME}}',
 	'wikieditor-publish-dialog-summary' => "Resum d'edició (descriviu breument els canvis realitzats):",
-	'wikieditor-publish-dialog-minor' => 'Edició menor',
+	'wikieditor-publish-dialog-minor' => 'Modificació menor',
 	'wikieditor-publish-dialog-watch' => 'Vigila aquesta pàgina',
 	'wikieditor-publish-dialog-publish' => 'Publica',
 	'wikieditor-publish-dialog-goback' => 'Torna',
 );+/** Chechen (Нохчийн)
+ * @author Sasan700
+ */
+$messages['ce'] = array(
+	'wikieditor-publish-button-cancel' => 'Цаоьшу',
+);
+
 /** Czech (Česky)
  * @author Mormegil
  */
@@ -367,6 +390,22 @@
 	'wikieditor-publish-dialog-goback' => 'Atzera joan',
 );+/** Persian (فارسی)
+ * @author Ebraminio
+ * @author Huji
+ */
+$messages['fa'] = array(
+	'wikieditor-publish-preference' => 'فعال‌سازی انتشار قدم به قدم',
+	'wikieditor-publish-button-publish' => 'انتشار',
+	'wikieditor-publish-button-cancel' => 'لغو',
+	'wikieditor-publish-dialog-title' => 'انتشار در {{SITENAME}}',
+	'wikieditor-publish-dialog-summary' => 'خلاصه ویرایش (توضیح مختصر در مورد تغییری که دادید):',
+	'wikieditor-publish-dialog-minor' => 'ویرایش جزئی',
+	'wikieditor-publish-dialog-watch' => 'پی‌گیری این صفحه',
+	'wikieditor-publish-dialog-publish' => 'انتشار',
+	'wikieditor-publish-dialog-goback' => 'بازگشت به عقب',
+);
+
 /** Finnish (Suomi)
  * @author Crt
  * @author Str4nd
@@ -427,7 +466,7 @@
 	'wikieditor-publish-dialog-minor' => 'Edición pequena',
 	'wikieditor-publish-dialog-watch' => 'Vixiar esta páxina',
 	'wikieditor-publish-dialog-publish' => 'Publicar',
-	'wikieditor-publish-dialog-goback' => 'Voltar',
+	'wikieditor-publish-dialog-goback' => 'Volver',
 ); /** Ancient Greek (Ἀρχαία ἑλληνικὴ)
@@ -509,6 +548,7 @@
 ); /** Armenian (Հայերեն)
+ * @author Chaojoker
  * @author Xelgen
  */
 $messages['hy'] = array(
@@ -519,7 +559,7 @@
 	'wikieditor-publish-dialog-minor' => 'Չնչին խմբագրում',
 	'wikieditor-publish-dialog-watch' => 'Հսկել այս էջը',
 	'wikieditor-publish-dialog-publish' => 'Հրատարակել',
-	'wikieditor-publish-dialog-goback' => 'Ետ գնալ',
+	'wikieditor-publish-dialog-goback' => 'Հետ գնալ',
 ); /** Interlingua (Interlingua)
@@ -859,9 +899,9 @@
 	'wikieditor-publish-button-publish' => 'Salvează pagina',
 	'wikieditor-publish-button-cancel' => 'Anulează',
 	'wikieditor-publish-dialog-title' => 'Publică pe {{SITENAME}}',
-	'wikieditor-publish-dialog-summary' => 'Descrierea modificărilor (descrieţi pe scurt modificările făcute):',
+	'wikieditor-publish-dialog-summary' => 'Descrierea modificărilor (descrieți pe scurt modificările făcute):',
 	'wikieditor-publish-dialog-minor' => 'Modificare minoră',
-	'wikieditor-publish-dialog-watch' => 'Urmăreşte pagina',
+	'wikieditor-publish-dialog-watch' => 'Urmărește pagina',
 	'wikieditor-publish-dialog-publish' => 'Salvează pagina',
 	'wikieditor-publish-dialog-goback' => 'Înapoi',
 );
@@ -911,6 +951,14 @@
 	'wikieditor-publish-dialog-goback' => 'Төнүн',
 );+/** Sardinian (Sardu)
+ * @author Andria
+ */
+$messages['sc'] = array(
+	'wikieditor-publish-dialog-minor' => 'Acontzu minore',
+	'wikieditor-publish-dialog-watch' => 'Pone custa pàgina in sa watchlist mea',
+);
+
 /** Sinhala (සිංහල)
  * @author Calcey
  */
@@ -956,6 +1004,17 @@
 	'wikieditor-publish-dialog-goback' => 'Pojdi nazaj',
 );+/** Serbian Cyrillic ekavian (Српски (ћирилица))
+ * @author Михајло Анђелковић
+ */
+$messages['sr-ec'] = array(
+	'wikieditor-publish-button-publish' => 'Објави',
+	'wikieditor-publish-button-cancel' => 'Поништи',
+	'wikieditor-publish-dialog-minor' => 'Мала измена',
+	'wikieditor-publish-dialog-publish' => 'Објави',
+	'wikieditor-publish-dialog-goback' => 'Врати се',
+);
+
 /** Swedish (Svenska)
  * @author Boivie
  */
@@ -1029,6 +1088,21 @@
 	'wikieditor-publish-dialog-goback' => 'Yza gaýt',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'wikieditor-publish-preference' => 'Paganahin ang hakbang-hakbang na paglalathala',
+	'wikieditor-publish-button-publish' => 'Ilathala',
+	'wikieditor-publish-button-cancel' => 'Huwag ituloy',
+	'wikieditor-publish-dialog-title' => 'Ilathala sa {{SITENAME}}',
+	'wikieditor-publish-dialog-summary' => 'Buod ng pagbabago (maikling ilarawan ang mga pagbabagong ginawa mo):',
+	'wikieditor-publish-dialog-minor' => 'Maliit na pagbabago',
+	'wikieditor-publish-dialog-watch' => 'Bantayan ang pahinang ito',
+	'wikieditor-publish-dialog-publish' => 'Ilathala',
+	'wikieditor-publish-dialog-goback' => 'Bumalik',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  * @author Vito Genovese

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/TemplateEditor/TemplateEditor.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/TemplateEditor/TemplateEditor.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/TemplateEditor/TemplateEditor.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -34,6 +34,16 @@
 	'wikieditor-template-editor-preference' => 'Aktiveer vorm-gebaseerde wysiging van wikisjablone',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'wikieditor-template-editor-preference' => 'Lejo redaktimin e bazuar në formë të wiki templates',
+	'wikieditor-template-editor-dialog-title' => 'Edit template',
+	'wikieditor-template-editor-dialog-submit' => 'Update',
+	'wikieditor-template-editor-dialog-cancel' => 'Anuloj',
+);
+
 /** Aragonese (Aragonés)
  * @author Juanpabl
  */
@@ -110,14 +120,25 @@ /** Catalan (Català)
  * @author Paucabot
+ * @author Vriullop
  */
 $messages['ca'] = array(
 	'wikieditor-template-editor-preference' => "Permetre l'edició basada en formularis de plantilles",
-	'wikieditor-template-editor-dialog-title' => 'Edita la plantilla',
+	'wikieditor-template-editor-dialog-title' => 'Modifica la plantilla',
 	'wikieditor-template-editor-dialog-submit' => 'Actualitza',
-	'wikieditor-template-editor-dialog-cancel' => 'Cancel·la',
+	'wikieditor-template-editor-dialog-cancel' => 'Anuŀla',
 );+/** Chechen (Нохчийн)
+ * @author Sasan700
+ */
+$messages['ce'] = array(
+	'wikieditor-template-editor-preference' => 'Лата é куцкепа рéдаккхар барамаши гlонца',
+	'wikieditor-template-editor-dialog-title' => 'Куцкеп хийцам',
+	'wikieditor-template-editor-dialog-submit' => 'Карлаяккха',
+	'wikieditor-template-editor-dialog-cancel' => 'Цаоьшу',
+);
+
 /** Czech (Česky)
  * @author Kuvaly
  * @author Mormegil
@@ -225,6 +246,17 @@
 	'wikieditor-template-editor-dialog-cancel' => 'Utzi',
 );+/** Persian (فارسی)
+ * @author Ebraminio
+ * @author Huji
+ */
+$messages['fa'] = array(
+	'wikieditor-template-editor-preference' => 'فعال‌سازی ویرایش مبتنی بر فرم الگوهای ویکی',
+	'wikieditor-template-editor-dialog-title' => 'ویرایش الگو',
+	'wikieditor-template-editor-dialog-submit' => 'به روز رسانی',
+	'wikieditor-template-editor-dialog-cancel' => 'لغو',
+);
+
 /** Finnish (Suomi)
  * @author Crt
  */
@@ -324,6 +356,11 @@
 	'wikieditor-template-editor-dialog-cancel' => 'Batalkan',
 );+/** Igbo (Igbo) */
+$messages['ig'] = array(
+	'wikieditor-template-editor-dialog-cancel' => 'Emekwàlà',
+);
+
 /** Italian (Italiano)
  * @author Una giornata uggiosa '94
  */
@@ -484,6 +521,13 @@
 	'wikieditor-template-editor-dialog-cancel' => 'Scancela',
 );+/** Pashto (پښتو)
+ * @author Ahmed-Najib-Biabani-Ibrahimkhel
+ */
+$messages['ps'] = array(
+	'wikieditor-template-editor-dialog-submit' => 'اوسمهالول',
+);
+
 /** Portuguese (Português)
  * @author Hamilton Abreu
  */
@@ -542,9 +586,12 @@ /** Sinhala (සිංහල)
  * @author Calcey
+ * @author බිඟුවා
  */
 $messages['si'] = array(
 	'wikieditor-template-editor-preference' => 'විකි අච්චුවල පෝරම-මූලික සංස්කරණය සක්‍රීය කරන්න',
+	'wikieditor-template-editor-dialog-submit' => 'යාවත්කාලීන කළ',
+	'wikieditor-template-editor-dialog-cancel' => 'අත් හරින්න',
 ); /** Slovak (Slovenčina)
@@ -564,6 +611,15 @@
 	'wikieditor-template-editor-dialog-cancel' => 'Prekliči',
 );+/** Serbian Cyrillic ekavian (Српски (ћирилица))
+ * @author Михајло Анђелковић
+ */
+$messages['sr-ec'] = array(
+	'wikieditor-template-editor-dialog-title' => 'Измени шаблон',
+	'wikieditor-template-editor-dialog-submit' => 'Ажурирај',
+	'wikieditor-template-editor-dialog-cancel' => 'Поништи',
+);
+
 /** Swedish (Svenska)
  * @author Boivie
  * @author Hannibal
@@ -585,6 +641,16 @@
 	'wikieditor-template-editor-dialog-cancel' => 'రద్దుచేయి',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'wikieditor-template-editor-preference' => 'Paganahin ang pagpapatnugot ng mga suleras na pangwiki na nakasalalay sa pormularyo',
+	'wikieditor-template-editor-dialog-title' => 'Baguhin ang suleras',
+	'wikieditor-template-editor-dialog-submit' => 'Isapanahon',
+	'wikieditor-template-editor-dialog-cancel' => 'Huwag ituloy',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  */
@@ -648,9 +714,13 @@ /** Traditional Chinese (‪中文(繁體)‬)
  * @author Gaoxuewei
+ * @author Horacewai2
  * @author Liangent
  */
 $messages['zh-hant'] = array(
 	'wikieditor-template-editor-preference' => '啟用wiki模板的表單式編輯',
+	'wikieditor-template-editor-dialog-title' => '編輯模板',
+	'wikieditor-template-editor-dialog-submit' => '更新',
+	'wikieditor-template-editor-dialog-cancel' => '取消',
 );
Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Templates/Templates.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Templates/Templates.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Templates/Templates.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -15,6 +15,13 @@
 	'wikieditor-templates-preference' => 'Enable template collapsing',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'wikieditor-templates-preference' => 'Aktivizo template kolaps',
+);
+
 /** Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
  * @author EugeneZelenko
  */
@@ -36,6 +43,13 @@
 	'wikieditor-templates-preference' => "Gweredekaat ar c'huzhat patromoù",
 );+/** Catalan (Català)
+ * @author Vriullop
+ */
+$messages['ca'] = array(
+	'wikieditor-templates-preference' => 'Habilita el replegament de plantilles',
+);
+
 /** Czech (Česky)
  * @author Mormegil
  */
@@ -57,6 +71,13 @@
 	'wikieditor-templates-preference' => 'Fałdowanje pśedłogow zmóžniś',
 );+/** Greek (Ελληνικά)
+ * @author Απεργός
+ */
+$messages['el'] = array(
+	'wikieditor-templates-preference' => 'Ενεργοποίηση της απόκρυψης προτύπων',
+);
+
 /** Esperanto (Esperanto)
  * @author Yekrats
  */
@@ -71,6 +92,20 @@
 	'wikieditor-templates-preference' => 'Habilitar colapso de plantilla',
 );+/** Persian (فارسی)
+ * @author Huji
+ */
+$messages['fa'] = array(
+	'wikieditor-templates-preference' => 'فعال‌سازی نهفتن الگوها',
+);
+
+/** Finnish (Suomi)
+ * @author Str4nd
+ */
+$messages['fi'] = array(
+	'wikieditor-templates-preference' => 'Ota mallineiden piilotus käyttöön',
+);
+
 /** French (Français)
  * @author Peter17
  */
@@ -92,6 +127,13 @@
 	'wikieditor-templates-preference' => 'Aktivierig vum Yy- un Uusblände vu Vorlage',
 );+/** Hebrew (עברית)
+ * @author Amire80
+ */
+$messages['he'] = array(
+	'wikieditor-templates-preference' => 'הפעלת קיפול תבניות',
+);
+
 /** Upper Sorbian (Hornjoserbsce)
  * @author Michawiki
  */
@@ -99,6 +141,13 @@
 	'wikieditor-templates-preference' => 'Fałdowanje předłohow zmóžnić',
 );+/** Hungarian (Magyar)
+ * @author Glanthor Reviol
+ */
+$messages['hu'] = array(
+	'wikieditor-templates-preference' => 'Sablonok összecsukásának engedélyezése',
+);
+
 /** Interlingua (Interlingua)
  * @author McDutchie
  */
@@ -127,6 +176,13 @@
 	'wikieditor-templates-preference' => 'テンプレート折り畳みを有効にする',
 );+/** Georgian (ქართული)
+ * @author BRUTE
+ */
+$messages['ka'] = array(
+	'wikieditor-templates-preference' => 'ჩაკეცილი თარგის ჩართვა',
+);
+
 /** Korean (한국어)
  * @author Kwj2772
  */
@@ -169,6 +225,13 @@
 	'wikieditor-templates-preference' => 'Inklapbare sjablonen inschakelen',
 );+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Nghtwlkr
+ */
+$messages['no'] = array(
+	'wikieditor-templates-preference' => 'Aktiver sammenleggbare maler',
+);
+
 /** Occitan (Occitan)
  * @author Cedric31
  */
@@ -176,6 +239,13 @@
 	'wikieditor-templates-preference' => 'Activar lo replegament dels modèls',
 );+/** Polish (Polski)
+ * @author Nux
+ */
+$messages['pl'] = array(
+	'wikieditor-templates-preference' => 'Włącz zwijanie szablonów',
+);
+
 /** Piedmontese (Piemontèis)
  * @author Borichèt
  */
@@ -190,6 +260,13 @@
 	'wikieditor-templates-preference' => 'Possibilitar a recolha e expansão de predefinições',
 );+/** Brazilian Portuguese (Português do Brasil)
+ * @author Giro720
+ */
+$messages['pt-br'] = array(
+	'wikieditor-templates-preference' => 'Possibilitar a recolha e expansão de predefinições',
+);
+
 /** Russian (Русский)
  * @author Александр Сигачёв
  */
@@ -197,6 +274,13 @@
 	'wikieditor-templates-preference' => 'Включить сворачивание шаблонов',
 );+/** Serbian Cyrillic ekavian (Српски (ћирилица))
+ * @author Михајло Анђелковић
+ */
+$messages['sr-ec'] = array(
+	'wikieditor-templates-preference' => 'Омогућава размотавање шаблона',
+);
+
 /** Swedish (Svenska)
  * @author Ainali
  */
@@ -204,3 +288,24 @@
 	'wikieditor-templates-preference' => 'Aktivera ihopfällbara mallar',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'wikieditor-templates-preference' => 'Paganahin ang bumabagsak na suleras',
+);
+
+/** Vietnamese (Tiếng Việt)
+ * @author Minh Nguyen
+ */
+$messages['vi'] = array(
+	'wikieditor-templates-preference' => 'Cho phép làm xẹp các bản mẫu',
+);
+
+/** Traditional Chinese (‪中文(繁體)‬)
+ * @author Horacewai2
+ */
+$messages['zh-hant'] = array(
+	'wikieditor-templates-preference' => '使模板倒塌',
+);
+

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toc/Toc.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toc/Toc.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toc/Toc.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -36,6 +36,15 @@
 	'wikieditor-toc-hide' => 'Versteek inhoud',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'wikieditor-toc-preference' => 'Tabela e përmbajtjeve Aktivizo lundrueshëm',
+	'wikieditor-toc-show' => 'Përmbajtja Show',
+	'wikieditor-toc-hide' => 'Përmbajtja Hide',
+);
+
 /** Arabic (العربية)
  * @author Meno25
  * @author OsamaK
@@ -189,6 +198,7 @@
 ); /** Spanish (Español)
+ * @author AlimanRuna
  * @author Crazymadlover
  * @author Peter17
  */
@@ -217,6 +227,16 @@
 	'wikieditor-toc-hide' => 'Edukiak ezkutatu',
 );+/** Persian (فارسی)
+ * @author Ebraminio
+ * @author Huji
+ */
+$messages['fa'] = array(
+	'wikieditor-toc-preference' => 'فعال‌سازی فهرست مطالب قابل پیمایش',
+	'wikieditor-toc-show' => 'نمایش محتوا',
+	'wikieditor-toc-hide' => 'نهفتن محتوا',
+);
+
 /** Finnish (Suomi)
  * @author Crt
  * @author Str4nd
@@ -562,6 +582,14 @@
 	'wikieditor-toc-hide' => 'Skrij vsebino',
 );+/** Serbian Cyrillic ekavian (Српски (ћирилица))
+ * @author Михајло Анђелковић
+ */
+$messages['sr-ec'] = array(
+	'wikieditor-toc-show' => 'Покажи садржај',
+	'wikieditor-toc-hide' => 'Сакриј садржај',
+);
+
 /** Swedish (Svenska)
  * @author Boivie
  */
@@ -606,6 +634,15 @@
 	'wikieditor-toc-hide' => 'Mazmuny gizle',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'wikieditor-toc-preference' => 'Paganahin ang malilibot na tabla ng mga nilalaman',
+	'wikieditor-toc-show' => 'Ipakita ang mga nilalaman',
+	'wikieditor-toc-hide' => 'Itago ang mga nilalaman',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  * @author Vito Genovese

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -560,6 +560,207 @@
 	'wikieditor-toolbar-help-content-indent-result' => 'Normale teks<dl><dd>Geïndenteerde teks<dl><dd>Geïndenteerde teks</dd></dl></dd></dl>',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'wikieditor-toolbar' => 'Editing toolbar',
+	'wikieditor-toolbar-desc' => 'toolbar Redakto faqe me të përdorshmërisë zgjeruar',
+	'wikieditor-toolbar-preference' => 'Lejo redaktimin zgjeruar toolbar',
+	'wikieditor-toolbar-dialogs-preference' => 'dialogs Aktivizo për futjen e lidhjeve, tavolina dhe më shumë',
+	'wikieditor-toolbar-loading' => 'Loading ...',
+	'wikieditor-toolbar-tool-bold' => 'Guximtar',
+	'wikieditor-toolbar-tool-bold-example' => 'Tekst i trashë',
+	'wikieditor-toolbar-tool-italic' => 'Kursiv',
+	'wikieditor-toolbar-tool-italic-example' => 'Teksti i pjerrët',
+	'wikieditor-toolbar-tool-ilink' => 'Lidhje të Brendshme',
+	'wikieditor-toolbar-tool-ilink-example' => 'Titulli Link',
+	'wikieditor-toolbar-tool-xlink' => 'Lidhje e jashtme (most harro prefiksin http://)',
+	'wikieditor-toolbar-tool-xlink-example' => 'Lidhje http://www.example.com Titulli',
+	'wikieditor-toolbar-tool-link' => 'Lidhje',
+	'wikieditor-toolbar-tool-link-title' => 'Vendos Lidhje',
+	'wikieditor-toolbar-tool-link-int' => 'Për një faqe wiki',
+	'wikieditor-toolbar-tool-link-int-target' => 'faqe synuar ose URL:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Titulli i faqes ose URL',
+	'wikieditor-toolbar-tool-link-int-text' => 'Tekst për të shfaqur:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => "Tekst për t'u shfaqur",
+	'wikieditor-toolbar-tool-link-ext' => 'Për një faqe të jashtme interneti',
+	'wikieditor-toolbar-tool-link-ext-target' => 'URL Link:',
+	'wikieditor-toolbar-tool-link-ext-text' => 'text Link:',
+	'wikieditor-toolbar-tool-link-insert' => 'Vendos Lidhje',
+	'wikieditor-toolbar-tool-link-cancel' => 'Anuloj',
+	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'Page ekziston',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'Faqja nuk ekziston',
+	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Titulli i pavlefshëm',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Lidhje e jashtme',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Kontrollit të ekzistencës faqe ...',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'Titulli ju specifikuar është i pavlefshëm.',
+	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'URL-in që të specifikuar duket si ajo ishte menduar si një lidhje në faqe të tjera wiki. A doni ta bërë atë një lidhje të brendshme?',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Lidhje të Brendshme',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Lidhje e jashtme',
+	'wikieditor-toolbar-tool-link-empty' => 'Ju nuk kanë hyrë në ndonjë gjë për të link.',
+	'wikieditor-toolbar-tool-file' => 'Embedded file',
+	'wikieditor-toolbar-tool-file-example' => 'Example.jpg',
+	'wikieditor-toolbar-tool-reference' => 'Referim',
+	'wikieditor-toolbar-tool-reference-example' => 'Vendos tekst shënimin këtu',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Anuloj',
+	'wikieditor-toolbar-tool-reference-title' => 'Fut referencë',
+	'wikieditor-toolbar-tool-reference-insert' => 'Kall',
+	'wikieditor-toolbar-tool-reference-text' => 'tekstit Referenca',
+	'wikieditor-toolbar-tool-signature' => 'Nënshkrimi dhe gjithë kohë',
+	'wikieditor-toolbar-section-advanced' => 'I avancuar',
+	'wikieditor-toolbar-tool-heading' => 'Titull',
+	'wikieditor-toolbar-tool-heading-1' => 'Niveli 1',
+	'wikieditor-toolbar-tool-heading-2' => 'Niveli 2',
+	'wikieditor-toolbar-tool-heading-3' => 'Niveli 3',
+	'wikieditor-toolbar-tool-heading-4' => 'Niveli 4',
+	'wikieditor-toolbar-tool-heading-5' => 'Niveli 5',
+	'wikieditor-toolbar-tool-heading-example' => 'Titull tekst',
+	'wikieditor-toolbar-group-format' => 'Format',
+	'wikieditor-toolbar-tool-ulist' => 'Lista e bulleted',
+	'wikieditor-toolbar-tool-ulist-example' => 'pika bulleted lista',
+	'wikieditor-toolbar-tool-olist' => 'Lista e Numëruar',
+	'wikieditor-toolbar-tool-olist-example' => 'pika Numëruar lista',
+	'wikieditor-toolbar-tool-indent' => 'Gjurmë',
+	'wikieditor-toolbar-tool-indent-example' => 'Shkarko prerë',
+	'wikieditor-toolbar-tool-nowiki' => 'Nuk formatimit wiki',
+	'wikieditor-toolbar-tool-nowiki-example' => 'Vendos tekst këtu nuk duhet të formatohet',
+	'wikieditor-toolbar-tool-redirect' => 'Përcjellëse',
+	'wikieditor-toolbar-tool-redirect-example' => 'Emri i synuar faqe',
+	'wikieditor-toolbar-tool-big' => 'I madh',
+	'wikieditor-toolbar-tool-big-example' => 'Big tekst',
+	'wikieditor-toolbar-tool-small' => 'I vogël',
+	'wikieditor-toolbar-tool-small-example' => 'tekstin e vogla',
+	'wikieditor-toolbar-tool-superscript' => 'Indeks i sipërm',
+	'wikieditor-toolbar-tool-superscript-example' => 'tekstit Sipërshkrim',
+	'wikieditor-toolbar-tool-subscript' => 'Subscript',
+	'wikieditor-toolbar-tool-subscript-example' => 'tekstit Subscript',
+	'wikieditor-toolbar-group-insert' => 'Kall',
+	'wikieditor-toolbar-tool-gallery' => 'galeri artesh',
+	'wikieditor-toolbar-tool-gallery-example' => '{{ns:file}}: Example.jpg|Caption1
+{{ns:file}}: Example.jpg|Caption2',
+	'wikieditor-toolbar-tool-newline' => 'Linjë e re',
+	'wikieditor-toolbar-tool-table' => 'Tryezë',
+	'wikieditor-toolbar-tool-table-example-old' => '-
+! header 1
+! header 2
+! header 3
+|-
+| rresht 1, qelizë 1
+| rresht 1, qelizë 2
+| rresht 1, qelizë 3
+| -
+| rresht 2, qelizë 1
+| rresht 2, qelizë 2
+| rresht 2, qelizë 3',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'tekstit qelizë',
+	'wikieditor-toolbar-tool-table-example-header' => 'tekstit Header',
+	'wikieditor-toolbar-tool-table-title' => 'Fut tabelë',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Rreshtave',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Kolumne',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'Shto rreshtit',
+	'wikieditor-toolbar-tool-table-wikitable' => 'Logo me kufij',
+	'wikieditor-toolbar-tool-table-sortable' => 'Bëni tryezë llojllojshme',
+	'wikieditor-toolbar-tool-table-example' => 'Shembull',
+	'wikieditor-toolbar-tool-table-preview' => 'Preview',
+	'wikieditor-toolbar-tool-table-insert' => 'Kall',
+	'wikieditor-toolbar-tool-table-cancel' => 'Anuloj',
+	'wikieditor-toolbar-tool-table-toomany' => 'Futur një tavolinë me shumë se qelizat e $1 nuk është e mundur me këtë dialog.',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'Ju nuk keni hyrë në një numër të vlefshme të rreshtave dhe kolonave.',
+	'wikieditor-toolbar-tool-table-zero' => 'Ju nuk mund të vendos një tabelë me zero rreshta ose kolona.',
+	'wikieditor-toolbar-tool-replace' => 'Kërkoni dhe zëvendësuar',
+	'wikieditor-toolbar-tool-replace-title' => 'Kërkoni dhe zëvendësuar',
+	'wikieditor-toolbar-tool-replace-search' => 'Kërko për:',
+	'wikieditor-toolbar-tool-replace-replace' => 'Replace me:',
+	'wikieditor-toolbar-tool-replace-case' => 'rast Match',
+	'wikieditor-toolbar-tool-replace-regex' => 'string Silleni kërkim si një shprehje e rregullt',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'Gjej të ardhshëm',
+	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Replace e ardhshme',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Zëvendësojnë të gjithë',
+	'wikieditor-toolbar-tool-replace-close' => 'Anuloj',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'Kërkimi juaj nuk u përputh me ndonjë gjë.',
+	'wikieditor-toolbar-tool-replace-success' => '$1 zëvendësimit (s) bëhet.',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'Ju nuk shkruani ndonjë gjë për të kërkuar për.',
+	'wikieditor-toolbar-tool-replace-invalidregex' => 'Shprehje e rregullt keni hyrë është i pavlefshëm: $1',
+	'wikieditor-toolbar-section-characters' => 'karaktere të veçanta',
+	'wikieditor-toolbar-characters-page-latin' => 'Latinisht',
+	'wikieditor-toolbar-characters-page-latinextended' => 'Latine zgjeruar',
+	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
+	'wikieditor-toolbar-characters-page-symbols' => 'Simbolet',
+	'wikieditor-toolbar-characters-page-greek' => 'Grek',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'I sllavishtes së vjetër',
+	'wikieditor-toolbar-characters-page-arabic' => 'Arabisht',
+	'wikieditor-toolbar-characters-page-hebrew' => 'Hebraisht',
+	'wikieditor-toolbar-characters-page-bangla' => 'Shqip',
+	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
+	'wikieditor-toolbar-characters-page-sinhala' => 'Sinhala',
+	'wikieditor-toolbar-characters-page-gujarati' => 'Guxharati',
+	'wikieditor-toolbar-section-help' => 'Ndihmë',
+	'wikieditor-toolbar-help-heading-description' => 'Përshkrim',
+	'wikieditor-toolbar-help-heading-syntax' => 'Çfarë ju lloji',
+	'wikieditor-toolbar-help-heading-result' => 'Çfarë ju të merrni',
+	'wikieditor-toolbar-help-page-format' => 'Formatimi',
+	'wikieditor-toolbar-help-page-link' => 'Lidhje',
+	'wikieditor-toolbar-help-page-heading' => 'Titujt',
+	'wikieditor-toolbar-help-page-list' => 'Listat',
+	'wikieditor-toolbar-help-page-file' => 'Files',
+	'wikieditor-toolbar-help-page-reference' => 'Lidhje të jashtme',
+	'wikieditor-toolbar-help-page-discussion' => 'Diskutim',
+	'wikieditor-toolbar-help-content-italic-description' => 'Kursiv',
+	'wikieditor-toolbar-help-content-italic-syntax' => "Teksti i pjerrët''''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>Teksti i pjerrët</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'Guximtar',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''Tekst i trashë'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>Tekst i trashë</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'Bold & italic',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Bold &amp; tekst kursiv'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>Bold & italic text</em></strong>',
+	'wikieditor-toolbar-help-content-ilink-description' => 'Lidhje të Brendshme',
+	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Page title|Link emërtim]]<br/>[[Page title]]',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Etiketa Link</a><br/><a href='#'>Titulli i faqes</a>",
+	'wikieditor-toolbar-help-content-xlink-description' => 'Lidhje e jashtme',
+	'wikieditor-toolbar-help-content-xlink-syntax' => 'Etiketa [http://www.example.org Link] <br /> [Http://www.example.org] <br /> http://www.example.org',
+	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Etiketa Link</a> <br /> <a href='#' class='external autonumber'>[1]</a> <br /> <a href='#' class='external'>http://www.example.org</a>",
+	'wikieditor-toolbar-help-content-heading1-description' => 'Niveli 1 titull',
+	'wikieditor-toolbar-help-content-heading1-syntax' => '= Text = Titulli',
+	'wikieditor-toolbar-help-content-heading1-result' => '<h1> Titull tekst </h1>',
+	'wikieditor-toolbar-help-content-heading2-description' => 'Niveli 2 titull',
+	'wikieditor-toolbar-help-content-heading2-syntax' => 'Text == == Titull',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2> Titull tekst </h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'Niveli 3 titull',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Tekst === Titull',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3> Titull tekst </h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => 'Niveli 4 titull',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Tekst Titulli ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4> Titull tekst </h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => 'Niveli 5 titull',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== ===== Tekst Titulli',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5> Titull tekst </h5>',
+	'wikieditor-toolbar-help-content-ulist-description' => 'Lista e bulleted',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* Pika Lista <br /> * Pika Lista',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li> pika Lista </li><li> pika Lista </li></ul>',
+	'wikieditor-toolbar-help-content-olist-description' => 'Lista e Numëruar',
+	'wikieditor-toolbar-help-content-olist-syntax' => 'pika # Lista <br /> pika # Lista',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li> pika Lista </li><li> pika Lista </li></ol>',
+	'wikieditor-toolbar-help-content-file-description' => 'Embedded file',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[{{ns:file}}:Example.png|thumb|Caption teksti]]',
+	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'> <a title=\"tekstit Legjenda\" class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/UsabilityInitiative/images/wikiEditor/toolbar/example-image.png' alt=''/></a> <div class='thumbcaption'><div class='magnify'> <a title=\"Zmadho\" class='internal' href='#'><img height='11' width='15' alt='' src='\$1/common/images/magnify-clip.png'/></a> </div> tekstit Legjenda </div></div>",
+	'wikieditor-toolbar-help-content-reference-description' => 'Referim',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'Tekst faqesh. name="test"> <ref [http://www.example.org] teksti Link, teksti shtesë. </> ref',
+	'wikieditor-toolbar-help-content-reference-result' => "Tekst faqesh. <a href='#'><sup>[1]</sup></a>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'përdorimin shtesë të njëjtën referencë',
+	'wikieditor-toolbar-help-content-rereference-result' => "Tekst faqesh. <a href='#'><sup>[1]</sup></a>",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'referenca Display',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'> <a title='' href='#'><b>^</b></a> <a rel='nofollow' title=\"http://www.example.org\" class='external text' href='#'>Teksti Link</a> , teksti shtesë. </li></ol>",
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Nënshkrimi me gjithë kohë',
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => '<a href=\'#\' title="{{#special:mypage}}">Emri i përdoruesit</a> ( <a href=\'#\' title="{{#special:mytalk}}">të folur</a> ) 15:54, 10 Qershor 2009 (UTC)',
+	'wikieditor-toolbar-help-content-signature-description' => 'Nënshkrim',
+	'wikieditor-toolbar-help-content-signature-result' => '<a href=\'#\' title="{{#special:mypage}}">Emri i përdoruesit</a> ( <a href=\'#\' title="{{#special:mytalk}}">të folur</a> )',
+	'wikieditor-toolbar-help-content-indent-description' => 'Porosit',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'tekstit Normale <br /> : Teksti i prerë <br /> :: Teksti i prerë',
+	'wikieditor-toolbar-help-content-indent-result' => 'tekstit Normale <dl><dd> Teksti i prerë <dl><dd> Teksti i prerë </dd></dl></dd></dl>',
+);
+
 /** Aragonese (Aragonés)
  * @author Juanpabl
  */
@@ -1383,8 +1584,8 @@
 	'wikieditor-toolbar-characters-page-gujarati' => 'Гуджарати',
 	'wikieditor-toolbar-section-help' => 'Помощ',
 	'wikieditor-toolbar-help-heading-description' => 'Описание',
-	'wikieditor-toolbar-help-heading-syntax' => 'Какво пишете',
-	'wikieditor-toolbar-help-heading-result' => 'Какво получавате',
+	'wikieditor-toolbar-help-heading-syntax' => 'В режим на редактиране',
+	'wikieditor-toolbar-help-heading-result' => 'В режим на четене',
 	'wikieditor-toolbar-help-page-format' => 'Форматиране',
 	'wikieditor-toolbar-help-page-link' => 'Препратки',
 	'wikieditor-toolbar-help-page-heading' => 'Заглавия',
@@ -1443,8 +1644,8 @@
 	'wikieditor-toolbar-help-content-signature-description' => 'Подпис',
 	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>Потребителско име</a> (<a href='#' title='{{#special:mytalk}}'>беседа</a>)",
 	'wikieditor-toolbar-help-content-indent-description' => 'Отстъп',
-	'wikieditor-toolbar-help-content-indent-syntax' => 'Нормален текст<br />:Текст с отстъп<br />::Текст с отстъп',
-	'wikieditor-toolbar-help-content-indent-result' => 'Нормален текст<dl><dd>Текст с отстъп<dl><dd>Текст с отстъп</dd></dl></dd></dl>',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'Текст без отстъп<br />:Текст с единичен отстъп<br />::Текст с двоен отстъп',
+	'wikieditor-toolbar-help-content-indent-result' => 'Текст без отстъп<dl><dd>Текст с единичен отстъп<dl><dd>Текст с двоен отстъп</dd></dl></dd></dl>',
 ); /** Bengali (বাংলা)
@@ -2066,7 +2267,9 @@
 	'wikieditor-toolbar-tool-link-title' => 'Insereix un enllaç',
 	'wikieditor-toolbar-tool-link-int' => 'A una pàgina del wiki',
 	'wikieditor-toolbar-tool-link-int-target' => "Nom de l'article:",
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Títol de la pàgina o URL',
 	'wikieditor-toolbar-tool-link-int-text' => "Text de l'enllaç:",
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Text a mostrar',
 	'wikieditor-toolbar-tool-link-ext' => 'A una pàgina web externa',
 	'wikieditor-toolbar-tool-link-ext-target' => "URL de l'enllaç",
 	'wikieditor-toolbar-tool-link-ext-text' => "Text de l'enllaç:",
@@ -2078,10 +2281,18 @@
 	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Enllaç extern',
 	'wikieditor-toolbar-tool-link-int-target-status-loading' => "Comprovació de l'existència de la pàgina ...",
 	'wikieditor-toolbar-tool-link-int-invalid' => 'El títol que heu especificat no és vàlid.',
+	'wikieditor-toolbar-tool-link-lookslikeinternal' => "L'URL que heu especificat sembla que enllaça a una altra pàgina del wiki. Voleu convertir-lo en un enllaç intern?",
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Enllaç intern',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Enllaç extern',
+	'wikieditor-toolbar-tool-link-empty' => 'No heu entrat res per enllaçar.',
 	'wikieditor-toolbar-tool-file' => 'Fitxer incrustat',
 	'wikieditor-toolbar-tool-file-example' => 'Exemple.png',
 	'wikieditor-toolbar-tool-reference' => 'Referència',
 	'wikieditor-toolbar-tool-reference-example' => 'Inseriu la nota al peu aquí',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Cancel·la',
+	'wikieditor-toolbar-tool-reference-title' => 'Inserir una referència',
+	'wikieditor-toolbar-tool-reference-insert' => 'Insereix',
+	'wikieditor-toolbar-tool-reference-text' => 'Text de la referència',
 	'wikieditor-toolbar-tool-signature' => 'Signatura, data i hora',
 	'wikieditor-toolbar-section-advanced' => 'Avançat',
 	'wikieditor-toolbar-tool-heading' => 'Encapçalament',
@@ -2096,6 +2307,12 @@
 	'wikieditor-toolbar-tool-ulist-example' => 'Element de la llista puntejada',
 	'wikieditor-toolbar-tool-olist' => 'Llista numerada',
 	'wikieditor-toolbar-tool-olist-example' => 'Element de la llista numerada',
+	'wikieditor-toolbar-tool-indent' => 'Sagnat',
+	'wikieditor-toolbar-tool-indent-example' => 'Línia sagnada',
+	'wikieditor-toolbar-tool-nowiki' => 'Sense format wiki',
+	'wikieditor-toolbar-tool-nowiki-example' => 'Inseriu aquí un text sense format',
+	'wikieditor-toolbar-tool-redirect' => 'Redirecció',
+	'wikieditor-toolbar-tool-redirect-example' => 'Nom de la pàgina destinació',
 	'wikieditor-toolbar-tool-big' => 'Gran',
 	'wikieditor-toolbar-tool-big-example' => 'Text gran',
 	'wikieditor-toolbar-tool-small' => 'Petit',
@@ -2124,14 +2341,19 @@
 | fila 2, cel·la 3',
 	'wikieditor-toolbar-tool-table-example-cell-text' => 'Text de cel·la',
 	'wikieditor-toolbar-tool-table-example-header' => 'Text de capçalera',
-	'wikieditor-toolbar-tool-table-title' => 'Insereix taula',
+	'wikieditor-toolbar-tool-table-title' => 'Insereix una taula',
 	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Files',
 	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Columnes',
-	'wikieditor-toolbar-tool-table-dimensions-header' => 'Inclou-hi una fila de capçalera',
+	'wikieditor-toolbar-tool-table-dimensions-header' => "Amb una fila d'encapçalament",
+	'wikieditor-toolbar-tool-table-wikitable' => 'Estil amb vores',
+	'wikieditor-toolbar-tool-table-sortable' => 'Taula ordenable',
 	'wikieditor-toolbar-tool-table-example' => 'Text de cel·la',
 	'wikieditor-toolbar-tool-table-preview' => 'Previsualització',
 	'wikieditor-toolbar-tool-table-insert' => 'Insereix',
-	'wikieditor-toolbar-tool-table-cancel' => 'Canceŀla',
+	'wikieditor-toolbar-tool-table-cancel' => 'Anuŀla',
+	'wikieditor-toolbar-tool-table-toomany' => 'Amb aquesta caixa de diàleg no és possible inserir una taula amb més de $1 ceŀles.',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'No heu introduït un nombre vàlid de files o columnes.',
+	'wikieditor-toolbar-tool-table-zero' => 'No podeu inserir una taula amb zero files o columnes.',
 	'wikieditor-toolbar-tool-replace' => 'Cerca i reemplaça',
 	'wikieditor-toolbar-tool-replace-title' => 'Cerca i reemplaça',
 	'wikieditor-toolbar-tool-replace-search' => 'Cerca:',
@@ -2145,8 +2367,10 @@
 	'wikieditor-toolbar-tool-replace-nomatch' => 'La vostra cerca no ha trobat cap coincidència.',
 	'wikieditor-toolbar-tool-replace-success' => "S'han fet $1 substitucions.",
 	'wikieditor-toolbar-tool-replace-emptysearch' => 'No heu introduït res per a cercar.',
+	'wikieditor-toolbar-tool-replace-invalidregex' => "L'expressió regular que heu introduït no és vàlida: $1",
 	'wikieditor-toolbar-section-characters' => 'Caràcters especials',
 	'wikieditor-toolbar-characters-page-latin' => 'Llatí',
+	'wikieditor-toolbar-characters-page-latinextended' => 'Llatí ampliat',
 	'wikieditor-toolbar-characters-page-ipa' => 'AFI',
 	'wikieditor-toolbar-characters-page-symbols' => 'Símbols',
 	'wikieditor-toolbar-characters-page-greek' => 'Grec',
@@ -2223,6 +2447,22 @@
 	'wikieditor-toolbar-help-content-indent-result' => 'Text normal<dl><dd>Text sagnat<dl><dd>Text sagnat</dd></dl></dd></dl>',
 );+/** Chechen (Нохчийн)
+ * @author Sasan700
+ */
+$messages['ce'] = array(
+	'wikieditor-toolbar-loading' => 'Чуйолуш…',
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com хьажориг корта',
+	'wikieditor-toolbar-tool-link-cancel' => 'Цаоьшу',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Цаоьшу',
+	'wikieditor-toolbar-tool-heading' => 'Корта',
+	'wikieditor-toolbar-tool-table-preview' => 'Хьалха муха ю хьажа',
+	'wikieditor-toolbar-tool-table-cancel' => 'Цаоьшу',
+	'wikieditor-toolbar-tool-replace-search' => 'Лаха:',
+	'wikieditor-toolbar-tool-replace-close' => 'Цаоьшу',
+	'wikieditor-toolbar-help-page-file' => 'Хlумнаш',
+);
+
 /** Sorani (Arabic script) (‫کوردی (عەرەبی)‬)
  * @author Asoxor
  * @author Marmzok
@@ -4605,49 +4845,206 @@
 ); /** Persian (فارسی)
+ * @author Ebraminio
+ * @author Huji
  * @author Ladsgroup
  */
 $messages['fa'] = array(
-	'wikieditor-toolbar-tool-italic' => 'ایتالیک',
-	'wikieditor-toolbar-tool-italic-example' => 'متن ایتالیک',
+	'wikieditor-toolbar' => 'نوار ابزار ویرایش',
+	'wikieditor-toolbar-desc' => 'نوار ابزار ویرایش صفحه با استفاده‌پذیری بالاتر',
+	'wikieditor-toolbar-preference' => 'فعال‌کردن نوارابزار ویرایش پیشرفته',
+	'wikieditor-toolbar-dialogs-preference' => 'فعال‌سازی پنجره‌های تعاملی برای وارد کردن پیوندها، جدول‌ها و غیره',
+	'wikieditor-toolbar-loading' => 'در حال بارگذاری...',
+	'wikieditor-toolbar-tool-bold' => 'ضخیم',
+	'wikieditor-toolbar-tool-bold-example' => 'متن ضخیم',
+	'wikieditor-toolbar-tool-italic' => 'مورب',
+	'wikieditor-toolbar-tool-italic-example' => 'متن مورب',
 	'wikieditor-toolbar-tool-ilink' => 'پیوند داخلی',
 	'wikieditor-toolbar-tool-ilink-example' => 'عنوان پیوند',
 	'wikieditor-toolbar-tool-xlink' => 'پیوند به بیرون (پیشوند http:// فراموش نشود)',
 	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com عنوان پیوند',
 	'wikieditor-toolbar-tool-link' => 'پیوند',
 	'wikieditor-toolbar-tool-link-title' => 'افزودن پیوند',
-	'wikieditor-toolbar-tool-link-int' => 'به یک صفحه ویکی',
-	'wikieditor-toolbar-tool-link-int-target' => 'عنوان صفحه:',
-	'wikieditor-toolbar-tool-link-int-text' => 'متن عنوان:',
+	'wikieditor-toolbar-tool-link-int' => 'به یک صفحهٔ ویکی',
+	'wikieditor-toolbar-tool-link-int-target' => 'صفحهٔ هدف یا نشانی اینترنتی:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'عنوان صفغحه یا نشانی اینترنتی',
+	'wikieditor-toolbar-tool-link-int-text' => 'متن برای نمایش:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'متنی که نمایش می‌یابد',
 	'wikieditor-toolbar-tool-link-ext' => 'به یک صفحه وب خارج از ویکی',
-	'wikieditor-toolbar-tool-link-ext-target' => 'آدرس اینترنتی پیوند:',
+	'wikieditor-toolbar-tool-link-ext-target' => 'نشانی اینترنتی پیوند:',
 	'wikieditor-toolbar-tool-link-ext-text' => 'متن پیوند:',
 	'wikieditor-toolbar-tool-link-insert' => 'افزودن پیوند',
 	'wikieditor-toolbar-tool-link-cancel' => 'لغو',
 	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'صفحه وجود دارد',
 	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'صفحه وجود ندارد',
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'عنوان نادرست',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'پیوند به بیرون',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'بررسی وجود داشتن صفحه...',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'عنوان تعیین‌شده نامعتبر است.',
+	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'نشانی اینترنتی که وارد کردید به شکلی است که نمایانگر یک پیوند به صفحه‌ای داخل ویکی است. آیا می‌خواهید آن را به یک پیوند داخلی تبدیل کنید؟',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'پیوند داخلی',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'پیوند به بیرون',
+	'wikieditor-toolbar-tool-link-empty' => 'شما چیزی برای پیوند کردن وارد نکردید.',
+	'wikieditor-toolbar-tool-file' => 'پروندهٔ جاسازی‌شده',
 	'wikieditor-toolbar-tool-file-example' => 'مثال.jpg',
 	'wikieditor-toolbar-tool-reference' => 'منبع',
-	'wikieditor-toolbar-tool-signature' => 'امضا و زمان',
+	'wikieditor-toolbar-tool-reference-example' => 'متن زیرنویس را اینجا اضافه کنید',
+	'wikieditor-toolbar-tool-reference-cancel' => 'لغو',
+	'wikieditor-toolbar-tool-reference-title' => 'اضافه کردن منبع',
+	'wikieditor-toolbar-tool-reference-insert' => 'اضافه کردن',
+	'wikieditor-toolbar-tool-reference-text' => 'متن منبع',
+	'wikieditor-toolbar-tool-signature' => 'امضا و برچسب زمان',
 	'wikieditor-toolbar-section-advanced' => 'پیشرفته',
-	'wikieditor-toolbar-tool-heading-example' => 'عنوان سطح',
-	'wikieditor-toolbar-group-format' => 'فهرست',
+	'wikieditor-toolbar-tool-heading' => 'عنوان',
+	'wikieditor-toolbar-tool-heading-1' => 'سطح ۱',
+	'wikieditor-toolbar-tool-heading-2' => 'سطح ۲',
+	'wikieditor-toolbar-tool-heading-3' => 'سطح ۳',
+	'wikieditor-toolbar-tool-heading-4' => 'سطح ۴',
+	'wikieditor-toolbar-tool-heading-5' => 'سطح ۵',
+	'wikieditor-toolbar-tool-heading-example' => 'متن عنوان',
+	'wikieditor-toolbar-group-format' => 'قالب',
+	'wikieditor-toolbar-tool-ulist' => 'فهرست گلوله‌ای',
+	'wikieditor-toolbar-tool-ulist-example' => 'مورد فهرست گلوله‌ای',
+	'wikieditor-toolbar-tool-olist' => 'فهرست شماره‌ای',
+	'wikieditor-toolbar-tool-olist-example' => 'مورد فهرست شماره‌ای',
+	'wikieditor-toolbar-tool-indent' => 'تو رفتگی',
+	'wikieditor-toolbar-tool-indent-example' => 'خط تو رفته',
+	'wikieditor-toolbar-tool-nowiki' => 'نادیده‌گرفتن قالب‌بندی ویکی',
+	'wikieditor-toolbar-tool-nowiki-example' => 'اینجا متن قالب‌بندی‌نشده وارد شود',
+	'wikieditor-toolbar-tool-redirect' => 'تغییرمسیر',
+	'wikieditor-toolbar-tool-redirect-example' => 'نام صفحه مقصد',
 	'wikieditor-toolbar-tool-big' => 'بزرگ',
 	'wikieditor-toolbar-tool-big-example' => 'متن بزرگ',
 	'wikieditor-toolbar-tool-small' => 'کوچک',
 	'wikieditor-toolbar-tool-small-example' => 'متن کوچک',
+	'wikieditor-toolbar-tool-superscript' => 'بالانویس',
+	'wikieditor-toolbar-tool-superscript-example' => 'متن بالانویس',
+	'wikieditor-toolbar-tool-subscript' => 'زیرنویس',
+	'wikieditor-toolbar-tool-subscript-example' => 'متن زیرنویس',
+	'wikieditor-toolbar-group-insert' => 'اضافه کردن',
+	'wikieditor-toolbar-tool-gallery' => 'نگارخانهٔ تصویر',
+	'wikieditor-toolbar-tool-gallery-example' => '{{ns:file}}:مثال.jpg|عنوان ۱
+{{ns:file}}:مثال.jpg|عنوان ۲',
 	'wikieditor-toolbar-tool-newline' => 'خط جدید',
 	'wikieditor-toolbar-tool-table' => 'جدول',
+	'wikieditor-toolbar-tool-table-example-old' => '-
+! عنوان ۱
+! عنوان ۲
+! عنوان ۳
+|-
+| ردیف ۱، خانه ۱
+| ردیف ۱، خانه ۲
+| ردیف ۱، خانه ۳
+|-
+| ردیف ۲، خانه ۱
+| ردیف ۲، خانه ۲
+| ردیف ۲، خانه ۳',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'متن خانه',
+	'wikieditor-toolbar-tool-table-example-header' => 'متن عنوان',
+	'wikieditor-toolbar-tool-table-title' => 'اضافه کردن جدول',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'ردیف‌ها',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'ستون‌ها',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'افزودن ردیف سرتیتر',
+	'wikieditor-toolbar-tool-table-wikitable' => 'سبک با لبه',
+	'wikieditor-toolbar-tool-table-sortable' => 'ساختن جدول قابل مرتب‌سازی',
+	'wikieditor-toolbar-tool-table-example' => 'مثال',
+	'wikieditor-toolbar-tool-table-preview' => 'پیش‌نمایش',
+	'wikieditor-toolbar-tool-table-insert' => 'اضافه کردن',
 	'wikieditor-toolbar-tool-table-cancel' => 'لغو',
+	'wikieditor-toolbar-tool-table-toomany' => 'اضافه کردن جدولی با بیش از $1 خانه توسط این ابزار ممکن نیست.',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'شما عدد درستی برای تعداد ردیف‌ها و ستون‌ها وارد نکرده‌اید.',
+	'wikieditor-toolbar-tool-table-zero' => 'شما نمی‌توانید جدولی با صفر ردیف یا ستون اضافه کنید.',
+	'wikieditor-toolbar-tool-replace' => 'یافتن و جایگزین کردن',
+	'wikieditor-toolbar-tool-replace-title' => 'جستجو و جایگزین کردن',
+	'wikieditor-toolbar-tool-replace-search' => 'جستجو برای:',
+	'wikieditor-toolbar-tool-replace-replace' => 'جایگزین کردن با:',
+	'wikieditor-toolbar-tool-replace-case' => 'تطبیق بزرگی و کوچکی حروف',
+	'wikieditor-toolbar-tool-replace-regex' => 'به کارگیری عبارت جستجو به عنوان یک regular expression',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'یافتن بعدی',
+	'wikieditor-toolbar-tool-replace-button-replacenext' => 'جایگزین کردن بعدی',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'جایگزین کردن همه موارد',
+	'wikieditor-toolbar-tool-replace-close' => 'لغو',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'جستجوی شما با هیچ موردی مطابقت نداشت.',
+	'wikieditor-toolbar-tool-replace-success' => '$1 جایگزینی انجام شد.',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'شما چیزی برای جستجو وارد نکردید.',
+	'wikieditor-toolbar-tool-replace-invalidregex' => 'عبارت regular expression که وارد کردید مجاز نیست: $1',
+	'wikieditor-toolbar-section-characters' => 'نویسه‌های ویژه',
+	'wikieditor-toolbar-characters-page-latin' => 'لاتین',
+	'wikieditor-toolbar-characters-page-latinextended' => 'لاتین گسترش‌یافته',
+	'wikieditor-toolbar-characters-page-ipa' => 'آوانگاری بین‌المللی',
+	'wikieditor-toolbar-characters-page-symbols' => 'نمادها',
 	'wikieditor-toolbar-characters-page-greek' => 'یونانی',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'سیریلیک',
 	'wikieditor-toolbar-characters-page-arabic' => 'عربی',
 	'wikieditor-toolbar-characters-page-hebrew' => 'عبری',
+	'wikieditor-toolbar-characters-page-bangla' => 'بنگالی',
 	'wikieditor-toolbar-characters-page-telugu' => 'تالوگو',
+	'wikieditor-toolbar-characters-page-sinhala' => 'سینهالی',
+	'wikieditor-toolbar-characters-page-gujarati' => 'گجراتی',
 	'wikieditor-toolbar-section-help' => 'راهنما',
-	'wikieditor-toolbar-help-content-italic-description' => 'ایتالیک',
+	'wikieditor-toolbar-help-heading-description' => 'توضیح',
+	'wikieditor-toolbar-help-heading-syntax' => 'آن چه می‌نویسید',
+	'wikieditor-toolbar-help-heading-result' => 'آن چه به دست می‌آورید',
+	'wikieditor-toolbar-help-page-format' => 'قالب‌بندی',
+	'wikieditor-toolbar-help-page-link' => 'پیوندها',
+	'wikieditor-toolbar-help-page-heading' => 'عنوان‌ها',
+	'wikieditor-toolbar-help-page-list' => 'فهرست‌ها',
+	'wikieditor-toolbar-help-page-file' => 'پرونده‌ها',
+	'wikieditor-toolbar-help-page-reference' => 'منابع',
+	'wikieditor-toolbar-help-page-discussion' => 'بحث',
+	'wikieditor-toolbar-help-content-italic-description' => 'مورب',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''متن مورب''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>متن مورب</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'ضخیم',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''متن ضخیم'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>متن ضخیم</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'ضخیم و مورب',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''متن ضخیم و مورب'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>متن ضخیم و مورب</em></strong>',
+	'wikieditor-toolbar-help-content-ilink-description' => 'پیوند داخلی',
+	'wikieditor-toolbar-help-content-ilink-syntax' => '[[عنوان صفحه|عنوان پیوند]]<br />[[عنوان صفحه]]',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>عنوان پیوند</a><br /><a href='#'>عنوان صفحه</a>",
+	'wikieditor-toolbar-help-content-xlink-description' => 'پیوند به بیرون',
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org عنوان پیوند]<br />[http://www.example.org]<br />http://www.example.org',
+	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>عنوان پیوند</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.example.org</a>",
+	'wikieditor-toolbar-help-content-heading1-description' => 'عنوان سطح اول',
+	'wikieditor-toolbar-help-content-heading1-syntax' => '= متن عنوان =',
+	'wikieditor-toolbar-help-content-heading1-result' => '<h1>متن عنوان</h1>',
+	'wikieditor-toolbar-help-content-heading2-description' => 'عنوان سطح دوم',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== متن عنوان ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>متن عنوان</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'عنوان سطح سوم',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== متن عنوان ===',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>متن عنوان</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => 'عنوان سطح چهارم',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== متن عنوان ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4>متن عنوان</h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => 'عنوان سطح پنجم',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== متن عنوان =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>متن عنوان</h5>',
+	'wikieditor-toolbar-help-content-ulist-description' => 'فهرست گلوله‌ای',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* مورد فهرست<br />* مورد فهرست',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>مورد فهرست</li><li>مورد فهرست</li></ul>',
+	'wikieditor-toolbar-help-content-olist-description' => 'فهرست شماره‌ای',
+	'wikieditor-toolbar-help-content-olist-syntax' => '# مورد فهرست<br /># مورد فهرست',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>مورد فهرست</li><li>مورد فهرست</li></ol>',
+	'wikieditor-toolbar-help-content-file-description' => 'پرونده جاسازی‌شده',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[{{ns:file}}:مثال.png|thumb|متن عنوان]]',
+	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='متن عنوان' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/UsabilityInitiative/images/wikiEditor/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='بزرگ‌نمایی' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>متن عنوان</div></div>",
+	'wikieditor-toolbar-help-content-reference-description' => 'منبع',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'متن صفحه.&lt;ref name="test"&gt;[http://www.example.org متن پیوند]، متن اضافی.&lt;/ref&gt;',
+	'wikieditor-toolbar-help-content-reference-result' => "متن صفحه.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'استفاده بیشتر از همین منبع',
+	'wikieditor-toolbar-help-content-rereference-result' => "متن صفحه.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'نمایش منابع',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>متن پیوند</a>، متن اضافی.</li></ol>",
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'امضا به همراه برچسب زمان',
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>نام کاربری</a> (<a href='#' title='{{#special:mytalk}}'>بحث</a>) 15:54, 10 June 2009 (UTC)",
 	'wikieditor-toolbar-help-content-signature-description' => 'امضا',
+	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>نام کاربری</a> (<a href='#' title='{{#special:mytalk}}'>بحث</a>)",
+	'wikieditor-toolbar-help-content-indent-description' => 'تو رفتگی',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'متن عادی<br />:متن تو رفته<br />::متن تو رفته',
+	'wikieditor-toolbar-help-content-indent-result' => 'متن عادی<dl><dd>متن تو رفته<dl><dd>متن تو رفته</dd></dl></dd></dl>',
 ); /** Finnish (Suomi)
@@ -4785,6 +5182,7 @@
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyrillinen',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabia',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Heprea',
+	'wikieditor-toolbar-characters-page-bangla' => 'Bengali',
 	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
 	'wikieditor-toolbar-characters-page-sinhala' => 'Sinhali',
 	'wikieditor-toolbar-characters-page-gujarati' => 'Gudžarati',
@@ -7081,7 +7479,7 @@
 	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'URL yang Anda berikan tampaknya merupakan pranala ke halaman wiki lain. Apakah Anda ingin membuatnya menjadi pranala internal?',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Pranala internal',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Pranala luar',
-	'wikieditor-toolbar-tool-link-empty' => 'Anda tidak memasukkan apapun untuk ditautkan.',
+	'wikieditor-toolbar-tool-link-empty' => 'Anda tidak memasukkan apa pun untuk ditautkan.',
 	'wikieditor-toolbar-tool-file' => 'Sisipkan berkas',
 	'wikieditor-toolbar-tool-file-example' => 'Contoh.jpg',
 	'wikieditor-toolbar-tool-reference' => 'Referensi',
@@ -7159,7 +7557,7 @@
 	'wikieditor-toolbar-tool-replace-close' => 'Batalkan',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Pencarian Anda tidak membuahkan hasil.',
 	'wikieditor-toolbar-tool-replace-success' => 'Terjadi $1 penggantian.',
-	'wikieditor-toolbar-tool-replace-emptysearch' => 'Anda tidak memasukan apapun untuk di pencarian.',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'Anda tidak memasukan apa pun untuk di pencarian.',
 	'wikieditor-toolbar-tool-replace-invalidregex' => 'Kalimat biasa yang Anda masukkan tidak sah: $1',
 	'wikieditor-toolbar-section-characters' => 'Karakter spesial',
 	'wikieditor-toolbar-characters-page-latin' => 'Latin',
@@ -7239,6 +7637,11 @@
 	'wikieditor-toolbar-help-content-indent-result' => 'Teks normal<dl><dd>Teks inden<dl><dd>Teks inden</dd></dl></dd></dl>',
 );+/** Igbo (Igbo) */
+$messages['ig'] = array(
+	'wikieditor-toolbar-tool-reference-cancel' => 'Emekwàlà',
+);
+
 /** Ido (Ido)
  * @author Malafaya
  */
@@ -7262,6 +7665,7 @@
 ); /** Italian (Italiano)
+ * @author Andria
  * @author Aushulz
  * @author Darth Kule
  * @author F. Cosoleto
@@ -7428,7 +7832,7 @@
 	'wikieditor-toolbar-help-content-xlink-description' => 'Collegamento esterno',
 	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org Etichetta collegamento]<br />[http://www.example.org]<br />http://www.example.org',
 	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Etichetta collegamento</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.example.org</a>",
-	'wikieditor-toolbar-help-content-heading1-description' => '1° livello di intestazione',
+	'wikieditor-toolbar-help-content-heading1-description' => '1° livellu de intestada',
 	'wikieditor-toolbar-help-content-heading1-syntax' => '= Titolo sezione =',
 	'wikieditor-toolbar-help-content-heading1-result' => '<h1>Titolo sezione</h1>',
 	'wikieditor-toolbar-help-content-heading2-description' => '2° livello di intestazione',
@@ -7472,6 +7876,7 @@
  * @author Aotake
  * @author Fievarsty
  * @author Fryed-peach
+ * @author Hosiryuhosi
  * @author Whym
  * @author 青子守歌
  */
@@ -7482,9 +7887,9 @@
 	'wikieditor-toolbar-dialogs-preference' => 'リンクや表などの挿入ダイアログを有効化する',
 	'wikieditor-toolbar-loading' => '読み込み中…',
 	'wikieditor-toolbar-tool-bold' => '太字',
-	'wikieditor-toolbar-tool-bold-example' => '太字テキスト',
+	'wikieditor-toolbar-tool-bold-example' => '太字文',
 	'wikieditor-toolbar-tool-italic' => '斜体',
-	'wikieditor-toolbar-tool-italic-example' => '斜体テキスト',
+	'wikieditor-toolbar-tool-italic-example' => '斜体文',
 	'wikieditor-toolbar-tool-ilink' => '内部リンク',
 	'wikieditor-toolbar-tool-ilink-example' => 'リンクタイトル',
 	'wikieditor-toolbar-tool-xlink' => '外部リンク (接頭辞 http:// を忘れずに)',
@@ -7617,7 +8022,7 @@
 	'wikieditor-toolbar-help-page-list' => '箇条書き',
 	'wikieditor-toolbar-help-page-file' => 'ファイル',
 	'wikieditor-toolbar-help-page-reference' => '注釈',
-	'wikieditor-toolbar-help-page-discussion' => 'ノート',
+	'wikieditor-toolbar-help-page-discussion' => 'トーク',
 	'wikieditor-toolbar-help-content-italic-description' => '斜体',
 	'wikieditor-toolbar-help-content-italic-syntax' => "''斜体テキスト''",
 	'wikieditor-toolbar-help-content-italic-result' => '<em>斜体テキスト</em>',
@@ -7665,9 +8070,9 @@
 	'wikieditor-toolbar-help-content-showreferences-description' => '脚注の表示',
 	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>リンクタイトル</a>、追加テキスト</li></ol>",
 	'wikieditor-toolbar-help-content-signaturetimestamp-description' => '時刻付き署名',
-	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>利用者名</a> (<a href='#' title='{{#special:mytalk}}'>会話</a>) 2009年6月10日 (水) 15:54 (UTC)",
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>利用者名</a> (<a href='#' title='{{#special:mytalk}}'>トーク</a>) 2009年6月10日 (水) 15:54 (UTC)",
 	'wikieditor-toolbar-help-content-signature-description' => '署名',
-	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>利用者名</a> (<a href='#' title='{{#special:mytalk}}'>会話</a>)",
+	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>利用者名</a> (<a href='#' title='{{#special:mytalk}}'>トーク</a>)",
 	'wikieditor-toolbar-help-content-indent-description' => 'インデント',
 	'wikieditor-toolbar-help-content-indent-syntax' => '通常の文章<br />:インデントされた文章<br />::インデントされた文章',
 	'wikieditor-toolbar-help-content-indent-result' => '通常の文章<dl><dd>インデントされた文章<dl><dd>インデントされた文章</dd></dl></dd></dl>',
@@ -8748,6 +9153,7 @@
 /** Lithuanian (Lietuvių)
  * @author Garas
  * @author Homo
+ * @author Hugo.arg
  * @author Matasg
  */
 $messages['lt'] = array(
@@ -8790,6 +9196,10 @@
 	'wikieditor-toolbar-tool-file-example' => 'Pavyzdys.jpg',
 	'wikieditor-toolbar-tool-reference' => 'Išnaša',
 	'wikieditor-toolbar-tool-reference-example' => 'Čia įterpkite teksto išnašą',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Atšaukti',
+	'wikieditor-toolbar-tool-reference-title' => 'Įtraukti nuorodą',
+	'wikieditor-toolbar-tool-reference-insert' => 'Įtraukti',
+	'wikieditor-toolbar-tool-reference-text' => 'Nuorodos tekstas',
 	'wikieditor-toolbar-tool-signature' => 'Jūsų parašas bei laikas',
 	'wikieditor-toolbar-section-advanced' => 'Išplėstinis',
 	'wikieditor-toolbar-tool-heading' => 'Antraštė',
@@ -8806,6 +9216,10 @@
 	'wikieditor-toolbar-tool-olist-example' => 'Numeruoto sąrašo elementas',
 	'wikieditor-toolbar-tool-indent' => 'Įtrauka',
 	'wikieditor-toolbar-tool-indent-example' => 'Įtraukta eilutė',
+	'wikieditor-toolbar-tool-nowiki' => 'Ignoruoti wiki formatą',
+	'wikieditor-toolbar-tool-nowiki-example' => 'Čia įterpkite neformuotą tekstą',
+	'wikieditor-toolbar-tool-redirect' => 'nukreipimą',
+	'wikieditor-toolbar-tool-redirect-example' => 'Tikslinio puslapio pavadinimas',
 	'wikieditor-toolbar-tool-big' => 'Didelis',
 	'wikieditor-toolbar-tool-big-example' => 'Didelis tekstas',
 	'wikieditor-toolbar-tool-small' => 'Mažas',
@@ -9198,7 +9612,7 @@
 	'wikieditor-toolbar-tool-reference' => 'Навод',
 	'wikieditor-toolbar-tool-reference-example' => 'Тука внесете текст на фуснотата',
 	'wikieditor-toolbar-tool-reference-cancel' => 'Откажи',
-	'wikieditor-toolbar-tool-reference-title' => 'Вметни референца',
+	'wikieditor-toolbar-tool-reference-title' => 'Вметни навод',
 	'wikieditor-toolbar-tool-reference-insert' => 'Вметни',
 	'wikieditor-toolbar-tool-reference-text' => 'Текст на наводот',
 	'wikieditor-toolbar-tool-signature' => 'Вашиот потпис со време',
@@ -9211,10 +9625,10 @@
 	'wikieditor-toolbar-tool-heading-5' => 'Ниво 5',
 	'wikieditor-toolbar-tool-heading-example' => 'Наслов',
 	'wikieditor-toolbar-group-format' => 'Формат',
-	'wikieditor-toolbar-tool-ulist' => 'Листа со потточки',
-	'wikieditor-toolbar-tool-ulist-example' => 'Потточка во листата',
-	'wikieditor-toolbar-tool-olist' => 'Листа со редни броеви',
-	'wikieditor-toolbar-tool-olist-example' => 'Реден број на листата',
+	'wikieditor-toolbar-tool-ulist' => 'Список со потточки',
+	'wikieditor-toolbar-tool-ulist-example' => 'Потточка во списокот',
+	'wikieditor-toolbar-tool-olist' => 'Список со редни броеви',
+	'wikieditor-toolbar-tool-olist-example' => 'Реден број во список',
 	'wikieditor-toolbar-tool-indent' => 'Вовлечeно',
 	'wikieditor-toolbar-tool-indent-example' => 'Вовлечен ред',
 	'wikieditor-toolbar-tool-nowiki' => 'Без викиформатирање',
@@ -9296,7 +9710,7 @@
 	'wikieditor-toolbar-help-page-format' => 'Форматирање',
 	'wikieditor-toolbar-help-page-link' => 'Врски',
 	'wikieditor-toolbar-help-page-heading' => 'Наслови',
-	'wikieditor-toolbar-help-page-list' => 'Листи',
+	'wikieditor-toolbar-help-page-list' => 'Списоци',
 	'wikieditor-toolbar-help-page-file' => 'Податотеки',
 	'wikieditor-toolbar-help-page-reference' => 'Наводи',
 	'wikieditor-toolbar-help-page-discussion' => 'Разговор',
@@ -9330,10 +9744,10 @@
 	'wikieditor-toolbar-help-content-heading5-description' => '5 ниво наслов',
 	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Наслов =====',
 	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Наслов</h5>',
-	'wikieditor-toolbar-help-content-ulist-description' => 'Листа со потточки',
+	'wikieditor-toolbar-help-content-ulist-description' => 'Список со потточки',
 	'wikieditor-toolbar-help-content-ulist-syntax' => '* Ставка<br />* Ставка',
 	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>Ставка</li><li>Ставка</li></ul>',
-	'wikieditor-toolbar-help-content-olist-description' => 'Листа со редни броеви',
+	'wikieditor-toolbar-help-content-olist-description' => 'Список со редни броеви',
 	'wikieditor-toolbar-help-content-olist-syntax' => '# Ставка<br /># Ставка',
 	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Ставка</li><li>Ставка</li></ol>',
 	'wikieditor-toolbar-help-content-file-description' => 'Вметната податотека',
@@ -9405,7 +9819,7 @@
 	'wikieditor-toolbar-tool-reference-insert' => 'ചേർക്കുക',
 	'wikieditor-toolbar-tool-reference-text' => 'അവലംബ എഴുത്ത്',
 	'wikieditor-toolbar-tool-signature' => 'ഒപ്പും സമയമുദ്രയും',
-	'wikieditor-toolbar-section-advanced' => 'വിപുലീകരിക്കപ്പെട്ടവ',
+	'wikieditor-toolbar-section-advanced' => 'വിപുലം',
 	'wikieditor-toolbar-tool-heading' => 'തലക്കെട്ട്',
 	'wikieditor-toolbar-tool-heading-1' => 'തലം 1',
 	'wikieditor-toolbar-tool-heading-2' => 'തലം 2',
@@ -9483,7 +9897,7 @@
 	'wikieditor-toolbar-characters-page-latin' => 'ലാറ്റിൻ',
 	'wikieditor-toolbar-characters-page-latinextended' => 'ലാറ്റിൻ വിപുലം',
 	'wikieditor-toolbar-characters-page-ipa' => 'ഐ.പി.എ.',
-	'wikieditor-toolbar-characters-page-symbols' => 'ചിഹ്നനങ്ങൾ',
+	'wikieditor-toolbar-characters-page-symbols' => 'ചിഹ്നങ്ങൾ',
 	'wikieditor-toolbar-characters-page-greek' => 'ഗ്രീക്ക്',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'സിറിലിക്',
 	'wikieditor-toolbar-characters-page-arabic' => 'അറബിക്',
@@ -9782,7 +10196,7 @@
 	'wikieditor-toolbar-tool-link-insert' => 'Daħħal ħolqa',
 	'wikieditor-toolbar-tool-link-cancel' => 'Annulla',
 	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'Il-paġna teżisti',
-	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'Il-paġna me teżistix',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'Il-paġna ma teżistix',
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Titlu invalidu',
 	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Ħolqa esterna',
 	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Qiegħdha tiġi ċċekkjata l-eżistenza tal-paġna...',
@@ -9798,7 +10212,7 @@
 	'wikieditor-toolbar-tool-reference-cancel' => 'Annulla',
 	'wikieditor-toolbar-tool-reference-title' => 'Daħħal nota',
 	'wikieditor-toolbar-tool-reference-insert' => 'Daħħal',
-	'wikieditor-toolbar-tool-reference-text' => 'Test tan-nita',
+	'wikieditor-toolbar-tool-reference-text' => 'Test tan-nota',
 	'wikieditor-toolbar-tool-signature' => 'Firma u data',
 	'wikieditor-toolbar-section-advanced' => 'Avvanzati',
 	'wikieditor-toolbar-tool-heading' => 'Isem tas-sezzjoni',
@@ -9871,7 +10285,7 @@
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Biddel kollox',
 	'wikieditor-toolbar-tool-replace-close' => 'Annulla',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'It-tfittxija ma tat l-ebda riżultat.',
-	'wikieditor-toolbar-tool-replace-success' => 'saru $1 tibdila.',
+	'wikieditor-toolbar-tool-replace-success' => 'Saret/u $1 tibdila/iet.',
 	'wikieditor-toolbar-tool-replace-emptysearch' => 'Ma indikajt xejn xi trid tfittex.',
 	'wikieditor-toolbar-tool-replace-invalidregex' => 'L-espressjonali regolari li daħħalt hi invalida: $1',
 	'wikieditor-toolbar-section-characters' => 'Karattri speċjali',
@@ -9935,7 +10349,7 @@
 	'wikieditor-toolbar-help-content-olist-syntax' => '# Element tal-lista<br /># Element tal-lista',
 	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Element tal-lista</li><li>Element tal-lista</li></ol>',
 	'wikieditor-toolbar-help-content-file-description' => 'Fajl inkorporat',
-	'wikieditor-toolbar-help-content-file-syntax' => '[[{{ns:file}}:Eżempju.png|thumb|Test tad-deskrizzjoni]]',
+	'wikieditor-toolbar-help-content-file-syntax' => "[[{{ns:file}}:Eżempju.png|thumb|Test ta' deskrizzjoni]]",
 	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Test tad-deskrizzjoni' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/UsabilityInitiative/images/wikiEditor/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Kabbar' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Test tad-deskrizzjoni</div></div>",
 	'wikieditor-toolbar-help-content-reference-description' => 'Referenza',
 	'wikieditor-toolbar-help-content-reference-syntax' => 'Test tal-paġna.&lt;ref name="test"&gt;[http://www.example.org Test tal-ħolqa], test addizzjonali.&lt;/ref&gt;',
@@ -10919,7 +11333,11 @@
 	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com Gleecher-Text',
 	'wikieditor-toolbar-tool-link' => 'Gleecher',
 	'wikieditor-toolbar-tool-link-ext-target' => 'Gleecher-Adress:',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Gewebbgleecher',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Gewebbgleecher',
+	'wikieditor-toolbar-tool-heading' => 'Iwwerschrift',
 	'wikieditor-toolbar-group-format' => 'Lischt',
+	'wikieditor-toolbar-tool-redirect' => 'Weiderleiding',
 	'wikieditor-toolbar-tool-big' => 'Gross',
 	'wikieditor-toolbar-tool-small' => 'Glee',
 	'wikieditor-toolbar-group-insert' => 'Dezu duh',
@@ -11003,7 +11421,7 @@
 	'wikieditor-toolbar-tool-heading-4' => 'Poziom 4',
 	'wikieditor-toolbar-tool-heading-5' => 'Poziom 5',
 	'wikieditor-toolbar-tool-heading-example' => 'Tekst nagłówka',
-	'wikieditor-toolbar-group-format' => 'Lista',
+	'wikieditor-toolbar-group-format' => 'Format',
 	'wikieditor-toolbar-tool-ulist' => 'Lista punktowana',
 	'wikieditor-toolbar-tool-ulist-example' => 'Pozycja na liście punktowanej',
 	'wikieditor-toolbar-tool-olist' => 'Lista numerowana',
@@ -11365,13 +11783,20 @@
  * @author Ahmed-Najib-Biabani-Ibrahimkhel
  */
 $messages['ps'] = array(
+	'wikieditor-toolbar-loading' => 'د برسېرېدلو په حال کې...',
 	'wikieditor-toolbar-tool-link' => 'تړنه',
 	'wikieditor-toolbar-tool-link-cancel' => 'ناګارل',
 	'wikieditor-toolbar-tool-link-int-target-status-external' => 'باندنۍ تړنه',
+	'wikieditor-toolbar-tool-heading' => 'سرليک',
+	'wikieditor-toolbar-tool-heading-example' => 'د سرليک متن',
 	'wikieditor-toolbar-group-format' => 'لړليک',
+	'wikieditor-toolbar-tool-big' => 'لوی',
+	'wikieditor-toolbar-tool-small' => 'وړوکی',
 	'wikieditor-toolbar-tool-newline' => 'نوې کرښه',
 	'wikieditor-toolbar-tool-table-example' => 'بېلګه',
 	'wikieditor-toolbar-tool-table-preview' => 'مخليدنه',
+	'wikieditor-toolbar-tool-replace-search' => 'پلټنه د:',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'بل موندل',
 	'wikieditor-toolbar-tool-replace-close' => 'تړل',
 	'wikieditor-toolbar-section-characters' => 'ځانګړي توري',
 	'wikieditor-toolbar-characters-page-greek' => 'يوناني',
@@ -11597,6 +12022,7 @@
  * @author 555
  * @author Eduardo.mps
  * @author Everton137
+ * @author Giro720
  * @author Heldergeovane
  * @author Luckas Blade
  */
@@ -11643,6 +12069,7 @@
 	'wikieditor-toolbar-tool-reference-cancel' => 'Cancelar',
 	'wikieditor-toolbar-tool-reference-title' => 'Inserir referência',
 	'wikieditor-toolbar-tool-reference-insert' => 'Inserir',
+	'wikieditor-toolbar-tool-reference-text' => 'Texto da referência',
 	'wikieditor-toolbar-tool-signature' => 'Assinatura, hora e data',
 	'wikieditor-toolbar-section-advanced' => 'Edição avançada',
 	'wikieditor-toolbar-tool-heading' => 'Cabeçalho',
@@ -11660,6 +12087,9 @@
 	'wikieditor-toolbar-tool-indent' => 'Indentação',
 	'wikieditor-toolbar-tool-indent-example' => 'Linha indentada',
 	'wikieditor-toolbar-tool-nowiki' => 'Sem formatação wiki',
+	'wikieditor-toolbar-tool-nowiki-example' => 'Inserir aqui texto sem formatação',
+	'wikieditor-toolbar-tool-redirect' => 'Redirecionamento',
+	'wikieditor-toolbar-tool-redirect-example' => 'Nome da página de destino',
 	'wikieditor-toolbar-tool-big' => 'Grande',
 	'wikieditor-toolbar-tool-big-example' => 'Texto grande',
 	'wikieditor-toolbar-tool-small' => 'Pequeno',
@@ -11724,6 +12154,7 @@
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirílico',
 	'wikieditor-toolbar-characters-page-arabic' => 'Árabe',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebraico',
+	'wikieditor-toolbar-characters-page-bangla' => 'Bengali',
 	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
 	'wikieditor-toolbar-characters-page-sinhala' => 'Cingalês',
 	'wikieditor-toolbar-characters-page-gujarati' => 'Guzerate',
@@ -11796,14 +12227,15 @@
 /** Romanian (Română)
  * @author Firilacroco
  * @author KlaudiuMihaila
+ * @author Minisarm
  * @author Strainu
  */
 $messages['ro'] = array(
 	'wikieditor-toolbar' => 'Modificarea barei de instrumente',
 	'wikieditor-toolbar-desc' => 'Modificarea barei de instrumente cu utilizare ridicată',
-	'wikieditor-toolbar-preference' => 'Activaţi modificarea ridicată a barei de instrumente',
-	'wikieditor-toolbar-dialogs-preference' => 'Activează bare pentru a insera legături, tabele şi altele',
-	'wikieditor-toolbar-loading' => 'Încărcare...',
+	'wikieditor-toolbar-preference' => 'Activați modificarea ridicată a barei de instrumente',
+	'wikieditor-toolbar-dialogs-preference' => 'Activează bare pentru a insera legături, tabele și altele',
+	'wikieditor-toolbar-loading' => 'Se încarcă...',
 	'wikieditor-toolbar-tool-bold' => 'Aldin',
 	'wikieditor-toolbar-tool-bold-example' => 'Text aldin',
 	'wikieditor-toolbar-tool-italic' => 'Cursiv',
@@ -11813,31 +12245,35 @@
 	'wikieditor-toolbar-tool-xlink' => 'Legătură externă (cu prefixul http://)',
 	'wikieditor-toolbar-tool-xlink-example' => 'http://www.exemplu.com titlul legăturii',
 	'wikieditor-toolbar-tool-link' => 'Legătură',
-	'wikieditor-toolbar-tool-link-title' => 'Adaugă legătură',
+	'wikieditor-toolbar-tool-link-title' => 'Adăugarea unei legături',
 	'wikieditor-toolbar-tool-link-int' => 'Către o pagină wiki',
-	'wikieditor-toolbar-tool-link-int-target' => 'Pagina ţintă sau URL:',
-	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Introduceţi titlul paginii',
-	'wikieditor-toolbar-tool-link-int-text' => 'Text afişat:',
-	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Introduceţi textul care ar trebui afişat',
+	'wikieditor-toolbar-tool-link-int-target' => 'Pagină țintă sau URL:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Titlul paginii sau adresa URL',
+	'wikieditor-toolbar-tool-link-int-text' => 'Text de afișat:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Introduceți textul care ar trebui afișat',
 	'wikieditor-toolbar-tool-link-ext' => 'Către o pagină web externă',
 	'wikieditor-toolbar-tool-link-ext-target' => 'Legătură URL:',
 	'wikieditor-toolbar-tool-link-ext-text' => 'Textul legăturii:',
-	'wikieditor-toolbar-tool-link-insert' => 'Introduceţi legătură',
-	'wikieditor-toolbar-tool-link-cancel' => 'Renunţă',
+	'wikieditor-toolbar-tool-link-insert' => 'Introdu legătura',
+	'wikieditor-toolbar-tool-link-cancel' => 'Revocare',
 	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'Pagina există',
 	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'Pagina nu există',
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Titlu incorect',
 	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Legătură externă',
-	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Verific existenţa paginii...',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Verific existența paginii...',
 	'wikieditor-toolbar-tool-link-int-invalid' => 'Titlul specificat nu este corect.',
-	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'URL-ul specificat arată ca şi o legătură către altă pagină wiki. Doriţi să o transformaţi într-o legătură internă?',
+	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'URL-ul specificat pare a fi o legătură către o altă pagină wiki. Doriți să o transformați într-o legătură internă?',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Legătură internă',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Legătură externă',
-	'wikieditor-toolbar-tool-link-empty' => 'Nu aţi introdus nimic către care să stabilesc o legătură.',
-	'wikieditor-toolbar-tool-file' => 'Fişier inserat',
+	'wikieditor-toolbar-tool-link-empty' => 'Nu ați introdus nimic către care să stabilesc o legătură.',
+	'wikieditor-toolbar-tool-file' => 'Fișier inserat',
 	'wikieditor-toolbar-tool-file-example' => 'Exemplu.jpg',
-	'wikieditor-toolbar-tool-reference' => 'Referinţă',
-	'wikieditor-toolbar-tool-reference-example' => 'Introduceţi textul notei de subsol aici.',
+	'wikieditor-toolbar-tool-reference' => 'Referință',
+	'wikieditor-toolbar-tool-reference-example' => 'Introduceți textul notei de subsol aici.',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Revocare',
+	'wikieditor-toolbar-tool-reference-title' => 'Inserare referință',
+	'wikieditor-toolbar-tool-reference-insert' => 'Inserează',
+	'wikieditor-toolbar-tool-reference-text' => 'Conținutul referinței',
 	'wikieditor-toolbar-tool-signature' => 'Semnătură datată',
 	'wikieditor-toolbar-section-advanced' => 'Avansat',
 	'wikieditor-toolbar-tool-heading' => 'Titlu',
@@ -11847,13 +12283,17 @@
 	'wikieditor-toolbar-tool-heading-4' => 'Nivelul 4',
 	'wikieditor-toolbar-tool-heading-5' => 'Nivelul 5',
 	'wikieditor-toolbar-tool-heading-example' => 'Textul din titlu',
-	'wikieditor-toolbar-group-format' => 'Listă',
+	'wikieditor-toolbar-group-format' => 'Format',
 	'wikieditor-toolbar-tool-ulist' => 'Listă cu puncte',
 	'wikieditor-toolbar-tool-ulist-example' => 'Item în listă neordonată',
 	'wikieditor-toolbar-tool-olist' => 'Listă ordonată',
 	'wikieditor-toolbar-tool-olist-example' => 'Item în listă ordonată',
 	'wikieditor-toolbar-tool-indent' => 'Alineat',
 	'wikieditor-toolbar-tool-indent-example' => 'Linie cu alineat',
+	'wikieditor-toolbar-tool-nowiki' => 'Fără formatare wiki',
+	'wikieditor-toolbar-tool-nowiki-example' => 'Inserați textul neformatat aici',
+	'wikieditor-toolbar-tool-redirect' => 'Redirecționare',
+	'wikieditor-toolbar-tool-redirect-example' => 'Numele paginii țintă',
 	'wikieditor-toolbar-tool-big' => 'Mare',
 	'wikieditor-toolbar-tool-big-example' => 'Text mare',
 	'wikieditor-toolbar-tool-small' => 'Mic',
@@ -11882,65 +12322,66 @@
 | rând 2, celula 3',
 	'wikieditor-toolbar-tool-table-example-cell-text' => 'Textul celulei',
 	'wikieditor-toolbar-tool-table-example-header' => 'Textul titlului coloanei',
-	'wikieditor-toolbar-tool-table-title' => 'Inseraţi tabelul',
+	'wikieditor-toolbar-tool-table-title' => 'Inserare tabel',
 	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Linii',
 	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Coloane',
-	'wikieditor-toolbar-tool-table-dimensions-header' => 'Adăugaţi titlu coloană acum',
-	'wikieditor-toolbar-tool-table-wikitable' => 'Sil cu contur',
-	'wikieditor-toolbar-tool-table-sortable' => 'Faceţi tabelul sortabil',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'Adăugare rând pentru titlu de coloană',
+	'wikieditor-toolbar-tool-table-wikitable' => 'Stil cu contur',
+	'wikieditor-toolbar-tool-table-sortable' => 'Transformă în tabel sortabil',
 	'wikieditor-toolbar-tool-table-example' => 'Exemplu',
 	'wikieditor-toolbar-tool-table-preview' => 'Previzualizare',
-	'wikieditor-toolbar-tool-table-insert' => 'Inserare',
+	'wikieditor-toolbar-tool-table-insert' => 'Inserează',
 	'wikieditor-toolbar-tool-table-cancel' => 'Revocare',
 	'wikieditor-toolbar-tool-table-toomany' => 'Inserarea unui tabel cu mai mult de $1 celule nu este posibilă cu această unealtă.',
-	'wikieditor-toolbar-tool-table-invalidnumber' => 'Nu aţi introdus un număr valabil de rânduri sau coloane.',
-	'wikieditor-toolbar-tool-table-zero' => 'Nu puteţi introduce un tabel cu zero rânduri sau coloane.',
-	'wikieditor-toolbar-tool-replace' => 'Căutare şi înlocuire',
-	'wikieditor-toolbar-tool-replace-title' => 'Căutare şi înlocuire',
-	'wikieditor-toolbar-tool-replace-search' => 'Cautare:',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'Nu ați introdus un număr valabil de rânduri sau coloane.',
+	'wikieditor-toolbar-tool-table-zero' => 'Nu puteți introduce un tabel cu zero rânduri sau coloane.',
+	'wikieditor-toolbar-tool-replace' => 'Căutare și înlocuire',
+	'wikieditor-toolbar-tool-replace-title' => 'Căutare și înlocuire',
+	'wikieditor-toolbar-tool-replace-search' => 'De căutat:',
 	'wikieditor-toolbar-tool-replace-replace' => 'Înlocuire cu:',
-	'wikieditor-toolbar-tool-replace-case' => 'Înlocuieşte doar dacă este identic',
+	'wikieditor-toolbar-tool-replace-case' => 'Înlocuiește doar dacă este identic',
 	'wikieditor-toolbar-tool-replace-regex' => 'Tratează sintagma ca o expresie regulată',
-	'wikieditor-toolbar-tool-replace-button-findnext' => 'Găseşte următorul',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Înlocuieşte următorul',
-	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Înlocuieşte toate',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'Găsește următorul',
+	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Înlocuiește următorul',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Înlocuiește toate',
 	'wikieditor-toolbar-tool-replace-close' => 'Revocare',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Căutarea dumneavoastră nu a generat niciun rezultat.',
-	'wikieditor-toolbar-tool-replace-success' => '$1 înlocuire(i) efectuate.',
-	'wikieditor-toolbar-tool-replace-emptysearch' => 'Nu aţi introdus niciun cuvânt după care să căutaţi',
+	'wikieditor-toolbar-tool-replace-success' => '$1 înlocuire(i) efectuată(e).',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'Nu ați introdus niciun cuvânt după care să căutați',
 	'wikieditor-toolbar-tool-replace-invalidregex' => 'Expresia regulată introdusă nu este corectă: $1',
 	'wikieditor-toolbar-section-characters' => 'Caractere speciale',
-	'wikieditor-toolbar-characters-page-latin' => 'Latin',
-	'wikieditor-toolbar-characters-page-latinextended' => 'Latin extins',
+	'wikieditor-toolbar-characters-page-latin' => 'Latină',
+	'wikieditor-toolbar-characters-page-latinextended' => 'Latină extinsă',
 	'wikieditor-toolbar-characters-page-ipa' => 'AFI',
 	'wikieditor-toolbar-characters-page-symbols' => 'Simboluri',
-	'wikieditor-toolbar-characters-page-greek' => 'Grecesc',
-	'wikieditor-toolbar-characters-page-cyrillic' => 'Chirilic',
-	'wikieditor-toolbar-characters-page-arabic' => 'Arabic',
-	'wikieditor-toolbar-characters-page-hebrew' => 'Ebraic',
+	'wikieditor-toolbar-characters-page-greek' => 'Greacă',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'Chirilică',
+	'wikieditor-toolbar-characters-page-arabic' => 'Arabă',
+	'wikieditor-toolbar-characters-page-hebrew' => 'Ebraică',
+	'wikieditor-toolbar-characters-page-bangla' => 'Bengaleză',
 	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
 	'wikieditor-toolbar-characters-page-sinhala' => 'Sinhala',
 	'wikieditor-toolbar-characters-page-gujarati' => 'Gujarati',
 	'wikieditor-toolbar-section-help' => 'Ajutor',
 	'wikieditor-toolbar-help-heading-description' => 'Descriere',
-	'wikieditor-toolbar-help-heading-syntax' => 'Ceea ce scrieţi',
-	'wikieditor-toolbar-help-heading-result' => 'Ceea ce obţineţi',
+	'wikieditor-toolbar-help-heading-syntax' => 'Ceea ce scrieți',
+	'wikieditor-toolbar-help-heading-result' => 'Ceea ce obțineți',
 	'wikieditor-toolbar-help-page-format' => 'Formatare',
 	'wikieditor-toolbar-help-page-link' => 'Legături',
 	'wikieditor-toolbar-help-page-heading' => 'Titluri',
 	'wikieditor-toolbar-help-page-list' => 'Liste',
-	'wikieditor-toolbar-help-page-file' => 'Fişiere',
-	'wikieditor-toolbar-help-page-reference' => 'Referinţe',
-	'wikieditor-toolbar-help-page-discussion' => 'Discuţie',
+	'wikieditor-toolbar-help-page-file' => 'Fișiere',
+	'wikieditor-toolbar-help-page-reference' => 'Referințe',
+	'wikieditor-toolbar-help-page-discussion' => 'Discuție',
 	'wikieditor-toolbar-help-content-italic-description' => 'Cursiv',
 	'wikieditor-toolbar-help-content-italic-syntax' => "''Text cursiv''",
 	'wikieditor-toolbar-help-content-italic-result' => '<em>Text cursiv</em>',
 	'wikieditor-toolbar-help-content-bold-description' => 'Aldin',
 	'wikieditor-toolbar-help-content-bold-syntax' => "'''Text aldin'''",
 	'wikieditor-toolbar-help-content-bold-result' => '<strong>Text aldin</strong>',
-	'wikieditor-toolbar-help-content-bolditalic-description' => 'Aldin &amp; cursiv',
-	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Aldin &amp; cursiv'''''",
-	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>Text aldin &amp; cursiv</em></strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'Aldin și cursiv',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Text aldin și cursiv'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>Text aldin și cursiv</em></strong>',
 	'wikieditor-toolbar-help-content-ilink-description' => 'Legătură internă',
 	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Titlul paginii|Titlul legăturii]]<br />[[Titlul paginii]]',
 	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Titlul legăturii</a><br /><a href='#'>Titlul paginii</a>",
@@ -11968,23 +12409,23 @@
 	'wikieditor-toolbar-help-content-olist-description' => 'Listă ordonată',
 	'wikieditor-toolbar-help-content-olist-syntax' => '# Item<br /># Item',
 	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Item</li><li>Item</li></ol>',
-	'wikieditor-toolbar-help-content-file-description' => 'Fişier inserat',
+	'wikieditor-toolbar-help-content-file-description' => 'Fișier inserat',
 	'wikieditor-toolbar-help-content-file-syntax' => '[[{{ns:file}}:Exemplu.png|thumb|Descrierea imaginii]]',
-	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Descrierea imaginii' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/UsabilityInitiative/images/wikiEditor/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Măreşte' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Descrierea imaginii</div></div>",
-	'wikieditor-toolbar-help-content-reference-description' => 'Referinţă',
-	'wikieditor-toolbar-help-content-reference-syntax' => 'Textul paginii.&lt;ref name="test"&gt;[http://www.example.org Textul legăturii], text adiţional.&lt;/ref&gt;',
+	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Descrierea imaginii' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/UsabilityInitiative/images/wikiEditor/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Mărește' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Descrierea imaginii</div></div>",
+	'wikieditor-toolbar-help-content-reference-description' => 'Referință',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'Textul paginii.&lt;ref name="test"&gt;[http://www.example.org Textul legăturii], text adițional.&lt;/ref&gt;',
 	'wikieditor-toolbar-help-content-reference-result' => "Textul paginii.<sup><a href='#'>[1]</a></sup>",
-	'wikieditor-toolbar-help-content-rereference-description' => 'Utilizare suplimentară a aceleiaşi referinţe',
+	'wikieditor-toolbar-help-content-rereference-description' => 'Utilizare suplimentară a aceleiași referințe',
 	'wikieditor-toolbar-help-content-rereference-result' => "Textul paginii.<sup><a href='#'>[1]</a></sup>",
-	'wikieditor-toolbar-help-content-showreferences-description' => 'Arată referinţele',
-	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Textul legăturii</a>, text adiţional.</li></ol>",
-	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Semnătură cu dată',
-	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Nume de utilizator</a> (<a href='#' title='{{#special:mytalk}}'>talk</a>) 15:54, 10 June 2009 (UTC)",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'Afișare referințe',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Textul legăturii</a>, text adițional.</li></ol>",
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Semnătură datată',
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Nume de utilizator</a> (<a href='#' title='{{#special:mytalk}}'>discuție</a>) 15:54, 10 June 2009 (UTC)",
 	'wikieditor-toolbar-help-content-signature-description' => 'Semnătură',
-	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>Nume de utilizator</a> (<a href='#' title='{{#special:mytalk}}'>talk</a>)",
+	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>Nume de utilizator</a> (<a href='#' title='{{#special:mytalk}}'>discuție</a>)",
 	'wikieditor-toolbar-help-content-indent-description' => 'Indentare',
 	'wikieditor-toolbar-help-content-indent-syntax' => 'Text normal<br />:Text indentat<br />::Text indentat',
-	'wikieditor-toolbar-help-content-indent-result' => 'Text normal<dl><dd>Text indented<dl><dd>Text indented</dd></dl></dd></dl>',
+	'wikieditor-toolbar-help-content-indent-result' => 'Text normal<dl><dd>Text indentat<dl><dd>Text indentat</dd></dl></dd></dl>',
 ); /** Tarandíne (Tarandíne)
@@ -12581,15 +13022,35 @@
 ); /** Sardinian (Sardu)
+ * @author Andria
  * @author Cedric31
  */
 $messages['sc'] = array(
-	'wikieditor-toolbar-tool-heading-1' => 'Livèddu 1',
-	'wikieditor-toolbar-tool-heading-2' => 'Livèddu 2',
-	'wikieditor-toolbar-tool-heading-3' => 'Livèddu 3',
-	'wikieditor-toolbar-tool-heading-4' => 'Livèddu 4',
-	'wikieditor-toolbar-tool-heading-5' => 'Livèddu 5',
+	'wikieditor-toolbar-tool-bold' => 'Grassu',
+	'wikieditor-toolbar-tool-bold-example' => 'Testu grassu',
+	'wikieditor-toolbar-tool-italic' => 'Corsivu',
+	'wikieditor-toolbar-tool-italic-example' => 'Testu corsivu',
+	'wikieditor-toolbar-tool-heading-1' => 'Livellu 1',
+	'wikieditor-toolbar-tool-heading-2' => 'Livellu 2',
+	'wikieditor-toolbar-tool-heading-3' => 'Livellu 3',
+	'wikieditor-toolbar-tool-heading-4' => 'Livellu 4',
+	'wikieditor-toolbar-tool-heading-5' => 'Livellu 5',
 	'wikieditor-toolbar-tool-heading-example' => 'Testu de su tìtulu',
+	'wikieditor-toolbar-help-content-heading1-syntax' => '= Tìtulu de sa setzione =',
+	'wikieditor-toolbar-help-content-heading1-result' => '<h1>Tìtulu de sa setzione</h1>',
+	'wikieditor-toolbar-help-content-heading2-description' => 'Su de 2 livellu de intestada',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== Tìtulu de sa setzione ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>Tìtulu de sa setzione</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'Su de 3 livellu de intestada',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Tìtulu de sa setzione ===',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>Tìtulu de sa setzione</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => 'Su de 4 livellu de intestada',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Tìtulu de sa setzione ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4>Tìtulu de sa setzione</h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => 'Su de 5 livellu de intestada',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Tìtulu de sa setzione =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Tìtulu de sa setzione</h5>',
+	'wikieditor-toolbar-help-content-signature-description' => 'Firma',
 ); /** Sicilian (Sicilianu)
@@ -12615,6 +13076,7 @@
 /** Sinhala (සිංහල)
  * @author Calcey
  * @author චතුනි අලහප්පෙරුම
+ * @author බිඟුවා
  */
 $messages['si'] = array(
 	'wikieditor-toolbar' => 'සංස්කරණ මෙවලම් තීරුව',
@@ -12656,6 +13118,8 @@
 	'wikieditor-toolbar-tool-file-example' => 'උදාහරණ.jpg',
 	'wikieditor-toolbar-tool-reference' => 'යොමුව',
 	'wikieditor-toolbar-tool-reference-example' => 'මෙහි පාද සටහන් පෙළක් ඇතුල් කරන්න',
+	'wikieditor-toolbar-tool-reference-cancel' => 'අත් හරින්න',
+	'wikieditor-toolbar-tool-reference-insert' => 'ඇතුල් කරන්න',
 	'wikieditor-toolbar-tool-signature' => 'අත්සන හා කාල මුද්‍රාව',
 	'wikieditor-toolbar-section-advanced' => 'දියුණු කළ',
 	'wikieditor-toolbar-tool-heading' => 'ශීර්ෂය',
@@ -12672,6 +13136,9 @@
 	'wikieditor-toolbar-tool-olist-example' => 'අංකිත ලැයිස්තු අයිතමය',
 	'wikieditor-toolbar-tool-indent' => 'ඉන්ඩෙන්ට් කිරීම',
 	'wikieditor-toolbar-tool-indent-example' => 'ඉන්ඩෙන්ට් කළ රේඛාව',
+	'wikieditor-toolbar-tool-nowiki' => 'විකි ආකෘතිකරණය නොසලකාහරින්න',
+	'wikieditor-toolbar-tool-nowiki-example' => 'ආකෘතිකරණය-නොකල පෙළ මෙහි රුවන්න',
+	'wikieditor-toolbar-tool-redirect' => 'යළියොමුව',
 	'wikieditor-toolbar-tool-big' => 'විශාල',
 	'wikieditor-toolbar-tool-big-example' => 'විශාල පෙළ',
 	'wikieditor-toolbar-tool-small' => 'කුඩා',
@@ -12849,6 +13316,9 @@
 	'wikieditor-toolbar-tool-file-example' => 'Príklad.jpg',
 	'wikieditor-toolbar-tool-reference' => 'Referencia',
 	'wikieditor-toolbar-tool-reference-example' => 'Sem vložte text poznámky pod čiarou',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Zrušiť',
+	'wikieditor-toolbar-tool-reference-title' => 'Vložiť referenciu',
+	'wikieditor-toolbar-tool-reference-insert' => 'Vložiť',
 	'wikieditor-toolbar-tool-signature' => 'Podpis a čas',
 	'wikieditor-toolbar-section-advanced' => 'Pokročilé',
 	'wikieditor-toolbar-tool-heading' => 'Nadpis',
@@ -13152,7 +13622,7 @@
 	'wikieditor-toolbar-help-content-bold-syntax' => "'''Krepko besedilo'''",
 	'wikieditor-toolbar-help-content-bold-result' => '<strong>Krepko besedilo</strong>',
 	'wikieditor-toolbar-help-content-bolditalic-description' => 'Krepko in ležeče',
-	'wikieditor-toolbar-help-content-bolditalic-syntax' => '&#39;&#39;&#39;&#39;&#39;Krepko in ležeče besedilo&#39;&#39;&#39;&#39;&#39;',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Krepko in ležeče besedilo'''''",
 	'wikieditor-toolbar-help-content-bolditalic-result' => '<em><strong>Krepko in ležeče besedilo</strong></em>',
 	'wikieditor-toolbar-help-content-ilink-description' => 'Notranja povezava',
 	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Naslov strani|Oznaka strani]]<br />[[Naslov strani]]',
@@ -13218,17 +13688,25 @@
 	'wikieditor-toolbar-tool-link-title' => 'Убаци везу',
 	'wikieditor-toolbar-tool-link-int-target' => 'Наслов стране:',
 	'wikieditor-toolbar-tool-link-int-text' => 'Текст везе:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Текст за приказ',
 	'wikieditor-toolbar-tool-link-ext-target' => 'Путања везе (УРЛ):',
 	'wikieditor-toolbar-tool-link-ext-text' => 'Текст везе:',
+	'wikieditor-toolbar-tool-link-insert' => 'Убаци везу',
 	'wikieditor-toolbar-tool-link-cancel' => 'Прекини',
 	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'Страница постоји',
 	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'Страница не постоји',
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Погрешан наслов',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Спољашња веза',
 	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Провера постојања странице...',
 	'wikieditor-toolbar-tool-link-int-invalid' => 'Наслов који сте изабрали није валидан',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Унутрашња веза',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Спољашња веза',
 	'wikieditor-toolbar-tool-file-example' => 'Primer.jpg',
 	'wikieditor-toolbar-tool-reference' => 'Референца',
 	'wikieditor-toolbar-tool-reference-example' => 'Унесите текст фусноте овде',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Поништи',
+	'wikieditor-toolbar-tool-reference-title' => 'Убаци референцу',
+	'wikieditor-toolbar-tool-reference-insert' => 'Убаци',
 	'wikieditor-toolbar-section-advanced' => 'Напредно',
 	'wikieditor-toolbar-tool-heading' => 'Одељак',
 	'wikieditor-toolbar-tool-heading-1' => 'Ниво 1',
@@ -13238,6 +13716,7 @@
 	'wikieditor-toolbar-tool-heading-5' => 'Ниво 5',
 	'wikieditor-toolbar-tool-heading-example' => 'Текст одељка',
 	'wikieditor-toolbar-group-format' => 'Списак',
+	'wikieditor-toolbar-tool-redirect' => 'Преусмерење',
 	'wikieditor-toolbar-tool-big' => 'Велик',
 	'wikieditor-toolbar-tool-big-example' => 'Велик текст',
 	'wikieditor-toolbar-tool-small' => 'Мали',
@@ -13271,8 +13750,16 @@
 	'wikieditor-toolbar-tool-table-preview' => 'Преглед',
 	'wikieditor-toolbar-tool-table-insert' => 'Убаци',
 	'wikieditor-toolbar-tool-table-cancel' => 'Поништи',
+	'wikieditor-toolbar-tool-replace' => 'Тражи и замени',
+	'wikieditor-toolbar-tool-replace-title' => 'Тражи и замени',
+	'wikieditor-toolbar-tool-replace-search' => 'Тражи:',
+	'wikieditor-toolbar-tool-replace-replace' => 'Замени са:',
+	'wikieditor-toolbar-tool-replace-case' => 'Пази на величину слова',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'Нађи следеће',
+	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Замени следеће',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Замени све',
 	'wikieditor-toolbar-tool-replace-close' => 'одустани',
+	'wikieditor-toolbar-tool-replace-success' => 'Направљених замена: $1.',
 	'wikieditor-toolbar-tool-replace-emptysearch' => 'Нисте унели ништа за претрагу.',
 	'wikieditor-toolbar-section-characters' => 'Посебни карактери',
 	'wikieditor-toolbar-characters-page-latin' => 'латиница',
@@ -13282,6 +13769,8 @@
 	'wikieditor-toolbar-characters-page-greek' => 'грчки',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'ћирилица',
 	'wikieditor-toolbar-characters-page-arabic' => 'арапски',
+	'wikieditor-toolbar-characters-page-hebrew' => 'јеврејско',
+	'wikieditor-toolbar-characters-page-bangla' => 'Бангла',
 	'wikieditor-toolbar-characters-page-telugu' => 'телугу',
 	'wikieditor-toolbar-section-help' => 'Помоћ',
 	'wikieditor-toolbar-help-heading-description' => 'Опис',
@@ -13296,6 +13785,11 @@
 	'wikieditor-toolbar-help-page-discussion' => 'Разговор',
 	'wikieditor-toolbar-help-content-italic-description' => 'Курзив',
 	'wikieditor-toolbar-help-content-italic-syntax' => "''Курзиван текст''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>Текст у курзиву</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'Подебљано',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''Подебљани текст'''",
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'Подебљано &amp; искошено',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Подебљани &amp; искошени текст'''''",
 	'wikieditor-toolbar-help-content-xlink-description' => 'Спољашња веза',
 	'wikieditor-toolbar-help-content-heading1-description' => 'одељак првог нивоа',
 	'wikieditor-toolbar-help-content-heading1-syntax' => '= Наслов одељка =',
@@ -13312,6 +13806,8 @@
 	'wikieditor-toolbar-help-content-heading5-description' => 'Одељак петог нивоа',
 	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Наслов одељка =====',
 	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Наслов одељка</h5>',
+	'wikieditor-toolbar-help-content-reference-description' => 'Референце',
+	'wikieditor-toolbar-help-content-showreferences-description' => 'Прикажи референце',
 	'wikieditor-toolbar-help-content-signature-description' => 'Потпис',
 );@@ -14401,6 +14897,207 @@
 	'wikieditor-toolbar-help-content-indent-result' => 'Adaty tekst<dl><dd>Boş ýerli tekst<dl><dd>Boş ýerli tekst</dd></dl></dd></dl>',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'wikieditor-toolbar' => 'Kahong kasangkapan na pamatnugot',
+	'wikieditor-toolbar-desc' => 'Kahong kasangkapan na pamatnugot na may pinainam na pagkanagagamit',
+	'wikieditor-toolbar-preference' => 'Paganahin ang pinainam na kahong kasangkapang pamatnugot',
+	'wikieditor-toolbar-dialogs-preference' => 'Paganahin ang mga salitaan para sa pagsisingit ng mga kawing, mga tabla at marami pa',
+	'wikieditor-toolbar-loading' => 'Ikinakarga...',
+	'wikieditor-toolbar-tool-bold' => 'Makapal',
+	'wikieditor-toolbar-tool-bold-example' => 'Makapal na panitik',
+	'wikieditor-toolbar-tool-italic' => 'Nakapahilis',
+	'wikieditor-toolbar-tool-italic-example' => 'Nakapahilis na panitik',
+	'wikieditor-toolbar-tool-ilink' => 'Panloob na kawing',
+	'wikieditor-toolbar-tool-ilink-example' => 'Pamagat ng kawing',
+	'wikieditor-toolbar-tool-xlink' => 'Panlabas na kawing (tandaan ang unlaping http://)',
+	'wikieditor-toolbar-tool-xlink-example' => 'pamagat ng kawing na http://www.halimbawa.com',
+	'wikieditor-toolbar-tool-link' => 'Kawing',
+	'wikieditor-toolbar-tool-link-title' => 'Magsingit ng kawing',
+	'wikieditor-toolbar-tool-link-int' => 'Papunta sa isang pahina ng wiki',
+	'wikieditor-toolbar-tool-link-int-target' => 'Puntiryang pahina o URL:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Pamagat ng pahina o URL',
+	'wikieditor-toolbar-tool-link-int-text' => 'Ipapakitang teksto:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Ipapakitang teksto',
+	'wikieditor-toolbar-tool-link-ext' => 'Papunta sa isang panlabas na pahina ng web',
+	'wikieditor-toolbar-tool-link-ext-target' => 'Kawing ng URL:',
+	'wikieditor-toolbar-tool-link-ext-text' => 'Kawing ng teksto:',
+	'wikieditor-toolbar-tool-link-insert' => 'Isingit ang kawing',
+	'wikieditor-toolbar-tool-link-cancel' => 'Huwag ituloy',
+	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'Umiiral na ang pahina',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'Hindi pa umiiral ang pahina',
+	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Hindi tanggap na pamagat',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Kawing panlabas',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Sinusuri ang pag-iral ng pahina...',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'Hindi tanggap ang tinukoy mong pamagat.',
+	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'Tila inilaan ang tinukoy mong URL bilang isang kawing sa ibang pahina ng wiki.  Nais mo bang gawin itong isang kawing na panloob?',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Kawing panloob',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Kawing panlabas',
+	'wikieditor-toolbar-tool-link-empty' => 'Hindi ka naglagay ng anumang kakawingan.',
+	'wikieditor-toolbar-tool-file' => 'Talaksang nakabaon',
+	'wikieditor-toolbar-tool-file-example' => 'Halimbawa.jpg',
+	'wikieditor-toolbar-tool-reference' => 'Sanggunian',
+	'wikieditor-toolbar-tool-reference-example' => 'Isingit dito ang teksto ng talababa',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Huwag ituloy',
+	'wikieditor-toolbar-tool-reference-title' => 'Isingit ang sanggunian',
+	'wikieditor-toolbar-tool-reference-insert' => 'Isingit',
+	'wikieditor-toolbar-tool-reference-text' => 'Teksto ng sanggunian',
+	'wikieditor-toolbar-tool-signature' => 'Lagda at tatak ng oras',
+	'wikieditor-toolbar-section-advanced' => 'Mas masulong',
+	'wikieditor-toolbar-tool-heading' => 'Paulo',
+	'wikieditor-toolbar-tool-heading-1' => 'Antas 1',
+	'wikieditor-toolbar-tool-heading-2' => 'Antas 2',
+	'wikieditor-toolbar-tool-heading-3' => 'Antas 3',
+	'wikieditor-toolbar-tool-heading-4' => 'Antas 4',
+	'wikieditor-toolbar-tool-heading-5' => 'Antas 5',
+	'wikieditor-toolbar-tool-heading-example' => 'Teksto ng paulo',
+	'wikieditor-toolbar-group-format' => 'Anyo',
+	'wikieditor-toolbar-tool-ulist' => 'Talaang nakapunglo',
+	'wikieditor-toolbar-tool-ulist-example' => 'Bagay sa talaang nakapunglo',
+	'wikieditor-toolbar-tool-olist' => 'Talaang may bilang',
+	'wikieditor-toolbar-tool-olist-example' => 'Binilangang bagay sa talaan',
+	'wikieditor-toolbar-tool-indent' => 'Kupi',
+	'wikieditor-toolbar-tool-indent-example' => 'Guhit na inurong',
+	'wikieditor-toolbar-tool-nowiki' => 'Walang ayos na pangwiki',
+	'wikieditor-toolbar-tool-nowiki-example' => 'Isingit dito ang tekstong hindi nakaayos',
+	'wikieditor-toolbar-tool-redirect' => 'Palitan ang pupuntahan',
+	'wikieditor-toolbar-tool-redirect-example' => 'Pangalan ng puntiryang pahina',
+	'wikieditor-toolbar-tool-big' => 'Malaki',
+	'wikieditor-toolbar-tool-big-example' => 'Malaking teksto',
+	'wikieditor-toolbar-tool-small' => 'Maliit',
+	'wikieditor-toolbar-tool-small-example' => 'Maliit na teksto',
+	'wikieditor-toolbar-tool-superscript' => 'Nakataas na panitik',
+	'wikieditor-toolbar-tool-superscript-example' => 'Teksto ng nakataas na panitik',
+	'wikieditor-toolbar-tool-subscript' => 'Nakababang panitik',
+	'wikieditor-toolbar-tool-subscript-example' => 'Teksto ng nakababang panitik',
+	'wikieditor-toolbar-group-insert' => 'Isingit',
+	'wikieditor-toolbar-tool-gallery' => 'Tipunan ng larawan',
+	'wikieditor-toolbar-tool-gallery-example' => '{{ns:file}}:Halimbawa.jpg|Kapsyon1
+{{ns:file}}:Halimbawa.jpg|Kapsyon2',
+	'wikieditor-toolbar-tool-newline' => 'Bagong guhit',
+	'wikieditor-toolbar-tool-table' => 'Talahanayan',
+	'wikieditor-toolbar-tool-table-example-old' => '
+! paulo 1
+! paulo 2
+! paulo 3
+|-
+| pahalang na hanay 1, sihay 1
+| pahalang na hanay  1, sihay 2
+| pahalang na hanay  1, sihay 3
+|-
+| pahalang na hanay  2, sihay 1
+| pahalang na hanay 2, sihay 2
+| pahalang na hanay 2, sihay 3',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'Teskto ng sihay',
+	'wikieditor-toolbar-tool-table-example-header' => 'Teksto ng paulo',
+	'wikieditor-toolbar-tool-table-title' => 'Isingit ang talahanayan',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Pahalang na mga hanay',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Pababang mga hanay',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'Idagdag ang pahalang na hanay ng paulo',
+	'wikieditor-toolbar-tool-table-wikitable' => 'Estilong may mga hangganan',
+	'wikieditor-toolbar-tool-table-sortable' => 'Gawing mapagpipilian ang talahanayan',
+	'wikieditor-toolbar-tool-table-example' => 'Halimbawa',
+	'wikieditor-toolbar-tool-table-preview' => 'Paunang tingin',
+	'wikieditor-toolbar-tool-table-insert' => 'Isingit',
+	'wikieditor-toolbar-tool-table-cancel' => 'Huwag ituloy',
+	'wikieditor-toolbar-tool-table-toomany' => 'Hindi maaari sa salitaang ganito ang pagsisingit ng isang talahanayang may mahigit sa $1 na mga sihay.',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'Hindi ka nagpasok ng isang tanggap na bilang ng mga hanay na pahalang o pababa.',
+	'wikieditor-toolbar-tool-table-zero' => 'Hindi ka makapagsisingit ng isang talahanayang walang mga hanay na pahalang o pababa.',
+	'wikieditor-toolbar-tool-replace' => 'Maghanap at palitan',
+	'wikieditor-toolbar-tool-replace-title' => 'Maghanap at palitan',
+	'wikieditor-toolbar-tool-replace-search' => 'Hanapin ang:',
+	'wikieditor-toolbar-tool-replace-replace' => 'Palitan ng:',
+	'wikieditor-toolbar-tool-replace-case' => 'Itugma sa uri ng sukat ng titik',
+	'wikieditor-toolbar-tool-replace-regex' => 'Ituring ang bagting ng paghahanap bilang isang pangkaraniwang pananalita',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'Susunod na hahanapin',
+	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Susunod na papalitan',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Palitang lahat',
+	'wikieditor-toolbar-tool-replace-close' => 'Huwag ituloy',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'Hindi tumugma sa anuman ang paghahanap mo.',
+	'wikieditor-toolbar-tool-replace-success' => '$1 nagawang (mga) pagpapalit.',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'Hindi ka naglagay ng anumang hahanapin.',
+	'wikieditor-toolbar-tool-replace-invalidregex' => 'Hindi tanggap ang inilagay mong pangkaraniwang pananalita: $1',
+	'wikieditor-toolbar-section-characters' => 'Natatanging mga panitik',
+	'wikieditor-toolbar-characters-page-latin' => 'Latin',
+	'wikieditor-toolbar-characters-page-latinextended' => 'Pinalawig na Latin',
+	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
+	'wikieditor-toolbar-characters-page-symbols' => 'Mga sagisag',
+	'wikieditor-toolbar-characters-page-greek' => 'Griyego',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'Siriliko',
+	'wikieditor-toolbar-characters-page-arabic' => 'Arabe',
+	'wikieditor-toolbar-characters-page-hebrew' => 'Hebreo',
+	'wikieditor-toolbar-characters-page-bangla' => 'Bangla',
+	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
+	'wikieditor-toolbar-characters-page-sinhala' => 'Sinhala',
+	'wikieditor-toolbar-characters-page-gujarati' => 'Guharati',
+	'wikieditor-toolbar-section-help' => 'Tulong',
+	'wikieditor-toolbar-help-heading-description' => 'Paglalarawan',
+	'wikieditor-toolbar-help-heading-syntax' => 'Kung ano ang iminakinilya mo',
+	'wikieditor-toolbar-help-heading-result' => 'Kung ano ang nakuha mo',
+	'wikieditor-toolbar-help-page-format' => 'Pagkakaayos',
+	'wikieditor-toolbar-help-page-link' => 'Mga kawing',
+	'wikieditor-toolbar-help-page-heading' => 'Mga paulo',
+	'wikieditor-toolbar-help-page-list' => 'Mga talaan',
+	'wikieditor-toolbar-help-page-file' => 'Mga talaksan',
+	'wikieditor-toolbar-help-page-reference' => 'Mga sanggunian',
+	'wikieditor-toolbar-help-page-discussion' => 'Mga talakayan',
+	'wikieditor-toolbar-help-content-italic-description' => 'Nakapahilis',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''Tekstong nakapahilis''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>Tekstong nakapahilis</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'Makapal',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''Tekstong makapal'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>Tekstong makapal</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'Makapal &amp; nakapahilis',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Tekstong makapal &amp; nakapahilis'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => 'strong><em>Tekstong makapal &amp; nakapahilis</em></strong>',
+	'wikieditor-toolbar-help-content-ilink-description' => 'Kawing panloob',
+	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Page title|Tatak ng kawing]]<br />[[Pamagat ng pahina]]',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Tatak ng kawing</a><br /><a href='#'>Pamagat ng pahina</a>",
+	'wikieditor-toolbar-help-content-xlink-description' => 'Kawing panlabas',
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.halimbawa.org Link label]<br />[http://www.halimbawa.org]<br />http://www.halimbawa.org',
+	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Tatak ng kawing</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.halimbawa.org</a>",
+	'wikieditor-toolbar-help-content-heading1-description' => 'Paulo ng unang antas',
+	'wikieditor-toolbar-help-content-heading1-syntax' => '= Teksto ng paulo =',
+	'wikieditor-toolbar-help-content-heading1-result' => '<h1>Teksto ng paulo</h1>',
+	'wikieditor-toolbar-help-content-heading2-description' => 'Paulo ng pangalawang antas',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== Teksto ng paulo ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>Teksto ng paulo</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'Antas ng pangatlong antas',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Teksto ng paulo ===',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>Teksto ng paulo</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => 'Paulo ng pang-apat na antas',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Teksto ng paulo ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4> Teksto ng paulo </h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => 'Paulo ng panlimang antas',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Teksto ng paulo =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Teksto ng paulo</h5>',
+	'wikieditor-toolbar-help-content-ulist-description' => 'Talaang napungluan',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* Bagay sa talaan<br />* Bagay sa talaan',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>Bagay sa talaan</li><li>Bagay sa talaan</li></ul>',
+	'wikieditor-toolbar-help-content-olist-description' => 'Nabilangang talaan',
+	'wikieditor-toolbar-help-content-olist-syntax' => '# Bagay sa talaan<br /># Bagay sa talaan',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Bagay sa talaan</li><li>Bagay sa talaan</li></ol>',
+	'wikieditor-toolbar-help-content-file-description' => 'Talaksang nakabaon',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[{{ns:file}}:Halimbawa.png|kagyat|Teksto ng kapsyon]]',
+	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Caption text' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/UsabilityInitiative/images/wikiEditor/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Enlarge' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Tekstong nagpapaliwanag</div></div>",
+	'wikieditor-toolbar-help-content-reference-description' => 'Sanggunian',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'Taksto ng pahina.&lt;ref name="test"&gt;[http://www.halimbawa.org Teksto ng kawing], karagdagang teksto.&lt;/ref&gt;',
+	'wikieditor-toolbar-help-content-reference-result' => "Teksto ng pahina.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'Karagdagang paggamit na gayun ding sanggunian',
+	'wikieditor-toolbar-help-content-rereference-result' => "Teksto ng pahina.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'Ipakita ang mga sanggunian',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.halimbawa.org' class='external text' href='#'>Teksto ng kawing</a>, karagdagang teksto.</li></ol>",
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Lagdang may tatak ng oras',
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Pangalan ng tagagamit</a> (<a href='#' title='{{#special:mytalk}}'>talk</a>) 15:54, 10 Hunyo 2009 (UTC)",
+	'wikieditor-toolbar-help-content-signature-description' => 'Lagda',
+	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>Pangalan ng tagagamit</a> (<a href='#' title='{{#special:mytalk}}'>usapan</a>)",
+	'wikieditor-toolbar-help-content-indent-description' => 'Iurong',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'Karaniwang teksto<br />:Tekstong nakaurong<br />::Tekstong nakaurong',
+	'wikieditor-toolbar-help-content-indent-result' => 'Karaniwang teksto<dl><dd>Tekstong nakaurong<dl><dd>Tekstong nakaurong</dd></dl></dd></dl>',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  * @author Vito Genovese
@@ -15213,8 +15910,8 @@
 	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Tên trang|Văn bản liên kết]]<br />[[Tên trang]]',
 	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Văn bản liên kết</a><br /><a href='#'>Tên trang</a>",
 	'wikieditor-toolbar-help-content-xlink-description' => 'Liên kết ngoài',
-	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.vidu.org Văn bản liên kết]<br />[http://www.vidu.org]<br />http://www.vidu.org',
-	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Văn bản liên kết</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.vidu.org</a>",
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org Văn bản liên kết]<br />[http://www.example.org]<br />http://www.example.org',
+	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Văn bản liên kết</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.example.org</a>",
 	'wikieditor-toolbar-help-content-heading1-description' => 'Đề mục cấp 1',
 	'wikieditor-toolbar-help-content-heading1-syntax' => '= Câu đề mục =',
 	'wikieditor-toolbar-help-content-heading1-result' => '<h1>Câu đề mục</h1>',
@@ -15240,12 +15937,12 @@
 	'wikieditor-toolbar-help-content-file-syntax' => '[[{{ns:file}}:Ví dụ.png|thumb|Văn bản chú thích]]',
 	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Văn bản chú thích' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/UsabilityInitiative/images/wikiEditor/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Phóng lớn' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Văn bản chú thích</div></div>",
 	'wikieditor-toolbar-help-content-reference-description' => 'Tham khảo',
-	'wikieditor-toolbar-help-content-reference-syntax' => 'Nội dung trang&lt;ref name="thử"&gt;[http://www.vidu.org Văn bản liên kết], văn bản bổ sung.&lt;/ref&gt;.',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'Nội dung trang&lt;ref name="thử"&gt;[http://www.example.org Văn bản liên kết], văn bản bổ sung.&lt;/ref&gt;.',
 	'wikieditor-toolbar-help-content-reference-result' => "Nội dung trang<sup><a href='#'>[1]</a></sup>.",
 	'wikieditor-toolbar-help-content-rereference-description' => 'Sử dụng lại cùng chú thích',
 	'wikieditor-toolbar-help-content-rereference-result' => "Nội dung trang<sup><a href='#'>[1]</a></sup>.",
 	'wikieditor-toolbar-help-content-showreferences-description' => 'Liệt kê các chú thích',
-	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-th.E1.BB.AD-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.vidu.org' class='external text' href='#'>Văn bản liên kết</a>, văn bản bổ sung.</li></ol>",
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-th.E1.BB.AD-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Văn bản liên kết</a>, văn bản bổ sung.</li></ol>",
 	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Chữ ký có ngày',
 	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Tên đăng ký</a> (<a href='#' title='{{#special:mytalk}}'>thảo luận</a>) 15:54, ngày 10 tháng 6 năm 2009 (UTC)",
 	'wikieditor-toolbar-help-content-signature-description' => 'Chữ ký',
@@ -15395,6 +16092,9 @@
  */
 $messages['yi'] = array(
 	'wikieditor-toolbar' => 'רעדאקטירונג געצייג־פאס',
+	'wikieditor-toolbar-desc' => 'רעדאַקטירן בלאַט געצייגפאַס מיט פֿאַרברייטערטער ניצלעכקייט',
+	'wikieditor-toolbar-preference' => 'אַקטיווירן פֿאַרברייטערטן רעדאַקטירונג פאַס',
+	'wikieditor-toolbar-dialogs-preference' => 'דערמעגלעכן דיאָלאג קעסטלעך פֿאַר אַרײַנלייגן לינקען, טאַבעלעס און נאך',
 	'wikieditor-toolbar-loading' => 'אָנלאָדן...',
 	'wikieditor-toolbar-tool-bold' => 'דיק',
 	'wikieditor-toolbar-tool-bold-example' => 'דיקער טעקסט',
@@ -15479,8 +16179,12 @@
 | ריי 2, צעל 3',
 	'wikieditor-toolbar-tool-table-example-cell-text' => 'צעל טעקסט',
 	'wikieditor-toolbar-tool-table-example-header' => 'קעפל טעקסט',
+	'wikieditor-toolbar-tool-table-title' => 'צולייגן טאַבעלע',
 	'wikieditor-toolbar-tool-table-dimensions-rows' => 'שורות',
 	'wikieditor-toolbar-tool-table-dimensions-columns' => 'עמודים',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'צולייגן קעפל שורה',
+	'wikieditor-toolbar-tool-table-wikitable' => 'סטיל מיט ראמען',
+	'wikieditor-toolbar-tool-table-sortable' => 'מאַכן טאַבעלע סארטירבאַר',
 	'wikieditor-toolbar-tool-table-example' => 'צעל טעקסט',
 	'wikieditor-toolbar-tool-table-preview' => 'פֿאראויסשטעלונג',
 	'wikieditor-toolbar-tool-table-insert' => 'צולייגן',
@@ -15489,11 +16193,20 @@
 	'wikieditor-toolbar-tool-replace-title' => 'זוכן און בײַטן',
 	'wikieditor-toolbar-tool-replace-search' => 'זוכן פֿאַר:',
 	'wikieditor-toolbar-tool-replace-replace' => 'פֿאַרבייטן מיט:',
+	'wikieditor-toolbar-tool-replace-case' => 'צופאַסן גרויסע און קליינע אותיות',
+	'wikieditor-toolbar-tool-replace-regex' => 'באַהאַנדלען זוכקייטל ווי א רעגולערן אויסדרוק',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'זוכן נעקסטע',
 	'wikieditor-toolbar-tool-replace-button-replacenext' => 'אויסטוישן נעקסטע',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'אויסטוישן אלץ',
 	'wikieditor-toolbar-tool-replace-close' => 'אנולירן',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'אײַער זוך האט גאָרנישט צוגעפאַסט',
+	'wikieditor-toolbar-tool-replace-success' => '$1 אויסבײַט(ן) אַדורכגעפֿירט.',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'איר האט גאָרנישט ארײַנגעגעבן צום זוכן.',
+	'wikieditor-toolbar-tool-replace-invalidregex' => 'דער רעגולערער אויסדרוק וואָס איר האט אַרײַנגעגעבן איז אומגילטיק: $ 1',
+	'wikieditor-toolbar-section-characters' => 'ספעציעלע צייכנס',
 	'wikieditor-toolbar-characters-page-latin' => 'לאַטייניש',
+	'wikieditor-toolbar-characters-page-latinextended' => 'לאַטייַן פֿאַרברייטערט',
+	'wikieditor-toolbar-characters-page-ipa' => 'אינטערנאַציאנאלער פֿאנעטישער אלפֿאבעט (IPA)',
 	'wikieditor-toolbar-characters-page-symbols' => 'סימבאלן',
 	'wikieditor-toolbar-characters-page-greek' => 'גריכיש',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'ציריליש',
@@ -15505,18 +16218,34 @@
 	'wikieditor-toolbar-characters-page-gujarati' => 'גודזשאַראַטי',
 	'wikieditor-toolbar-section-help' => 'הילף',
 	'wikieditor-toolbar-help-heading-description' => 'באַשרײַבונג',
+	'wikieditor-toolbar-help-heading-syntax' => 'וואָס איר קלאַפט אַרײַן',
+	'wikieditor-toolbar-help-heading-result' => 'ווי עס זעט אויס',
+	'wikieditor-toolbar-help-page-format' => 'פֿאָרמאַטירונג',
+	'wikieditor-toolbar-help-page-link' => 'לינקען',
+	'wikieditor-toolbar-help-page-heading' => 'קעפלעך',
+	'wikieditor-toolbar-help-page-list' => 'ליסטעס',
 	'wikieditor-toolbar-help-page-file' => 'טעקעס',
 	'wikieditor-toolbar-help-page-reference' => 'רעפערענצן',
+	'wikieditor-toolbar-help-page-discussion' => 'שמועס',
+	'wikieditor-toolbar-help-content-italic-description' => 'קורסיוו',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''קורסיווער טעקסט''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>קורסיווער טעקסט</em>',
 	'wikieditor-toolbar-help-content-bold-description' => 'דיק',
 	'wikieditor-toolbar-help-content-ilink-description' => 'אינערלעכער לינק',
+	'wikieditor-toolbar-help-content-heading1-description' => 'ערשטער ניווא קעפל',
 	'wikieditor-toolbar-help-content-heading1-syntax' => '= קעפל טעקסט =',
 	'wikieditor-toolbar-help-content-heading1-result' => '<h1>קעפל טעקסט</h1>',
+	'wikieditor-toolbar-help-content-heading2-description' => 'צווייטער ניווא קעפל',
 	'wikieditor-toolbar-help-content-heading2-syntax' => '== קעפל טעקסט ==',
 	'wikieditor-toolbar-help-content-heading2-result' => '<h2>קעפל טעקסט</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'דריטער ניווא קעפל',
 	'wikieditor-toolbar-help-content-heading3-syntax' => '=== קעפל טעקסט ===',
 	'wikieditor-toolbar-help-content-heading3-result' => '<h3>קעפל טעקסט</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => 'פֿערטער ניווא קעפל',
 	'wikieditor-toolbar-help-content-heading4-syntax' => '==== קעפל טעקסט ====',
 	'wikieditor-toolbar-help-content-heading4-result' => '<h4>קעפל טעקסט</h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => 'פֿיפֿטער ניווא קעפל',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== קעפל טעקסט =====',
 	'wikieditor-toolbar-help-content-heading5-result' => '<h5>קעפל טעקסט</h5>',
 	'wikieditor-toolbar-help-content-ulist-syntax' => '* ליסטע איינצל<br />* ליסטע איינצל',
 	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>ליסטע איינצל</li><li>ליסטע איינצל</li></ul>',
@@ -15548,6 +16277,9 @@
 	'wikieditor-toolbar-tool-ilink-example' => '拎題',
 	'wikieditor-toolbar-tool-xlink' => '外連(記住 http:// 字頭)',
 	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com 連結標題',
+	'wikieditor-toolbar-tool-link' => '連結',
+	'wikieditor-toolbar-tool-link-title' => '插入連結',
+	'wikieditor-toolbar-tool-link-cancel' => '取消',
 	'wikieditor-toolbar-tool-file' => '結合標題',
 	'wikieditor-toolbar-tool-reference' => '參考',
 	'wikieditor-toolbar-tool-reference-example' => '響呢度插入底文字',
@@ -15603,6 +16335,9 @@
 | 行 2, 格 1
 | 行 2, 格 2
 | 行 2, 格 3',
+	'wikieditor-toolbar-tool-table-title' => '插入表格',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => '列',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => '行',
 	'wikieditor-toolbar-tool-table-example' => '-
 ! 表頭 1
 ! 表頭 2
@@ -15897,6 +16632,7 @@ /** Traditional Chinese (‪中文(繁體)‬)
  * @author Gaoxuewei
+ * @author Horacewai2
  * @author KaiesTse
  * @author Liangent
  * @author Wrightbus
@@ -15941,6 +16677,10 @@
 	'wikieditor-toolbar-tool-file-example' => 'Example.jpg',
 	'wikieditor-toolbar-tool-reference' => '參考',
 	'wikieditor-toolbar-tool-reference-example' => '在這裏插入頁底文字',
+	'wikieditor-toolbar-tool-reference-cancel' => '取消',
+	'wikieditor-toolbar-tool-reference-title' => '插入參考來源',
+	'wikieditor-toolbar-tool-reference-insert' => '插入',
+	'wikieditor-toolbar-tool-reference-text' => '參考文本',
 	'wikieditor-toolbar-tool-signature' => '簽名加時間截記',
 	'wikieditor-toolbar-section-advanced' => '進階',
 	'wikieditor-toolbar-tool-heading' => '標題',
@@ -15957,6 +16697,10 @@
 	'wikieditor-toolbar-tool-olist-example' => '數字列表項目',
 	'wikieditor-toolbar-tool-indent' => '縮進',
 	'wikieditor-toolbar-tool-indent-example' => '已縮進行',
+	'wikieditor-toolbar-tool-nowiki' => '插入非格式文字',
+	'wikieditor-toolbar-tool-nowiki-example' => '在此插入非格式文字',
+	'wikieditor-toolbar-tool-redirect' => '重定向',
+	'wikieditor-toolbar-tool-redirect-example' => '目標頁面的名稱',
 	'wikieditor-toolbar-tool-big' => '大',
 	'wikieditor-toolbar-tool-big-example' => '大文字',
 	'wikieditor-toolbar-tool-small' => '小',
@@ -16043,6 +16787,7 @@
 	'wikieditor-toolbar-characters-page-cyrillic' => '西里爾字母',
 	'wikieditor-toolbar-characters-page-arabic' => '阿拉伯字母',
 	'wikieditor-toolbar-characters-page-hebrew' => '希伯來字母',
+	'wikieditor-toolbar-characters-page-bangla' => '孟加拉',
 	'wikieditor-toolbar-characters-page-telugu' => '泰盧固語',
 	'wikieditor-toolbar-characters-page-sinhala' => '僧伽羅文',
 	'wikieditor-toolbar-characters-page-gujarati' => '古吉拉特語',

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -30,11 +30,12 @@
 							'de': [2, -214],
 							'fr': [2, -286],
 							'es': [2, -358],
+							'he': [2, -142],
 							'it': [2, -286],
 							'nl': [2, -502],
 							'pt': [2, -358],
 							'pt-br': [2, -358],
-							'pl': [2, -430]
+							'pl': [2, -142]
 						},
 						icon: {
 							'default': 'format-bold.png',
@@ -42,11 +43,12 @@
 							'de': 'format-bold-F.png',
 							'fr': 'format-bold-G.png',
 							'es': 'format-bold-N.png',
+							'he': 'format-bold-B.png',
 							'it': 'format-bold-G.png',
 							'nl': 'format-bold-V.png',
 							'pt': 'format-bold-N.png',
 							'pt-br': 'format-bold-N.png',
-							'pl': 'format-bold-P.png'
+							'pl': 'format-bold-B.png'
 						},
 						action: {
 							type: 'encapsulate',
@@ -69,11 +71,12 @@
 							'de': [2, -934],
 							'fr': [2, -862],
 							'es': [2, -790],
+							'he': [2, -862],
 							'it': [2, -790],
 							'nl': [2, -790],
 							'pt': [2, -862],
 							'pt-br': [2, -862],
-							'pl': [2, -934]
+							'pl': [2, -862]
 						},
 						icon: {
 							'default': 'format-italic.png',
@@ -81,11 +84,12 @@
 							'de': 'format-italic-K.png',
 							'fr': 'format-italic-I.png',
 							'es': 'format-italic-C.png',
+							'he': 'format-italic-I.png',
 							'it': 'format-italic-C.png',
 							'nl': 'format-italic-C.png',
 							'pt': 'format-italic-I.png',
 							'pt-br': 'format-italic-I.png',
-							'pl': 'format-italic-K.png'
+							'pl': 'format-italic-I.png'
 						},
 						action: {
 							type: 'encapsulate',
@@ -213,12 +217,12 @@
 							'heading-2' : {
 								labelMsg: 'wikieditor-toolbar-tool-heading-2',
 								action: {
-									type: 'replace',
+									type: 'encapsulate',
 									options: {
-										pre: '==',
+										pre: '== ',
 										periMsg: 'wikieditor-toolbar-tool-heading-example',
-										post: '==',
-										regex: /^(\s*)(={0,6})(.*?)\2(\s*)$/,
+										post: ' ==',
+										regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
 										regexReplace: "\$1==\$3==\$4",
 										ownline: true
 									}
@@ -227,12 +231,12 @@
 							'heading-3' : {
 								labelMsg: 'wikieditor-toolbar-tool-heading-3',
 								action: {
-									type: 'replace',
+									type: 'encapsulate',
 									options: {
-										pre: '===',
+										pre: '=== ',
 										periMsg: 'wikieditor-toolbar-tool-heading-example',
-										post: '===',
-										regex: /^(\s*)(={0,6})(.*?)\2(\s*)$/,
+										post: ' ===',
+										regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
 										regexReplace: "\$1===\$3===\$4",
 										ownline: true
 									}
@@ -241,12 +245,12 @@
 							'heading-4' : {
 								labelMsg: 'wikieditor-toolbar-tool-heading-4',
 								action: {
-									type: 'replace',
+									type: 'encapsulate',
 									options: {
-										pre: '====',
+										pre: '==== ',
 										periMsg: 'wikieditor-toolbar-tool-heading-example',
-										post: '====',
-										regex: /^(\s*)(={0,6})(.*?)\2(\s*)$/,
+										post: ' ====',
+										regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
 										regexReplace: "\$1====\$3====\$4",
 										ownline: true
 									}
@@ -255,12 +259,12 @@
 							'heading-5' : {
 								labelMsg: 'wikieditor-toolbar-tool-heading-5',
 								action: {
-									type: 'replace',
+									type: 'encapsulate',
 									options: {
-										pre: '=====',
+										pre: '===== ',
 										periMsg: 'wikieditor-toolbar-tool-heading-example',
-										post: '=====',
-										regex: /^(\s*)(={0,6})(.*?)\2(\s*)$/,
+										post: ' =====',
+										regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
 										regexReplace: "\$1=====\$3=====\$4",
 										ownline: true
 									}
@@ -1415,8 +1419,19 @@
 						// Preserve whitespace when replacing
 						$j( '#wikieditor-toolbar-link-dialog' ).data( 'whitespace', [ matches[1], matches[5] ] );
 					} else {
-						target = text = selection;
+						// Trim any leading and trailing whitespace from the selection,
+						// but preserve it when replacing
+						target = text = $j.trim( selection );
+						if ( target.length < selection.length ) {
+							$j( '#wikieditor-toolbar-link-dialog' ).data( 'whitespace', [
+								selection.substr( 0, selection.indexOf( target.charAt( 0 ) ) ),
+								selection.substr(
+									selection.lastIndexOf( target.charAt( target.length - 1 ) ) + 1
+								) ]
+							);
+						}
 					}
+					
 					// Change the value by calling val() doesn't trigger the change event, so let's do that ourselves
 					if ( typeof text != 'undefined' )
 						$j( '#wikieditor-toolbar-link-int-text' ).val( text ).change();

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -79,11 +79,12 @@
 							'de': [2, -214],
 							'fr': [2, -286],
 							'es': [2, -358],
+							'he': [2, -142],
 							'it': [2, -286],
 							'nl': [2, -502],
 							'pt': [2, -358],
 							'pt-br': [2, -358],
-							'pl': [2, -430]
+							'pl': [2, -142]
 						},
 						icon: {
 							'default': 'format-bold.png',
@@ -91,11 +92,12 @@
 							'de': 'format-bold-F.png',
 							'fr': 'format-bold-G.png',
 							'es': 'format-bold-N.png',
+							'he': 'format-bold-B.png',
 							'it': 'format-bold-G.png',
 							'nl': 'format-bold-V.png',
 							'pt': 'format-bold-N.png',
 							'pt-br': 'format-bold-N.png',
-							'pl': 'format-bold-P.png'
+							'pl': 'format-bold-B.png'
 						},
 						action: {
 							type: 'encapsulate',
@@ -118,11 +120,12 @@
 							'de': [2, -934],
 							'fr': [2, -862],
 							'es': [2, -790],
+							'he': [2, -862],
 							'it': [2, -790],
 							'nl': [2, -790],
 							'pt': [2, -862],
 							'pt-br': [2, -862],
-							'pl': [2, -934]
+							'pl': [2, -862]
 						},
 						icon: {
 							'default': 'format-italic.png',
@@ -130,11 +133,12 @@
 							'de': 'format-italic-K.png',
 							'fr': 'format-italic-I.png',
 							'es': 'format-italic-C.png',
+							'he': 'format-italic-I.png',
 							'it': 'format-italic-C.png',
 							'nl': 'format-italic-C.png',
 							'pt': 'format-italic-I.png',
 							'pt-br': 'format-italic-I.png',
-							'pl': 'format-italic-K.png'
+							'pl': 'format-italic-I.png'
 						},
 						action: {
 							type: 'encapsulate',
@@ -262,12 +266,12 @@
 							'heading-2' : {
 								labelMsg: 'wikieditor-toolbar-tool-heading-2',
 								action: {
-									type: 'replace',
+									type: 'encapsulate',
 									options: {
-										pre: '==',
+										pre: '== ',
 										periMsg: 'wikieditor-toolbar-tool-heading-example',
-										post: '==',
-										regex: /^(\s*)(={0,6})(.*?)\2(\s*)$/,
+										post: ' ==',
+										regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
 										regexReplace: "\$1==\$3==\$4",
 										ownline: true
 									}
@@ -276,12 +280,12 @@
 							'heading-3' : {
 								labelMsg: 'wikieditor-toolbar-tool-heading-3',
 								action: {
-									type: 'replace',
+									type: 'encapsulate',
 									options: {
-										pre: '===',
+										pre: '=== ',
 										periMsg: 'wikieditor-toolbar-tool-heading-example',
-										post: '===',
-										regex: /^(\s*)(={0,6})(.*?)\2(\s*)$/,
+										post: ' ===',
+										regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
 										regexReplace: "\$1===\$3===\$4",
 										ownline: true
 									}
@@ -290,12 +294,12 @@
 							'heading-4' : {
 								labelMsg: 'wikieditor-toolbar-tool-heading-4',
 								action: {
-									type: 'replace',
+									type: 'encapsulate',
 									options: {
-										pre: '====',
+										pre: '==== ',
 										periMsg: 'wikieditor-toolbar-tool-heading-example',
-										post: '====',
-										regex: /^(\s*)(={0,6})(.*?)\2(\s*)$/,
+										post: ' ====',
+										regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
 										regexReplace: "\$1====\$3====\$4",
 										ownline: true
 									}
@@ -304,12 +308,12 @@
 							'heading-5' : {
 								labelMsg: 'wikieditor-toolbar-tool-heading-5',
 								action: {
-									type: 'replace',
+									type: 'encapsulate',
 									options: {
-										pre: '=====',
+										pre: '===== ',
 										periMsg: 'wikieditor-toolbar-tool-heading-example',
-										post: '=====',
-										regex: /^(\s*)(={0,6})(.*?)\2(\s*)$/,
+										post: ' =====',
+										regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
 										regexReplace: "\$1=====\$3=====\$4",
 										ownline: true
 									}
@@ -1464,8 +1468,19 @@
 						// Preserve whitespace when replacing
 						$j( '#wikieditor-toolbar-link-dialog' ).data( 'whitespace', [ matches[1], matches[5] ] );
 					} else {
-						target = text = selection;
+						// Trim any leading and trailing whitespace from the selection,
+						// but preserve it when replacing
+						target = text = $j.trim( selection );
+						if ( target.length < selection.length ) {
+							$j( '#wikieditor-toolbar-link-dialog' ).data( 'whitespace', [
+								selection.substr( 0, selection.indexOf( target.charAt( 0 ) ) ),
+								selection.substr(
+									selection.lastIndexOf( target.charAt( target.length - 1 ) ) + 1
+								) ]
+							);
+						}
 					}
+					
 					// Change the value by calling val() doesn't trigger the change event, so let's do that ourselves
 					if ( typeof text != 'undefined' )
 						$j( '#wikieditor-toolbar-link-int-text' ).val( text ).change();

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -5,7 +5,7 @@
 if($j.fn.wikiEditor){$j('textarea#wpTextbox1').wikiEditor('addModule','publish');}});$j(document).ready(function(){if(!wgWikiEditorPreferences||!(wgWikiEditorPreferences.toc&&wgWikiEditorPreferences.toc.enable)){return true;}
 if($j.fn.wikiEditor){$j('textarea#wpTextbox1').wikiEditor('addModule',{'toc':{'rtl':($j('body').is('.rtl'))}});}});$j(document).ready(function(){if(!wgWikiEditorEnabledModules.toolbar){return true;}
 if(wgWikiEditorPreferences.toolbar.dialogs&&$j.wikiEditor.isSupported($j.wikiEditor.modules.dialogs)){$j('#wpTextbox1').addClass('toolbar-dialogs');}
-if($j.fn.wikiEditor&&$j.wikiEditor.isSupported($j.wikiEditor.modules.toolbar)){$j('#toolbar').remove();$j('#wpTextbox1').wikiEditor('addModule',{'toolbar':{'main':{type:'toolbar',groups:{'format':{tools:{'bold':{labelMsg:'wikieditor-toolbar-tool-bold',type:'button',offset:{'default':[2,-574],'en':[2,-142],'de':[2,-214],'fr':[2,-286],'es':[2,-358],'it':[2,-286],'nl':[2,-502],'pt':[2,-358],'pt-br':[2,-358],'pl':[2,-430]},icon:{'default':'format-bold.png','en':'format-bold-B.png','de':'format-bold-F.png','fr':'format-bold-G.png','es':'format-bold-N.png','it':'format-bold-G.png','nl':'format-bold-V.png','pt':'format-bold-N.png','pt-br':'format-bold-N.png','pl':'format-bold-P.png'},action:{type:'encapsulate',options:{pre:"'''",periMsg:'wikieditor-toolbar-tool-bold-example',post:"'''"}}},'italic':{section:'main',group:'format',id:'italic',labelMsg:'wikieditor-toolbar-tool-italic',type:'button',offset:{'default':[2,-718],'en':[2,-862],'de':[2,-934],'fr':[2,-862],'es':[2,-790],'it':[2,-790],'nl':[2,-790],'pt':[2,-862],'pt-br':[2,-862],'pl':[2,-934]},icon:{'default':'format-italic.png','en':'format-italic-I.png','de':'format-italic-K.png','fr':'format-italic-I.png','es':'format-italic-C.png','it':'format-italic-C.png','nl':'format-italic-C.png','pt':'format-italic-I.png','pt-br':'format-italic-I.png','pl':'format-italic-K.png'},action:{type:'encapsulate',options:{pre:"''",periMsg:'wikieditor-toolbar-tool-italic-example',post:"''"}}}}},'insert':{tools:{'xlink':{labelMsg:'wikieditor-toolbar-tool-xlink',type:'button',icon:'insert-xlink.png',offset:[-70,2],filters:['#wpTextbox1:not(.toolbar-dialogs)'],action:{type:'encapsulate',options:{pre:"[",periMsg:'wikieditor-toolbar-tool-xlink-example',post:"]"}}},'ilink':{labelMsg:'wikieditor-toolbar-tool-ilink',type:'button',icon:'insert-ilink.png',offset:[2,-1582],filters:['#wpTextbox1:not(.toolbar-dialogs)'],action:{type:'encapsulate',options:{pre:"[[",periMsg:'wikieditor-toolbar-tool-ilink-example',post:"]]"}}},'linkCGD':{labelMsg:'wikieditor-toolbar-tool-link',type:'button',icon:'insert-link.png',offset:[2,-1654],filters:['#wpTextbox1.toolbar-dialogs'],action:{type:'dialog',module:'insert-link'}},'file':{labelMsg:'wikieditor-toolbar-tool-file',type:'button',icon:'insert-file.png',offset:[2,-1438],action:{type:'encapsulate',options:{preMsg:['wikieditor-toolbar-tool-file-pre','[['],periMsg:'wikieditor-toolbar-tool-file-example',post:"]]"}}},'referenceCGD':{labelMsg:'wikieditor-toolbar-tool-reference',type:'button',icon:'insert-reference.png',offset:[2,-1798],filters:['body.ns-subject','#wpTextbox1.toolbar-dialogs'],action:{type:'dialog',module:'insert-reference'}},'reference':{labelMsg:'wikieditor-toolbar-tool-reference',filters:['body.ns-subject','#wpTextbox1:not(.toolbar-dialogs)'],type:'button',offset:[2,-1798],icon:'insert-reference.png',action:{type:'encapsulate',options:{pre:"<ref>",periMsg:'wikieditor-toolbar-tool-reference-example',post:"</ref>"}}},'signature':{labelMsg:'wikieditor-toolbar-tool-signature',filters:['body:not(.ns-0)'],type:'button',offset:[2,-1872],icon:'insert-signature.png',action:{type:'encapsulate',options:{post:"--~~~~"}}}}}}},'advanced':{labelMsg:'wikieditor-toolbar-section-advanced',type:'toolbar',groups:{'heading':{tools:{'heading':{labelMsg:'wikieditor-toolbar-tool-heading',type:'select',list:{'heading-2':{labelMsg:'wikieditor-toolbar-tool-heading-2',action:{type:'replace',options:{pre:'==',periMsg:'wikieditor-toolbar-tool-heading-example',post:'==',regex:/^(\s*)(={0,6})(.*?)\2(\s*)$/,regexReplace:"\$1==\$3==\$4",ownline:true}}},'heading-3':{labelMsg:'wikieditor-toolbar-tool-heading-3',action:{type:'replace',options:{pre:'===',periMsg:'wikieditor-toolbar-tool-heading-example',post:'===',regex:/^(\s*)(={0,6})(.*?)\2(\s*)$/,regexReplace:"\$1===\$3===\$4",ownline:true}}},'heading-4':{labelMsg:'wikieditor-toolbar-tool-heading-4',action:{type:'replace',options:{pre:'====',periMsg:'wikieditor-toolbar-tool-heading-example',post:'====',regex:/^(\s*)(={0,6})(.*?)\2(\s*)$/,regexReplace:"\$1====\$3====\$4",ownline:true}}},'heading-5':{labelMsg:'wikieditor-toolbar-tool-heading-5',action:{type:'replace',options:{pre:'=====',periMsg:'wikieditor-toolbar-tool-heading-example',post:'=====',regex:/^(\s*)(={0,6})(.*?)\2(\s*)$/,regexReplace:"\$1=====\$3=====\$4",ownline:true}}}}}}},'format':{labelMsg:'wikieditor-toolbar-group-format',tools:{'ulist':{labelMsg:'wikieditor-toolbar-tool-ulist',type:'button',icon:'format-ulist.png',offset:[2,-1366],action:{type:'encapsulate',options:{pre:"* ",periMsg:'wikieditor-toolbar-tool-ulist-example',post:"",ownline:true}}},'olist':{labelMsg:'wikieditor-toolbar-tool-olist',type:'button',icon:'format-olist.png',offset:[2,-1078],action:{type:'encapsulate',options:{pre:"# ",periMsg:'wikieditor-toolbar-tool-olist-example',post:"",ownline:true}}},'indent':{labelMsg:'wikieditor-toolbar-tool-indent',type:'button',icon:'format-indent.png',offset:[2,-646],action:{type:'encapsulate',options:{pre:":",periMsg:'wikieditor-toolbar-tool-indent-example',post:"",ownline:true,splitlines:true}}},'nowiki':{labelMsg:'wikieditor-toolbar-tool-nowiki',type:'button',icon:'insert-nowiki.png',offset:[-70,-70],action:{type:'encapsulate',options:{pre:"<nowiki>",periMsg:'wikieditor-toolbar-tool-nowiki-example',post:"</nowiki>"}}},'newline':{labelMsg:'wikieditor-toolbar-tool-newline',type:'button',icon:'insert-newline.png',offset:[2,-1726],action:{type:'encapsulate',options:{pre:"<br />\n"}}}}},'size':{tools:{'big':{labelMsg:'wikieditor-toolbar-tool-big',type:'button',icon:'format-big.png',offset:[2,2],action:{type:'encapsulate',options:{pre:"<big>",periMsg:'wikieditor-toolbar-tool-big-example',post:"</big>"}}},'small':{labelMsg:'wikieditor-toolbar-tool-small',type:'button',icon:'format-small.png',offset:[2,-1150],action:{type:'encapsulate',options:{pre:"<small>",periMsg:'wikieditor-toolbar-tool-small-example',post:"</small>"}}},'superscript':{labelMsg:'wikieditor-toolbar-tool-superscript',type:'button',icon:'format-superscript.png',offset:[2,-1294],action:{type:'encapsulate',options:{pre:"<sup>",periMsg:'wikieditor-toolbar-tool-superscript-example',post:"</sup>"}}},'subscript':{labelMsg:'wikieditor-toolbar-tool-subscript',type:'button',icon:'format-subscript.png',offset:[2,-1222],action:{type:'encapsulate',options:{pre:"<sub>",periMsg:'wikieditor-toolbar-tool-subscript-example',post:"</sub>"}}}}},'insert':{labelMsg:'wikieditor-toolbar-group-insert',tools:{'gallery':{labelMsg:'wikieditor-toolbar-tool-gallery',type:'button',icon:'insert-gallery.png',offset:[2,-1510],action:{type:'encapsulate',options:{pre:"<gallery>\n",periMsg:'wikieditor-toolbar-tool-gallery-example',post:"\n</gallery>",ownline:true}}},'tableCGD':{labelMsg:'wikieditor-toolbar-tool-table',type:'button',icon:'insert-table.png',offset:[2,-1942],filters:['#wpTextbox1.toolbar-dialogs'],action:{type:'dialog',module:'insert-table'}},'table':{labelMsg:'wikieditor-toolbar-tool-table',type:'button',icon:'insert-table.png',offset:[2,-1942],filters:['#wpTextbox1:not(.toolbar-dialogs)'],action:{type:'encapsulate',options:{pre:"{| class=\"wikitable\" border=\"1\"\n|",periMsg:'wikieditor-toolbar-tool-table-example-old',post:"\n|}",ownline:true}}},'redirect':{labelMsg:'wikieditor-toolbar-tool-redirect',type:'button',icon:'insert-redirect.png',offset:[-70,-142],action:{type:'encapsulate',options:{pre:"#REDIRECT [[",periMsg:'wikieditor-toolbar-tool-redirect-example',post:"]]",ownline:true}}}}},'search':{tools:{'replace':{labelMsg:'wikieditor-toolbar-tool-replace',type:'button',icon:'search-replace.png',offset:[-70,-214],filters:['#wpTextbox1.toolbar-dialogs'],action:{type:'dialog',module:'search-and-replace'}}}}}},'characters':{labelMsg:'wikieditor-toolbar-section-characters',type:'booklet',deferLoad:true,pages:{'latin':{'labelMsg':'wikieditor-toolbar-characters-page-latin','layout':'characters','characters':["\u00c1","\u00e1","\u00c0","\u00e0","\u00c2","\u00e2","\u00c4","\u00e4","\u00c3","\u00e3","\u01cd","\u01ce","\u0100","\u0101","\u0102","\u0103","\u0104","\u0105","\u00c5","\u00e5","\u0106","\u0107","\u0108","\u0109","\u00c7","\u00e7","\u010c","\u010d","\u010a","\u010b","\u0110","\u0111","\u010e","\u010f","\u00c9","\u00e9","\u00c8","\u00e8","\u00ca","\u00ea","\u00cb","\u00eb","\u011a","\u011b","\u0112","\u0113","\u0114","\u0115","\u0116","\u0117","\u0118","\u0119","\u011c","\u011d","\u0122","\u0123","\u011e","\u011f","\u0120","\u0121","\u0124","\u0125","\u0126","\u0127","\u00cd","\u00ed","\u00cc","\u00ec","\u00ce","\u00ee","\u00cf","\u00ef","\u0128","\u0129","\u01cf","\u01d0","\u012a","\u012b","\u012c","\u012d","\u0130","\u0131","\u012e","\u012f","\u0134","\u0135","\u0136","\u0137","\u0139","\u013a","\u013b","\u013c","\u013d","\u013e","\u0141","\u0142","\u013f","\u0140","\u0143","\u0144","\u00d1","\u00f1","\u0145","\u0146","\u0147","\u0148","\u00d3","\u00f3","\u00d2","\u00f2","\u00d4","\u00f4","\u00d6","\u00f6","\u00d5","\u00f5","\u01d1","\u01d2","\u014c","\u014d","\u014e","\u014f","\u01ea","\u01eb","\u0150","\u0151","\u0154","\u0155","\u0156","\u0157","\u0158","\u0159","\u015a","\u015b","\u015c","\u015d","\u015e","\u015f","\u0160","\u0161","\u0162","\u0163","\u0164","\u0165","\u00da","\u00fa","\u00d9","\u00f9","\u00db","\u00fb","\u00dc","\u00fc","\u0168","\u0169","\u016e","\u016f","\u01d3","\u01d4","\u016a","\u016b","\u01d6","\u01d8","\u01da","\u01dc","\u016c","\u016d","\u0172","\u0173","\u0170","\u0171","\u0174","\u0175","\u00dd","\u00fd","\u0176","\u0177","\u0178","\u00ff","\u0232","\u0233","\u0179","\u017a","\u017d","\u017e","\u017b","\u017c","\u00c6","\u00e6","\u01e2","\u01e3","\u00d8","\u00f8","\u0152","\u0153","\u00df","\u00f0","\u00de","\u00fe","\u018f","\u0259"]},'latinextended':{'labelMsg':'wikieditor-toolbar-characters-page-latinextended','layout':'characters','characters':["\u1e00","\u1e01","\u1e9a","\u1ea0","\u1ea1","\u1ea2","\u1ea3","\u1ea4","\u1ea5","\u1ea6","\u1ea7","\u1ea8","\u1ea9","\u1eaa","\u1eab","\u1eac","\u1ead","\u1eae","\u1eaf","\u1eb0","\u1eb1","\u1eb2","\u1eb3","\u1eb4","\u1eb5","\u1eb6","\u1eb7","\u1e02","\u1e03","\u1e04","\u1e05","\u1e06","\u1e07","\u1e08","\u1e09","\u1e0a","\u1e0b","\u1e0c","\u1e0d","\u1e0e","\u1e0f","\u1e10","\u1e11","\u1e12","\u1e13","\u1e14","\u1e15","\u1e16","\u1e17","\u1e18","\u1e19","\u1e1a","\u1e1b","\u1e1c","\u1e1d","\u1eb8","\u1eb9","\u1eba","\u1ebb","\u1ebc","\u1ebd","\u1ebe","\u1ebf","\u1ec0","\u1ec1","\u1ec2","\u1ec3","\u1ec4","\u1ec5","\u1ec6","\u1ec7","\u1e1e","\u1e1f","\u1e20","\u1e21","\u1e22","\u1e23","\u1e24","\u1e25","\u1e26","\u1e27","\u1e28","\u1e29","\u1e2a","\u1e2b","\u1e96","\u1e2c","\u1e2d","\u1e2e","\u1e2f","\u1ec8","\u1ec9","\u1eca","\u1ecb","\u1e30","\u1e31","\u1e32","\u1e33","\u1e34","\u1e35","\u1e36","\u1e37","\u1e38","\u1e39","\u1e3a","\u1e3b","\u1e3c","\u1e3d","\u1efa","\u1efb","\u1e3e","\u1e3f","\u1e40","\u1e41","\u1e42","\u1e43","\u1e44","\u1e45","\u1e46","\u1e47","\u1e48","\u1e49","\u1e4a","\u1e4b","\u1e4c","\u1e4d","\u1e4e","\u1e4f","\u1e50","\u1e51","\u1e52","\u1e53","\u1ecc","\u1ecd","\u1ece","\u1ecf","\u1ed0","\u1ed1","\u1ed2","\u1ed3","\u1ed4","\u1ed5","\u1ed6","\u1ed7","\u1ed8","\u1ed9","\u1eda","\u1edb","\u1edc","\u1edd","\u1ede","\u1edf","\u1ee0","\u1ee1","\u1ee2","\u1ee3","\u1e54","\u1e55","\u1e56","\u1e57","\u1e58","\u1e59","\u1e5a","\u1e5b","\u1e5c","\u1e5d","\u1e5e","\u1e5f","\u1e60","\u1e61","\u1e9b","\u1e62","\u1e63","\u1e64","\u1e65","\u1e66","\u1e67","\u1e68","\u1e69","\u1e9c","\u1e9d","\u1e6a","\u1e6b","\u1e6c","\u1e6d","\u1e6e","\u1e6f","\u1e70","\u1e71","\u1e97","\u1e72","\u1e73","\u1e74","\u1e75","\u1e76","\u1e77","\u1e78","\u1e79","\u1e7a","\u1e7b","\u1ee4","\u1ee5","\u1ee6","\u1ee7","\u1ee8","\u1ee9","\u1eea","\u1eeb","\u1eec","\u1eed","\u1eee","\u1eef","\u1ef0","\u1ef1","\u1e7c","\u1e7d","\u1e7e","\u1e7f","\u1efc","\u1efd","\u1e80","\u1e81","\u1e82","\u1e83","\u1e84","\u1e85","\u1e86","\u1e87","\u1e88","\u1e89","\u1e98","\u1e8a","\u1e8b","\u1e8c","\u1e8d","\u1e8e","\u1e8f","\u1e99","\u1ef2","\u1ef3","\u1ef4","\u1ef5","\u1ef6","\u1ef7","\u1ef8","\u1ef9","\u1efe","\u1eff","\u1e90","\u1e91","\u1e92","\u1e93","\u1e94","\u1e95","\u1e9e","\u1e9f"]},'ipa':{labelMsg:'wikieditor-toolbar-characters-page-ipa',layout:'characters',characters:["p","t\u032a","t","\u0288","c","k","q","\u02a1","\u0294","b","d\u032a","d","\u0256","\u025f","\u0261","\u0262","\u0253","\u0257","\u0284","\u0260","\u029b","t\u0361s","t\u0361\u0283","t\u0361\u0255","d\u0361z","d\u0361\u0292","d\u0361\u0291","\u0278","f","\u03b8","s","\u0283","\u0285","\u0286","\u0282","\u0255","\u00e7","\u0267","x","\u03c7","\u0127","\u029c","h","\u03b2","v","\u028d","\u00f0","z","\u0292","\u0293","\u0290","\u0291","\u029d","\u0263","\u0281","\u0295","\u0296","\u02a2","\u0266","\u026c","\u026e","m","m\u0329","\u0271","\u0271\u0329","\u0271\u030d","n\u032a","n\u032a\u030d","n","n\u0329","\u0273","\u0273\u0329","\u0272","\u0272\u0329","\u014b","\u014b\u030d","\u014b\u0329","\u0274","\u0274\u0329","\u0299","\u0299\u0329","r","r\u0329","\u0280","\u0280\u0329","\u027e","\u027d","\u027f","\u027a","l\u032a","l\u032a\u0329","l","l\u0329","\u026b","\u026b\u0329","\u026d","\u026d\u0329","\u028e","\u028e\u0329","\u029f","\u029f\u0329","w","\u0265","\u028b","\u0279","\u027b","j","\u0270","\u0298","\u01c2","\u01c0","!","\u01c1","\u02b0","\u02b1","\u02b7","\u02b8","\u02b2","\u02b3","\u207f","\u02e1","\u02b4","\u02b5","\u02e2","\u02e3","\u02e0","\u02b6","\u02e4","\u02c1","\u02c0","\u02bc","i","i\u032f","\u0129","y","y\u032f","\u1ef9","\u026a","\u026a\u032f","\u026a\u0303","\u028f","\u028f\u032f","\u028f\u0303","\u0268","\u0268\u032f","\u0268\u0303","\u0289","\u0289\u032f","\u0289\u0303","\u026f","\u026f\u032f","\u026f\u0303","u","u\u032f","\u0169","\u028a","\u028a\u032f","\u028a\u0303","e","e\u032f","\u1ebd","\u00f8","\u00f8\u032f","\u00f8\u0303","\u0258","\u0258\u032f","\u0258\u0303","\u0275","\u0275\u032f","\u0275\u0303","\u0264","\u0264\u032f","\u0264\u0303","o","o\u032f","\u00f5","\u025b","\u025b\u032f","\u025b\u0303","\u0153","\u0153\u032f","\u0153\u0303","\u025c","\u025c\u032f","\u025c\u0303","\u0259","\u0259\u032f","\u0259\u0303","\u025e","\u025e\u032f","\u025e\u0303","\u028c","\u028c\u032f","\u028c\u0303","\u0254","\u0254\u032f","\u0254\u0303","\u00e6","\u00e6\u032f","\u00e6\u0303","\u0276","\u0276\u032f","\u0276\u0303","a","a\u032f","\u00e3","\u0250","\u0250\u032f","\u0250\u0303","\u0251","\u0251\u032f","\u0251\u0303","\u0252","\u0252\u032f","\u0252\u0303","\u02c8","\u02cc","\u02d0","\u02d1","\u02d8",".","\u203f","|","\u2016"]},'symbols':{'labelMsg':'wikieditor-toolbar-characters-page-symbols','layout':'characters','characters':["~","|","\u00a1","\u00bf","\u2020","\u2021","\u2194","\u2191","\u2193","\u2022","\u00b6","#","\u00bd","\u2153","\u2154","\u00bc","\u00be","\u215b","\u215c","\u215d","\u215e","\u221e","\u2018","\u201e","\u201c","\u2019","\u201d",{'label':"\u00ab\u00bb",'action':{'type':'encapsulate','options':{'pre':"\u00ab",'post':"\u00bb"}}},"\u00a4","\u20b3","\u0e3f","\u20b5","\u00a2","\u20a1","\u20a2","$","\u20ab","\u20af","\u20ac","\u20a0","\u20a3","\u0192","\u20b4","\u20ad","\u20a4","\u2133","\u20a5","\u20a6","\u2116","\u20a7","\u20b0","\u00a3","\u17db","\u20a8","\u20aa","\u09f3","\u20ae","\u20a9","\u00a5","\u2660","\u2663","\u2665","\u2666","m\u00b2","m\u00b3","\u2013","\u2014","\u2026","\u2018","\u201c","\u2019","\u201d","\u00b0","\u2033","\u2032","\u2248","\u2260","\u2264","\u2265","\u00b1","\u2212","\u00d7","\u00f7","\u2190","\u2192","\u00b7","\u00a7"]},'greek':{'labelMsg':'wikieditor-toolbar-characters-page-greek','layout':'characters','language':'hl','characters':["\u0391","\u0386","\u03b1","\u03ac","\u0392","\u03b2","\u0393","\u03b3","\u0394","\u03b4","\u0395","\u0388","\u03b5","\u03ad","\u0396","\u03b6","\u0397","\u0389","\u03b7","\u03ae","\u0398","\u03b8","\u0399","\u038a","\u03b9","\u03af","\u039a","\u03ba","\u039b","\u03bb","\u039c","\u03bc","\u039d","\u03bd","\u039e","\u03be","\u039f","\u038c","\u03bf","\u03cc","\u03a0","\u03c0","\u03a1","\u03c1","\u03a3","\u03c3","\u03c2","\u03a4","\u03c4","\u03a5","\u038e","\u03c5","\u03cd","\u03a6","\u03c6","\u03a7","\u03c7","\u03a8","\u03c8","\u03a9","\u038f","\u03c9","\u03ce"]},'cyrillic':{'labelMsg':'wikieditor-toolbar-characters-page-cyrillic','layout':'characters','characters':["\u0410","\u0430","\u04d8","\u04d9","\u0411","\u0431","\u0412","\u0432","\u0413","\u0433","\u0490","\u0491","\u0403","\u0453","\u0492","\u0493","\u0414","\u0434","\u0402","\u0452","\u0415","\u0435","\u0404","\u0454","\u0401","\u0451","\u0416","\u0436","\u0417","\u0437","\u0405","\u0455","\u0418","\u0438","\u0406","\u0456","\u0407","\u0457","\u0130","\u0419","\u0439","\u04e2","\u04e3","\u0408","\u0458","\u041a","\u043a","\u040c","\u045c","\u049a","\u049b","\u041b","\u043b","\u0409","\u0459","\u041c","\u043c","\u041d","\u043d","\u040a","\u045a","\u04a2","\u04a3","\u041e","\u043e","\u04e8","\u04e9","\u041f","\u043f","\u0420","\u0440","\u0421","\u0441","\u0422","\u0442","\u040b","\u045b","\u0423","\u0443","\u040e","\u045e","\u04ee","\u04ef","\u04b0","\u04b1","\u04ae","\u04af","\u0424","\u0444","\u0425","\u0445","\u04b2","\u04b3","\u04ba","\u04bb","\u0426","\u0446","\u0427","\u0447","\u04b6","\u04b7","\u040f","\u045f","\u0428","\u0448","\u0429","\u0449","\u042a","\u044a","\u042b","\u044b","\u042c","\u044c","\u042d","\u044d","\u042e","\u044e","\u042f","\u044f"]},'arabic':{'labelMsg':'wikieditor-toolbar-characters-page-arabic','layout':'characters','language':'ar','direction':'rtl','characters':["\u061b","\u061f","\u0621","\u0622","\u0623","\u0624","\u0625","\u0626","\u0627","\u0628","\u0629","\u062a","\u062b","\u062c","\u062d","\u062e","\u062f","\u0630","\u0631","\u0632","\u0633","\u0634","\u0635","\u0636","\u0637","\u0638","\u0639","\u063a","\u0641","\u0642","\u0643","\u0644","\u0645","\u0646","\u0647","\u0648","\u0649","\u064a","\u060c","\u067e","\u0686","\u0698","\u06af","\u06ad"]},'hebrew':{'labelMsg':'wikieditor-toolbar-characters-page-hebrew','layout':'characters','direction':'rtl','characters':["\u05d0","\u05d1","\u05d2","\u05d3","\u05d4","\u05d5","\u05d6","\u05d7","\u05d8","\u05d9","\u05db","\u05da","\u05dc","\u05de","\u05dd","\u05e0","\u05df","\u05e1","\u05e2","\u05e4","\u05e3","\u05e6","\u05e5","\u05e7","\u05e8","\u05e9","\u05ea","\u05f3","\u05f4","\u05f0","\u05f1","\u05f2","\u05d0","\u05d3","\u05d4","\u05d5","\u05d6","\u05d7","\u05d8","\u05d9","\u05da","\u05db","\u05dc","\u05dd","\u05de","\u05df","\u05e0","\u05e1","\u05e2","\u05e3","\u05e4","\u05be","\u05f3","\u05f4",["\u05b0\u25cc","\u05b0"],["\u05b1\u25cc","\u05b1"],["\u05b2\u25cc","\u05b2"],["\u05b3\u25cc","\u05b3"],["\u05b4\u25cc","\u05b4"],["\u05b5\u25cc","\u05b5"],["\u05b6\u25cc","\u05b6"],["\u05b7\u25cc","\u05b7"],["\u05b8\u25cc","\u05b8"],["\u05b9\u25cc","\u05b9"],["\u05bb\u25cc","\u05bb"],["\u05bc\u25cc","\u05bc"],["\u05c1\u25cc","\u05c1"],["\u05c2\u25cc","\u05c2"],["\u05c7\u25cc","\u05c7"],["\u0591\u25cc","\u0591"],["\u0592\u25cc","\u0592"],["\u0593\u25cc","\u0593"],["\u0594\u25cc","\u0594"],["\u0595\u25cc","\u0595"],["\u0596\u25cc","\u0596"],["\u0597\u25cc","\u0597"],["\u0598\u25cc","\u0598"],["\u0599\u25cc","\u0599"],["\u059a\u25cc","\u059a"],["\u059b\u25cc","\u059b"],["\u059c\u25cc","\u059c"],["\u059d\u25cc","\u059d"],["\u059e\u25cc","\u059e"],["\u059f\u25cc","\u059f"],["\u05a0\u25cc","\u05a0"],["\u05a1\u25cc","\u05a1"],["\u05a2\u25cc","\u05a2"],["\u05a3\u25cc","\u05a3"],["\u05a4\u25cc","\u05a4"],["\u05a5\u25cc","\u05a5"],["\u05a6\u25cc","\u05a6"],["\u05a7\u25cc","\u05a7"],["\u05a8\u25cc","\u05a8"],["\u05a9\u25cc","\u05a9"],["\u05aa\u25cc","\u05aa"],["\u05ab\u25cc","\u05ab"],["\u05ac\u25cc","\u05ac"],["\u05ad\u25cc","\u05ad"],["\u05ae\u25cc","\u05ae"],["\u05af\u25cc","\u05af"],["\u05bf\u25cc","\u05bf"],["\u05c0\u25cc","\u05c0"],["\u05c3\u25cc","\u05c3"]]},'bangla':{'labelMsg':'wikieditor-toolbar-characters-page-bangla','language':'bn','layout':'characters','characters':["\u0985","\u0986","\u0987","\u0988","\u0989","\u098a","\u098b","\u098f","\u0990","\u0993","\u0994","\u09be","\u09bf","\u09c0","\u09c1","\u09c2","\u09c3","\u09c7","\u09c8","\u09cb","\u09cc","\u0995","\u0996","\u0997","\u0998","\u0999","\u099a","\u099b","\u099c","\u099d","\u099e","\u099f","\u09a0","\u09a1","\u09a2","\u09a3","\u09a4","\u09a5","\u09a6","\u09a7","\u09a8","\u09aa","\u09ab","\u09ac","\u09ad","\u09ae","\u09af","\u09b0","\u09b2","\u09b6","\u09b7","\u09b8","\u09b9","\u09a1\u09bc","\u09a2\u09bc","\u09af\u09bc","\u09ce","\u0982","\u0983","\u0981","\u09cd","\u09e7","\u09e8","\u09e9","\u09ea","\u09eb","\u09ec","\u09ed","\u09ee","\u09ef","\u09e6"]},'telugu':{'labelMsg':'wikieditor-toolbar-characters-page-telugu','language':'te','layout':'characters','characters':["\u0c01","\u0c02","\u0c03","\u0c05","\u0c06","\u0c07","\u0c08","\u0c09","\u0c0a","\u0c0b","\u0c60","\u0c0c","\u0c61","\u0c0e","\u0c0f","\u0c10","\u0c12","\u0c13","\u0c14","\u0c15","\u0c16","\u0c17","\u0c18","\u0c19","\u0c1a","\u0c1b","\u0c1c","\u0c1d","\u0c1e","\u0c1f","\u0c20","\u0c21","\u0c22","\u0c23","\u0c24","\u0c25","\u0c26","\u0c27","\u0c28","\u0c2a","\u0c2b","\u0c2c","\u0c2d","\u0c2e","\u0c2f","\u0c30","\u0c31","\u0c32","\u0c33","\u0c35","\u0c36","\u0c37","\u0c38","\u0c39","\u0c3e","\u0c3f","\u0c40","\u0c41","\u0c42","\u0c43","\u0c44","\u0c46","\u0c47","\u0c48","\u0c4a","\u0c4b","\u0c4c","\u0c4d","\u0c62","\u0c63","\u0c58","\u0c59","\u0c66","\u0c67","\u0c68","\u0c69","\u0c6a","\u0c6b","\u0c6c","\u0c6d","\u0c6e","\u0c6f","\u0c3d","\u0c78","\u0c79","\u0c7a","\u0c7b","\u0c7c","\u0c7d","\u0c7e","\u0c7f"]},'sinhala':{'labelMsg':'wikieditor-toolbar-characters-page-sinhala','language':'si','layout':'characters','characters':["\u0d85","\u0d86","\u0d87","\u0d88","\u0d89","\u0d8a","\u0d8b","\u0d8c","\u0d8d","\u0d8e","\u0d8f","\u0d90","\u0d91","\u0d92","\u0d93","\u0d94","\u0d95","\u0d96","\u0d9a","\u0d9b","\u0d9c","\u0d9d","\u0d9e","\u0d9f","\u0da0","\u0da1","\u0da2","\u0da3","\u0da4","\u0da5","\u0da6","\u0da7","\u0da8","\u0da9","\u0daa","\u0dab","\u0dac","\u0dad","\u0dae","\u0daf","\u0db0","\u0db1","\u0db3","\u0db4","\u0db5","\u0db6","\u0db7","\u0db8","\u0db9","\u0dba","\u0dbb","\u0dbd","\u0dc0","\u0dc1","\u0dc2","\u0dc3","\u0dc4","\u0dc5","\u0dc6",["\u25cc\u0dcf","\u0dcf"],["\u25cc\u0dd0","\u0dd0"],["\u25cc\u0dd1","\u0dd1"],["\u25cc\u0dd2","\u0dd2"],["\u25cc\u0dd3","\u0dd3"],["\u25cc\u0dd4","\u0dd4"],["\u25cc\u0dd6","\u0dd6"],["\u25cc\u0dd8","\u0dd8"],["\u25cc\u0df2","\u0df2"],["\u25cc\u0ddf","\u0ddf"],["\u25cc\u0df3","\u0df3"],["\u25cc\u0dd9","\u0dd9"],["\u25cc\u0dda","\u0dda"],["\u25cc\u0ddc","\u0ddc"],["\u25cc\u0ddd","\u0ddd"],["\u25cc\u0dde","\u0dde"],["\u25cc\u0dca","\u0dca"]]},'gujarati':{'labelMsg':'wikieditor-toolbar-characters-page-gujarati','language':'gu','layout':'characters','characters':["\u0ad0","\u0a85","\u0a86","\u0a87","\u0a88","\u0a89","\u0a8a","\u0a8b","\u0ae0","\u0a8c","\u0ae1","\u0a8d","\u0a8f","\u0a90","\u0a91","\u0a93","\u0a94","\u0a95","\u0a96","\u0a97","\u0a98","\u0a99","\u0a9a","\u0a9b","\u0a9c","\u0a9d","\u0a9e","\u0a9f","\u0aa0","\u0aa1","\u0aa2","\u0aa3","\u0aa4","\u0aa5","\u0aa6","\u0aa7","\u0aa8","\u0aaa","\u0aab","\u0aac","\u0aad","\u0aae","\u0aaf","\u0ab0","\u0ab2","\u0ab5","\u0ab6","\u0ab7","\u0ab8","\u0ab9","\u0ab3","\u0abd",["\u25cc\u0abe","\u0abe"],["\u25cc\u0abf","\u0abf"],["\u25cc\u0ac0","\u0ac0"],["\u25cc\u0ac1","\u0ac1"],["\u25cc\u0ac2","\u0ac2"],["\u25cc\u0ac3","\u0ac3"],["\u25cc\u0ac4","\u0ac4"],["\u25cc\u0ae2","\u0ae2"],["\u25cc\u0ae3","\u0ae3"],["\u25cc\u0ac5","\u0ac5"],["\u25cc\u0ac7","\u0ac7"],["\u25cc\u0ac8","\u0ac8"],["\u25cc\u0ac9","\u0ac9"],["\u25cc\u0acb","\u0acb"],["\u25cc\u0acc","\u0acc"],["\u25cc\u0acd","\u0acd"]]}}},'help':{labelMsg:'wikieditor-toolbar-section-help',type:'booklet',deferLoad:true,pages:{'format':{labelMsg:'wikieditor-toolbar-help-page-format',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-italic-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-italic-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-italic-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-bold-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-bold-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-bold-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-bolditalic-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-bolditalic-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-bolditalic-result'}}]},'link':{labelMsg:'wikieditor-toolbar-help-page-link',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-ilink-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-ilink-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-ilink-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-xlink-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-xlink-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-xlink-result'}}]},'heading':{labelMsg:'wikieditor-toolbar-help-page-heading',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-heading1-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-heading1-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-heading1-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-heading2-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-heading2-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-heading2-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-heading3-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-heading3-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-heading3-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-heading4-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-heading4-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-heading4-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-heading5-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-heading5-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-heading5-result'}}]},'list':{labelMsg:'wikieditor-toolbar-help-page-list',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-ulist-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-ulist-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-ulist-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-olist-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-olist-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-olist-result'}}]},'file':{labelMsg:'wikieditor-toolbar-help-page-file',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-file-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-file-syntax'},'result':{htmlMsg:['wikieditor-toolbar-help-content-file-result',stylepath]}}]},'reference':{labelMsg:'wikieditor-toolbar-help-page-reference',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-reference-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-reference-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-reference-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-rereference-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-rereference-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-rereference-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-showreferences-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-showreferences-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-showreferences-result'}}]},'discussion':{labelMsg:'wikieditor-toolbar-help-page-discussion',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-signaturetimestamp-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-signaturetimestamp-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-signaturetimestamp-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-signature-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-signature-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-signature-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-indent-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-indent-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-indent-result'}}]}}}},'dialogs':{'insert-link':{filters:['#wpTextbox1.toolbar-dialogs'],titleMsg:'wikieditor-toolbar-tool-link-title',id:'wikieditor-toolbar-link-dialog',html:'\
+if($j.fn.wikiEditor&&$j.wikiEditor.isSupported($j.wikiEditor.modules.toolbar)){$j('#toolbar').remove();$j('#wpTextbox1').wikiEditor('addModule',{'toolbar':{'main':{type:'toolbar',groups:{'format':{tools:{'bold':{labelMsg:'wikieditor-toolbar-tool-bold',type:'button',offset:{'default':[2,-574],'en':[2,-142],'de':[2,-214],'fr':[2,-286],'es':[2,-358],'he':[2,-142],'it':[2,-286],'nl':[2,-502],'pt':[2,-358],'pt-br':[2,-358],'pl':[2,-142]},icon:{'default':'format-bold.png','en':'format-bold-B.png','de':'format-bold-F.png','fr':'format-bold-G.png','es':'format-bold-N.png','he':'format-bold-B.png','it':'format-bold-G.png','nl':'format-bold-V.png','pt':'format-bold-N.png','pt-br':'format-bold-N.png','pl':'format-bold-B.png'},action:{type:'encapsulate',options:{pre:"'''",periMsg:'wikieditor-toolbar-tool-bold-example',post:"'''"}}},'italic':{section:'main',group:'format',id:'italic',labelMsg:'wikieditor-toolbar-tool-italic',type:'button',offset:{'default':[2,-718],'en':[2,-862],'de':[2,-934],'fr':[2,-862],'es':[2,-790],'he':[2,-862],'it':[2,-790],'nl':[2,-790],'pt':[2,-862],'pt-br':[2,-862],'pl':[2,-862]},icon:{'default':'format-italic.png','en':'format-italic-I.png','de':'format-italic-K.png','fr':'format-italic-I.png','es':'format-italic-C.png','he':'format-italic-I.png','it':'format-italic-C.png','nl':'format-italic-C.png','pt':'format-italic-I.png','pt-br':'format-italic-I.png','pl':'format-italic-I.png'},action:{type:'encapsulate',options:{pre:"''",periMsg:'wikieditor-toolbar-tool-italic-example',post:"''"}}}}},'insert':{tools:{'xlink':{labelMsg:'wikieditor-toolbar-tool-xlink',type:'button',icon:'insert-xlink.png',offset:[-70,2],filters:['#wpTextbox1:not(.toolbar-dialogs)'],action:{type:'encapsulate',options:{pre:"[",periMsg:'wikieditor-toolbar-tool-xlink-example',post:"]"}}},'ilink':{labelMsg:'wikieditor-toolbar-tool-ilink',type:'button',icon:'insert-ilink.png',offset:[2,-1582],filters:['#wpTextbox1:not(.toolbar-dialogs)'],action:{type:'encapsulate',options:{pre:"[[",periMsg:'wikieditor-toolbar-tool-ilink-example',post:"]]"}}},'linkCGD':{labelMsg:'wikieditor-toolbar-tool-link',type:'button',icon:'insert-link.png',offset:[2,-1654],filters:['#wpTextbox1.toolbar-dialogs'],action:{type:'dialog',module:'insert-link'}},'file':{labelMsg:'wikieditor-toolbar-tool-file',type:'button',icon:'insert-file.png',offset:[2,-1438],action:{type:'encapsulate',options:{preMsg:['wikieditor-toolbar-tool-file-pre','[['],periMsg:'wikieditor-toolbar-tool-file-example',post:"]]"}}},'referenceCGD':{labelMsg:'wikieditor-toolbar-tool-reference',type:'button',icon:'insert-reference.png',offset:[2,-1798],filters:['body.ns-subject','#wpTextbox1.toolbar-dialogs'],action:{type:'dialog',module:'insert-reference'}},'reference':{labelMsg:'wikieditor-toolbar-tool-reference',filters:['body.ns-subject','#wpTextbox1:not(.toolbar-dialogs)'],type:'button',offset:[2,-1798],icon:'insert-reference.png',action:{type:'encapsulate',options:{pre:"<ref>",periMsg:'wikieditor-toolbar-tool-reference-example',post:"</ref>"}}},'signature':{labelMsg:'wikieditor-toolbar-tool-signature',filters:['body:not(.ns-0)'],type:'button',offset:[2,-1872],icon:'insert-signature.png',action:{type:'encapsulate',options:{post:"--~~~~"}}}}}}},'advanced':{labelMsg:'wikieditor-toolbar-section-advanced',type:'toolbar',groups:{'heading':{tools:{'heading':{labelMsg:'wikieditor-toolbar-tool-heading',type:'select',list:{'heading-2':{labelMsg:'wikieditor-toolbar-tool-heading-2',action:{type:'encapsulate',options:{pre:'== ',periMsg:'wikieditor-toolbar-tool-heading-example',post:' ==',regex:/^(\s*)(={1,6})(.*?)\2(\s*)$/,regexReplace:"\$1==\$3==\$4",ownline:true}}},'heading-3':{labelMsg:'wikieditor-toolbar-tool-heading-3',action:{type:'encapsulate',options:{pre:'=== ',periMsg:'wikieditor-toolbar-tool-heading-example',post:' ===',regex:/^(\s*)(={1,6})(.*?)\2(\s*)$/,regexReplace:"\$1===\$3===\$4",ownline:true}}},'heading-4':{labelMsg:'wikieditor-toolbar-tool-heading-4',action:{type:'encapsulate',options:{pre:'==== ',periMsg:'wikieditor-toolbar-tool-heading-example',post:' ====',regex:/^(\s*)(={1,6})(.*?)\2(\s*)$/,regexReplace:"\$1====\$3====\$4",ownline:true}}},'heading-5':{labelMsg:'wikieditor-toolbar-tool-heading-5',action:{type:'encapsulate',options:{pre:'===== ',periMsg:'wikieditor-toolbar-tool-heading-example',post:' =====',regex:/^(\s*)(={1,6})(.*?)\2(\s*)$/,regexReplace:"\$1=====\$3=====\$4",ownline:true}}}}}}},'format':{labelMsg:'wikieditor-toolbar-group-format',tools:{'ulist':{labelMsg:'wikieditor-toolbar-tool-ulist',type:'button',icon:'format-ulist.png',offset:[2,-1366],action:{type:'encapsulate',options:{pre:"* ",periMsg:'wikieditor-toolbar-tool-ulist-example',post:"",ownline:true}}},'olist':{labelMsg:'wikieditor-toolbar-tool-olist',type:'button',icon:'format-olist.png',offset:[2,-1078],action:{type:'encapsulate',options:{pre:"# ",periMsg:'wikieditor-toolbar-tool-olist-example',post:"",ownline:true}}},'indent':{labelMsg:'wikieditor-toolbar-tool-indent',type:'button',icon:'format-indent.png',offset:[2,-646],action:{type:'encapsulate',options:{pre:":",periMsg:'wikieditor-toolbar-tool-indent-example',post:"",ownline:true,splitlines:true}}},'nowiki':{labelMsg:'wikieditor-toolbar-tool-nowiki',type:'button',icon:'insert-nowiki.png',offset:[-70,-70],action:{type:'encapsulate',options:{pre:"<nowiki>",periMsg:'wikieditor-toolbar-tool-nowiki-example',post:"</nowiki>"}}},'newline':{labelMsg:'wikieditor-toolbar-tool-newline',type:'button',icon:'insert-newline.png',offset:[2,-1726],action:{type:'encapsulate',options:{pre:"<br />\n"}}}}},'size':{tools:{'big':{labelMsg:'wikieditor-toolbar-tool-big',type:'button',icon:'format-big.png',offset:[2,2],action:{type:'encapsulate',options:{pre:"<big>",periMsg:'wikieditor-toolbar-tool-big-example',post:"</big>"}}},'small':{labelMsg:'wikieditor-toolbar-tool-small',type:'button',icon:'format-small.png',offset:[2,-1150],action:{type:'encapsulate',options:{pre:"<small>",periMsg:'wikieditor-toolbar-tool-small-example',post:"</small>"}}},'superscript':{labelMsg:'wikieditor-toolbar-tool-superscript',type:'button',icon:'format-superscript.png',offset:[2,-1294],action:{type:'encapsulate',options:{pre:"<sup>",periMsg:'wikieditor-toolbar-tool-superscript-example',post:"</sup>"}}},'subscript':{labelMsg:'wikieditor-toolbar-tool-subscript',type:'button',icon:'format-subscript.png',offset:[2,-1222],action:{type:'encapsulate',options:{pre:"<sub>",periMsg:'wikieditor-toolbar-tool-subscript-example',post:"</sub>"}}}}},'insert':{labelMsg:'wikieditor-toolbar-group-insert',tools:{'gallery':{labelMsg:'wikieditor-toolbar-tool-gallery',type:'button',icon:'insert-gallery.png',offset:[2,-1510],action:{type:'encapsulate',options:{pre:"<gallery>\n",periMsg:'wikieditor-toolbar-tool-gallery-example',post:"\n</gallery>",ownline:true}}},'tableCGD':{labelMsg:'wikieditor-toolbar-tool-table',type:'button',icon:'insert-table.png',offset:[2,-1942],filters:['#wpTextbox1.toolbar-dialogs'],action:{type:'dialog',module:'insert-table'}},'table':{labelMsg:'wikieditor-toolbar-tool-table',type:'button',icon:'insert-table.png',offset:[2,-1942],filters:['#wpTextbox1:not(.toolbar-dialogs)'],action:{type:'encapsulate',options:{pre:"{| class=\"wikitable\" border=\"1\"\n|",periMsg:'wikieditor-toolbar-tool-table-example-old',post:"\n|}",ownline:true}}},'redirect':{labelMsg:'wikieditor-toolbar-tool-redirect',type:'button',icon:'insert-redirect.png',offset:[-70,-142],action:{type:'encapsulate',options:{pre:"#REDIRECT [[",periMsg:'wikieditor-toolbar-tool-redirect-example',post:"]]",ownline:true}}}}},'search':{tools:{'replace':{labelMsg:'wikieditor-toolbar-tool-replace',type:'button',icon:'search-replace.png',offset:[-70,-214],filters:['#wpTextbox1.toolbar-dialogs'],action:{type:'dialog',module:'search-and-replace'}}}}}},'characters':{labelMsg:'wikieditor-toolbar-section-characters',type:'booklet',deferLoad:true,pages:{'latin':{'labelMsg':'wikieditor-toolbar-characters-page-latin','layout':'characters','characters':["\u00c1","\u00e1","\u00c0","\u00e0","\u00c2","\u00e2","\u00c4","\u00e4","\u00c3","\u00e3","\u01cd","\u01ce","\u0100","\u0101","\u0102","\u0103","\u0104","\u0105","\u00c5","\u00e5","\u0106","\u0107","\u0108","\u0109","\u00c7","\u00e7","\u010c","\u010d","\u010a","\u010b","\u0110","\u0111","\u010e","\u010f","\u00c9","\u00e9","\u00c8","\u00e8","\u00ca","\u00ea","\u00cb","\u00eb","\u011a","\u011b","\u0112","\u0113","\u0114","\u0115","\u0116","\u0117","\u0118","\u0119","\u011c","\u011d","\u0122","\u0123","\u011e","\u011f","\u0120","\u0121","\u0124","\u0125","\u0126","\u0127","\u00cd","\u00ed","\u00cc","\u00ec","\u00ce","\u00ee","\u00cf","\u00ef","\u0128","\u0129","\u01cf","\u01d0","\u012a","\u012b","\u012c","\u012d","\u0130","\u0131","\u012e","\u012f","\u0134","\u0135","\u0136","\u0137","\u0139","\u013a","\u013b","\u013c","\u013d","\u013e","\u0141","\u0142","\u013f","\u0140","\u0143","\u0144","\u00d1","\u00f1","\u0145","\u0146","\u0147","\u0148","\u00d3","\u00f3","\u00d2","\u00f2","\u00d4","\u00f4","\u00d6","\u00f6","\u00d5","\u00f5","\u01d1","\u01d2","\u014c","\u014d","\u014e","\u014f","\u01ea","\u01eb","\u0150","\u0151","\u0154","\u0155","\u0156","\u0157","\u0158","\u0159","\u015a","\u015b","\u015c","\u015d","\u015e","\u015f","\u0160","\u0161","\u0162","\u0163","\u0164","\u0165","\u00da","\u00fa","\u00d9","\u00f9","\u00db","\u00fb","\u00dc","\u00fc","\u0168","\u0169","\u016e","\u016f","\u01d3","\u01d4","\u016a","\u016b","\u01d6","\u01d8","\u01da","\u01dc","\u016c","\u016d","\u0172","\u0173","\u0170","\u0171","\u0174","\u0175","\u00dd","\u00fd","\u0176","\u0177","\u0178","\u00ff","\u0232","\u0233","\u0179","\u017a","\u017d","\u017e","\u017b","\u017c","\u00c6","\u00e6","\u01e2","\u01e3","\u00d8","\u00f8","\u0152","\u0153","\u00df","\u00f0","\u00de","\u00fe","\u018f","\u0259"]},'latinextended':{'labelMsg':'wikieditor-toolbar-characters-page-latinextended','layout':'characters','characters':["\u1e00","\u1e01","\u1e9a","\u1ea0","\u1ea1","\u1ea2","\u1ea3","\u1ea4","\u1ea5","\u1ea6","\u1ea7","\u1ea8","\u1ea9","\u1eaa","\u1eab","\u1eac","\u1ead","\u1eae","\u1eaf","\u1eb0","\u1eb1","\u1eb2","\u1eb3","\u1eb4","\u1eb5","\u1eb6","\u1eb7","\u1e02","\u1e03","\u1e04","\u1e05","\u1e06","\u1e07","\u1e08","\u1e09","\u1e0a","\u1e0b","\u1e0c","\u1e0d","\u1e0e","\u1e0f","\u1e10","\u1e11","\u1e12","\u1e13","\u1e14","\u1e15","\u1e16","\u1e17","\u1e18","\u1e19","\u1e1a","\u1e1b","\u1e1c","\u1e1d","\u1eb8","\u1eb9","\u1eba","\u1ebb","\u1ebc","\u1ebd","\u1ebe","\u1ebf","\u1ec0","\u1ec1","\u1ec2","\u1ec3","\u1ec4","\u1ec5","\u1ec6","\u1ec7","\u1e1e","\u1e1f","\u1e20","\u1e21","\u1e22","\u1e23","\u1e24","\u1e25","\u1e26","\u1e27","\u1e28","\u1e29","\u1e2a","\u1e2b","\u1e96","\u1e2c","\u1e2d","\u1e2e","\u1e2f","\u1ec8","\u1ec9","\u1eca","\u1ecb","\u1e30","\u1e31","\u1e32","\u1e33","\u1e34","\u1e35","\u1e36","\u1e37","\u1e38","\u1e39","\u1e3a","\u1e3b","\u1e3c","\u1e3d","\u1efa","\u1efb","\u1e3e","\u1e3f","\u1e40","\u1e41","\u1e42","\u1e43","\u1e44","\u1e45","\u1e46","\u1e47","\u1e48","\u1e49","\u1e4a","\u1e4b","\u1e4c","\u1e4d","\u1e4e","\u1e4f","\u1e50","\u1e51","\u1e52","\u1e53","\u1ecc","\u1ecd","\u1ece","\u1ecf","\u1ed0","\u1ed1","\u1ed2","\u1ed3","\u1ed4","\u1ed5","\u1ed6","\u1ed7","\u1ed8","\u1ed9","\u1eda","\u1edb","\u1edc","\u1edd","\u1ede","\u1edf","\u1ee0","\u1ee1","\u1ee2","\u1ee3","\u1e54","\u1e55","\u1e56","\u1e57","\u1e58","\u1e59","\u1e5a","\u1e5b","\u1e5c","\u1e5d","\u1e5e","\u1e5f","\u1e60","\u1e61","\u1e9b","\u1e62","\u1e63","\u1e64","\u1e65","\u1e66","\u1e67","\u1e68","\u1e69","\u1e9c","\u1e9d","\u1e6a","\u1e6b","\u1e6c","\u1e6d","\u1e6e","\u1e6f","\u1e70","\u1e71","\u1e97","\u1e72","\u1e73","\u1e74","\u1e75","\u1e76","\u1e77","\u1e78","\u1e79","\u1e7a","\u1e7b","\u1ee4","\u1ee5","\u1ee6","\u1ee7","\u1ee8","\u1ee9","\u1eea","\u1eeb","\u1eec","\u1eed","\u1eee","\u1eef","\u1ef0","\u1ef1","\u1e7c","\u1e7d","\u1e7e","\u1e7f","\u1efc","\u1efd","\u1e80","\u1e81","\u1e82","\u1e83","\u1e84","\u1e85","\u1e86","\u1e87","\u1e88","\u1e89","\u1e98","\u1e8a","\u1e8b","\u1e8c","\u1e8d","\u1e8e","\u1e8f","\u1e99","\u1ef2","\u1ef3","\u1ef4","\u1ef5","\u1ef6","\u1ef7","\u1ef8","\u1ef9","\u1efe","\u1eff","\u1e90","\u1e91","\u1e92","\u1e93","\u1e94","\u1e95","\u1e9e","\u1e9f"]},'ipa':{labelMsg:'wikieditor-toolbar-characters-page-ipa',layout:'characters',characters:["p","t\u032a","t","\u0288","c","k","q","\u02a1","\u0294","b","d\u032a","d","\u0256","\u025f","\u0261","\u0262","\u0253","\u0257","\u0284","\u0260","\u029b","t\u0361s","t\u0361\u0283","t\u0361\u0255","d\u0361z","d\u0361\u0292","d\u0361\u0291","\u0278","f","\u03b8","s","\u0283","\u0285","\u0286","\u0282","\u0255","\u00e7","\u0267","x","\u03c7","\u0127","\u029c","h","\u03b2","v","\u028d","\u00f0","z","\u0292","\u0293","\u0290","\u0291","\u029d","\u0263","\u0281","\u0295","\u0296","\u02a2","\u0266","\u026c","\u026e","m","m\u0329","\u0271","\u0271\u0329","\u0271\u030d","n\u032a","n\u032a\u030d","n","n\u0329","\u0273","\u0273\u0329","\u0272","\u0272\u0329","\u014b","\u014b\u030d","\u014b\u0329","\u0274","\u0274\u0329","\u0299","\u0299\u0329","r","r\u0329","\u0280","\u0280\u0329","\u027e","\u027d","\u027f","\u027a","l\u032a","l\u032a\u0329","l","l\u0329","\u026b","\u026b\u0329","\u026d","\u026d\u0329","\u028e","\u028e\u0329","\u029f","\u029f\u0329","w","\u0265","\u028b","\u0279","\u027b","j","\u0270","\u0298","\u01c2","\u01c0","!","\u01c1","\u02b0","\u02b1","\u02b7","\u02b8","\u02b2","\u02b3","\u207f","\u02e1","\u02b4","\u02b5","\u02e2","\u02e3","\u02e0","\u02b6","\u02e4","\u02c1","\u02c0","\u02bc","i","i\u032f","\u0129","y","y\u032f","\u1ef9","\u026a","\u026a\u032f","\u026a\u0303","\u028f","\u028f\u032f","\u028f\u0303","\u0268","\u0268\u032f","\u0268\u0303","\u0289","\u0289\u032f","\u0289\u0303","\u026f","\u026f\u032f","\u026f\u0303","u","u\u032f","\u0169","\u028a","\u028a\u032f","\u028a\u0303","e","e\u032f","\u1ebd","\u00f8","\u00f8\u032f","\u00f8\u0303","\u0258","\u0258\u032f","\u0258\u0303","\u0275","\u0275\u032f","\u0275\u0303","\u0264","\u0264\u032f","\u0264\u0303","o","o\u032f","\u00f5","\u025b","\u025b\u032f","\u025b\u0303","\u0153","\u0153\u032f","\u0153\u0303","\u025c","\u025c\u032f","\u025c\u0303","\u0259","\u0259\u032f","\u0259\u0303","\u025e","\u025e\u032f","\u025e\u0303","\u028c","\u028c\u032f","\u028c\u0303","\u0254","\u0254\u032f","\u0254\u0303","\u00e6","\u00e6\u032f","\u00e6\u0303","\u0276","\u0276\u032f","\u0276\u0303","a","a\u032f","\u00e3","\u0250","\u0250\u032f","\u0250\u0303","\u0251","\u0251\u032f","\u0251\u0303","\u0252","\u0252\u032f","\u0252\u0303","\u02c8","\u02cc","\u02d0","\u02d1","\u02d8",".","\u203f","|","\u2016"]},'symbols':{'labelMsg':'wikieditor-toolbar-characters-page-symbols','layout':'characters','characters':["~","|","\u00a1","\u00bf","\u2020","\u2021","\u2194","\u2191","\u2193","\u2022","\u00b6","#","\u00bd","\u2153","\u2154","\u00bc","\u00be","\u215b","\u215c","\u215d","\u215e","\u221e","\u2018","\u201e","\u201c","\u2019","\u201d",{'label':"\u00ab\u00bb",'action':{'type':'encapsulate','options':{'pre':"\u00ab",'post':"\u00bb"}}},"\u00a4","\u20b3","\u0e3f","\u20b5","\u00a2","\u20a1","\u20a2","$","\u20ab","\u20af","\u20ac","\u20a0","\u20a3","\u0192","\u20b4","\u20ad","\u20a4","\u2133","\u20a5","\u20a6","\u2116","\u20a7","\u20b0","\u00a3","\u17db","\u20a8","\u20aa","\u09f3","\u20ae","\u20a9","\u00a5","\u2660","\u2663","\u2665","\u2666","m\u00b2","m\u00b3","\u2013","\u2014","\u2026","\u2018","\u201c","\u2019","\u201d","\u00b0","\u2033","\u2032","\u2248","\u2260","\u2264","\u2265","\u00b1","\u2212","\u00d7","\u00f7","\u2190","\u2192","\u00b7","\u00a7"]},'greek':{'labelMsg':'wikieditor-toolbar-characters-page-greek','layout':'characters','language':'hl','characters':["\u0391","\u0386","\u03b1","\u03ac","\u0392","\u03b2","\u0393","\u03b3","\u0394","\u03b4","\u0395","\u0388","\u03b5","\u03ad","\u0396","\u03b6","\u0397","\u0389","\u03b7","\u03ae","\u0398","\u03b8","\u0399","\u038a","\u03b9","\u03af","\u039a","\u03ba","\u039b","\u03bb","\u039c","\u03bc","\u039d","\u03bd","\u039e","\u03be","\u039f","\u038c","\u03bf","\u03cc","\u03a0","\u03c0","\u03a1","\u03c1","\u03a3","\u03c3","\u03c2","\u03a4","\u03c4","\u03a5","\u038e","\u03c5","\u03cd","\u03a6","\u03c6","\u03a7","\u03c7","\u03a8","\u03c8","\u03a9","\u038f","\u03c9","\u03ce"]},'cyrillic':{'labelMsg':'wikieditor-toolbar-characters-page-cyrillic','layout':'characters','characters':["\u0410","\u0430","\u04d8","\u04d9","\u0411","\u0431","\u0412","\u0432","\u0413","\u0433","\u0490","\u0491","\u0403","\u0453","\u0492","\u0493","\u0414","\u0434","\u0402","\u0452","\u0415","\u0435","\u0404","\u0454","\u0401","\u0451","\u0416","\u0436","\u0417","\u0437","\u0405","\u0455","\u0418","\u0438","\u0406","\u0456","\u0407","\u0457","\u0130","\u0419","\u0439","\u04e2","\u04e3","\u0408","\u0458","\u041a","\u043a","\u040c","\u045c","\u049a","\u049b","\u041b","\u043b","\u0409","\u0459","\u041c","\u043c","\u041d","\u043d","\u040a","\u045a","\u04a2","\u04a3","\u041e","\u043e","\u04e8","\u04e9","\u041f","\u043f","\u0420","\u0440","\u0421","\u0441","\u0422","\u0442","\u040b","\u045b","\u0423","\u0443","\u040e","\u045e","\u04ee","\u04ef","\u04b0","\u04b1","\u04ae","\u04af","\u0424","\u0444","\u0425","\u0445","\u04b2","\u04b3","\u04ba","\u04bb","\u0426","\u0446","\u0427","\u0447","\u04b6","\u04b7","\u040f","\u045f","\u0428","\u0448","\u0429","\u0449","\u042a","\u044a","\u042b","\u044b","\u042c","\u044c","\u042d","\u044d","\u042e","\u044e","\u042f","\u044f"]},'arabic':{'labelMsg':'wikieditor-toolbar-characters-page-arabic','layout':'characters','language':'ar','direction':'rtl','characters':["\u061b","\u061f","\u0621","\u0622","\u0623","\u0624","\u0625","\u0626","\u0627","\u0628","\u0629","\u062a","\u062b","\u062c","\u062d","\u062e","\u062f","\u0630","\u0631","\u0632","\u0633","\u0634","\u0635","\u0636","\u0637","\u0638","\u0639","\u063a","\u0641","\u0642","\u0643","\u0644","\u0645","\u0646","\u0647","\u0648","\u0649","\u064a","\u060c","\u067e","\u0686","\u0698","\u06af","\u06ad"]},'hebrew':{'labelMsg':'wikieditor-toolbar-characters-page-hebrew','layout':'characters','direction':'rtl','characters':["\u05d0","\u05d1","\u05d2","\u05d3","\u05d4","\u05d5","\u05d6","\u05d7","\u05d8","\u05d9","\u05db","\u05da","\u05dc","\u05de","\u05dd","\u05e0","\u05df","\u05e1","\u05e2","\u05e4","\u05e3","\u05e6","\u05e5","\u05e7","\u05e8","\u05e9","\u05ea","\u05f3","\u05f4","\u05f0","\u05f1","\u05f2","\u05d0","\u05d3","\u05d4","\u05d5","\u05d6","\u05d7","\u05d8","\u05d9","\u05da","\u05db","\u05dc","\u05dd","\u05de","\u05df","\u05e0","\u05e1","\u05e2","\u05e3","\u05e4","\u05be","\u05f3","\u05f4",["\u05b0\u25cc","\u05b0"],["\u05b1\u25cc","\u05b1"],["\u05b2\u25cc","\u05b2"],["\u05b3\u25cc","\u05b3"],["\u05b4\u25cc","\u05b4"],["\u05b5\u25cc","\u05b5"],["\u05b6\u25cc","\u05b6"],["\u05b7\u25cc","\u05b7"],["\u05b8\u25cc","\u05b8"],["\u05b9\u25cc","\u05b9"],["\u05bb\u25cc","\u05bb"],["\u05bc\u25cc","\u05bc"],["\u05c1\u25cc","\u05c1"],["\u05c2\u25cc","\u05c2"],["\u05c7\u25cc","\u05c7"],["\u0591\u25cc","\u0591"],["\u0592\u25cc","\u0592"],["\u0593\u25cc","\u0593"],["\u0594\u25cc","\u0594"],["\u0595\u25cc","\u0595"],["\u0596\u25cc","\u0596"],["\u0597\u25cc","\u0597"],["\u0598\u25cc","\u0598"],["\u0599\u25cc","\u0599"],["\u059a\u25cc","\u059a"],["\u059b\u25cc","\u059b"],["\u059c\u25cc","\u059c"],["\u059d\u25cc","\u059d"],["\u059e\u25cc","\u059e"],["\u059f\u25cc","\u059f"],["\u05a0\u25cc","\u05a0"],["\u05a1\u25cc","\u05a1"],["\u05a2\u25cc","\u05a2"],["\u05a3\u25cc","\u05a3"],["\u05a4\u25cc","\u05a4"],["\u05a5\u25cc","\u05a5"],["\u05a6\u25cc","\u05a6"],["\u05a7\u25cc","\u05a7"],["\u05a8\u25cc","\u05a8"],["\u05a9\u25cc","\u05a9"],["\u05aa\u25cc","\u05aa"],["\u05ab\u25cc","\u05ab"],["\u05ac\u25cc","\u05ac"],["\u05ad\u25cc","\u05ad"],["\u05ae\u25cc","\u05ae"],["\u05af\u25cc","\u05af"],["\u05bf\u25cc","\u05bf"],["\u05c0\u25cc","\u05c0"],["\u05c3\u25cc","\u05c3"]]},'bangla':{'labelMsg':'wikieditor-toolbar-characters-page-bangla','language':'bn','layout':'characters','characters':["\u0985","\u0986","\u0987","\u0988","\u0989","\u098a","\u098b","\u098f","\u0990","\u0993","\u0994","\u09be","\u09bf","\u09c0","\u09c1","\u09c2","\u09c3","\u09c7","\u09c8","\u09cb","\u09cc","\u0995","\u0996","\u0997","\u0998","\u0999","\u099a","\u099b","\u099c","\u099d","\u099e","\u099f","\u09a0","\u09a1","\u09a2","\u09a3","\u09a4","\u09a5","\u09a6","\u09a7","\u09a8","\u09aa","\u09ab","\u09ac","\u09ad","\u09ae","\u09af","\u09b0","\u09b2","\u09b6","\u09b7","\u09b8","\u09b9","\u09a1\u09bc","\u09a2\u09bc","\u09af\u09bc","\u09ce","\u0982","\u0983","\u0981","\u09cd","\u09e7","\u09e8","\u09e9","\u09ea","\u09eb","\u09ec","\u09ed","\u09ee","\u09ef","\u09e6"]},'telugu':{'labelMsg':'wikieditor-toolbar-characters-page-telugu','language':'te','layout':'characters','characters':["\u0c01","\u0c02","\u0c03","\u0c05","\u0c06","\u0c07","\u0c08","\u0c09","\u0c0a","\u0c0b","\u0c60","\u0c0c","\u0c61","\u0c0e","\u0c0f","\u0c10","\u0c12","\u0c13","\u0c14","\u0c15","\u0c16","\u0c17","\u0c18","\u0c19","\u0c1a","\u0c1b","\u0c1c","\u0c1d","\u0c1e","\u0c1f","\u0c20","\u0c21","\u0c22","\u0c23","\u0c24","\u0c25","\u0c26","\u0c27","\u0c28","\u0c2a","\u0c2b","\u0c2c","\u0c2d","\u0c2e","\u0c2f","\u0c30","\u0c31","\u0c32","\u0c33","\u0c35","\u0c36","\u0c37","\u0c38","\u0c39","\u0c3e","\u0c3f","\u0c40","\u0c41","\u0c42","\u0c43","\u0c44","\u0c46","\u0c47","\u0c48","\u0c4a","\u0c4b","\u0c4c","\u0c4d","\u0c62","\u0c63","\u0c58","\u0c59","\u0c66","\u0c67","\u0c68","\u0c69","\u0c6a","\u0c6b","\u0c6c","\u0c6d","\u0c6e","\u0c6f","\u0c3d","\u0c78","\u0c79","\u0c7a","\u0c7b","\u0c7c","\u0c7d","\u0c7e","\u0c7f"]},'sinhala':{'labelMsg':'wikieditor-toolbar-characters-page-sinhala','language':'si','layout':'characters','characters':["\u0d85","\u0d86","\u0d87","\u0d88","\u0d89","\u0d8a","\u0d8b","\u0d8c","\u0d8d","\u0d8e","\u0d8f","\u0d90","\u0d91","\u0d92","\u0d93","\u0d94","\u0d95","\u0d96","\u0d9a","\u0d9b","\u0d9c","\u0d9d","\u0d9e","\u0d9f","\u0da0","\u0da1","\u0da2","\u0da3","\u0da4","\u0da5","\u0da6","\u0da7","\u0da8","\u0da9","\u0daa","\u0dab","\u0dac","\u0dad","\u0dae","\u0daf","\u0db0","\u0db1","\u0db3","\u0db4","\u0db5","\u0db6","\u0db7","\u0db8","\u0db9","\u0dba","\u0dbb","\u0dbd","\u0dc0","\u0dc1","\u0dc2","\u0dc3","\u0dc4","\u0dc5","\u0dc6",["\u25cc\u0dcf","\u0dcf"],["\u25cc\u0dd0","\u0dd0"],["\u25cc\u0dd1","\u0dd1"],["\u25cc\u0dd2","\u0dd2"],["\u25cc\u0dd3","\u0dd3"],["\u25cc\u0dd4","\u0dd4"],["\u25cc\u0dd6","\u0dd6"],["\u25cc\u0dd8","\u0dd8"],["\u25cc\u0df2","\u0df2"],["\u25cc\u0ddf","\u0ddf"],["\u25cc\u0df3","\u0df3"],["\u25cc\u0dd9","\u0dd9"],["\u25cc\u0dda","\u0dda"],["\u25cc\u0ddc","\u0ddc"],["\u25cc\u0ddd","\u0ddd"],["\u25cc\u0dde","\u0dde"],["\u25cc\u0dca","\u0dca"]]},'gujarati':{'labelMsg':'wikieditor-toolbar-characters-page-gujarati','language':'gu','layout':'characters','characters':["\u0ad0","\u0a85","\u0a86","\u0a87","\u0a88","\u0a89","\u0a8a","\u0a8b","\u0ae0","\u0a8c","\u0ae1","\u0a8d","\u0a8f","\u0a90","\u0a91","\u0a93","\u0a94","\u0a95","\u0a96","\u0a97","\u0a98","\u0a99","\u0a9a","\u0a9b","\u0a9c","\u0a9d","\u0a9e","\u0a9f","\u0aa0","\u0aa1","\u0aa2","\u0aa3","\u0aa4","\u0aa5","\u0aa6","\u0aa7","\u0aa8","\u0aaa","\u0aab","\u0aac","\u0aad","\u0aae","\u0aaf","\u0ab0","\u0ab2","\u0ab5","\u0ab6","\u0ab7","\u0ab8","\u0ab9","\u0ab3","\u0abd",["\u25cc\u0abe","\u0abe"],["\u25cc\u0abf","\u0abf"],["\u25cc\u0ac0","\u0ac0"],["\u25cc\u0ac1","\u0ac1"],["\u25cc\u0ac2","\u0ac2"],["\u25cc\u0ac3","\u0ac3"],["\u25cc\u0ac4","\u0ac4"],["\u25cc\u0ae2","\u0ae2"],["\u25cc\u0ae3","\u0ae3"],["\u25cc\u0ac5","\u0ac5"],["\u25cc\u0ac7","\u0ac7"],["\u25cc\u0ac8","\u0ac8"],["\u25cc\u0ac9","\u0ac9"],["\u25cc\u0acb","\u0acb"],["\u25cc\u0acc","\u0acc"],["\u25cc\u0acd","\u0acd"]]}}},'help':{labelMsg:'wikieditor-toolbar-section-help',type:'booklet',deferLoad:true,pages:{'format':{labelMsg:'wikieditor-toolbar-help-page-format',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-italic-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-italic-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-italic-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-bold-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-bold-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-bold-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-bolditalic-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-bolditalic-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-bolditalic-result'}}]},'link':{labelMsg:'wikieditor-toolbar-help-page-link',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-ilink-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-ilink-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-ilink-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-xlink-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-xlink-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-xlink-result'}}]},'heading':{labelMsg:'wikieditor-toolbar-help-page-heading',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-heading1-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-heading1-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-heading1-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-heading2-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-heading2-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-heading2-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-heading3-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-heading3-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-heading3-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-heading4-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-heading4-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-heading4-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-heading5-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-heading5-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-heading5-result'}}]},'list':{labelMsg:'wikieditor-toolbar-help-page-list',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-ulist-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-ulist-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-ulist-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-olist-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-olist-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-olist-result'}}]},'file':{labelMsg:'wikieditor-toolbar-help-page-file',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-file-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-file-syntax'},'result':{htmlMsg:['wikieditor-toolbar-help-content-file-result',stylepath]}}]},'reference':{labelMsg:'wikieditor-toolbar-help-page-reference',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-reference-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-reference-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-reference-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-rereference-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-rereference-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-rereference-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-showreferences-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-showreferences-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-showreferences-result'}}]},'discussion':{labelMsg:'wikieditor-toolbar-help-page-discussion',layout:'table',headings:[{textMsg:'wikieditor-toolbar-help-heading-description'},{textMsg:'wikieditor-toolbar-help-heading-syntax'},{textMsg:'wikieditor-toolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'wikieditor-toolbar-help-content-signaturetimestamp-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-signaturetimestamp-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-signaturetimestamp-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-signature-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-signature-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-signature-result'}},{'description':{htmlMsg:'wikieditor-toolbar-help-content-indent-description'},'syntax':{htmlMsg:'wikieditor-toolbar-help-content-indent-syntax'},'result':{htmlMsg:'wikieditor-toolbar-help-content-indent-result'}}]}}}},'dialogs':{'insert-link':{filters:['#wpTextbox1.toolbar-dialogs'],titleMsg:'wikieditor-toolbar-tool-link-title',id:'wikieditor-toolbar-link-dialog',html:'\
    <fieldset>\
     <div class="wikieditor-toolbar-field-wrapper">\
      <label for="wikieditor-toolbar-link-int-target" rel="wikieditor-toolbar-tool-link-int-target" id="wikieditor-toolbar-tool-link-int-target-label"></label>\
@@ -68,7 +68,7 @@
 insertText=escTarget;else if(text=='')
 insertText='['+escTarget+']';else
 insertText='['+escTarget+' '+escText+']';}
-if(whitespace)insertText=whitespace[0]+insertText+whitespace[1];$j(this).dialog('close');$j.wikiEditor.modules.toolbar.fn.doAction($j(this).data('context'),{type:'replace',options:{pre:insertText}},$j(this));$j('#wikieditor-toolbar-link-int-target, #wikieditor-toolbar-link-int-text').val('');$j('#wikieditor-toolbar-link-type-int, #wikieditor-toolbar-link-type-ext').attr('checked','');},'wikieditor-toolbar-tool-link-cancel':function(){var context=$j(this).data('context');context.fn.restoreStuffForIE();$j(this).dialog('close');}},open:function(){$j(this).data('articlePathRegex',new RegExp('^'+RegExp.escape(wgServer+wgArticlePath).replace(/\\\$1/g,'(.*)')+'$'));var context=$j(this).data('context');context.fn.restoreStuffForIE();context.fn.saveStuffForIE();var selection=context.$textarea.textSelection('getSelection');$j('#wikieditor-toolbar-link-int-target').focus();$j('#wikieditor-toolbar-link-int-target').change();$j('#wikieditor-toolbar-link-dialog').data('whitespace',['','']);if(selection!=''){var target,text,type;var matches;if((matches=selection.match(/^(\s*)\[\[([^\]\|]+)(\|([^\]\|]*))?\]\](\s*)$/))){target=matches[2];text=(matches[4]?matches[4]:matches[2]);type='int';$j('#wikieditor-toolbar-link-dialog').data('whitespace',[matches[1],matches[5]]);}else if((matches=selection.match(/^(\s*)\[([^\] ]+)( ([^\]]+))?\](\s*)$/))){target=matches[2];text=(matches[4]?matches[4]:'');type='ext';$j('#wikieditor-toolbar-link-dialog').data('whitespace',[matches[1],matches[5]]);}else{target=text=selection;}
+if(whitespace)insertText=whitespace[0]+insertText+whitespace[1];$j(this).dialog('close');$j.wikiEditor.modules.toolbar.fn.doAction($j(this).data('context'),{type:'replace',options:{pre:insertText}},$j(this));$j('#wikieditor-toolbar-link-int-target, #wikieditor-toolbar-link-int-text').val('');$j('#wikieditor-toolbar-link-type-int, #wikieditor-toolbar-link-type-ext').attr('checked','');},'wikieditor-toolbar-tool-link-cancel':function(){var context=$j(this).data('context');context.fn.restoreStuffForIE();$j(this).dialog('close');}},open:function(){$j(this).data('articlePathRegex',new RegExp('^'+RegExp.escape(wgServer+wgArticlePath).replace(/\\\$1/g,'(.*)')+'$'));var context=$j(this).data('context');context.fn.restoreStuffForIE();context.fn.saveStuffForIE();var selection=context.$textarea.textSelection('getSelection');$j('#wikieditor-toolbar-link-int-target').focus();$j('#wikieditor-toolbar-link-int-target').change();$j('#wikieditor-toolbar-link-dialog').data('whitespace',['','']);if(selection!=''){var target,text,type;var matches;if((matches=selection.match(/^(\s*)\[\[([^\]\|]+)(\|([^\]\|]*))?\]\](\s*)$/))){target=matches[2];text=(matches[4]?matches[4]:matches[2]);type='int';$j('#wikieditor-toolbar-link-dialog').data('whitespace',[matches[1],matches[5]]);}else if((matches=selection.match(/^(\s*)\[([^\] ]+)( ([^\]]+))?\](\s*)$/))){target=matches[2];text=(matches[4]?matches[4]:'');type='ext';$j('#wikieditor-toolbar-link-dialog').data('whitespace',[matches[1],matches[5]]);}else{target=text=$j.trim(selection);if(target.length<selection.length){$j('#wikieditor-toolbar-link-dialog').data('whitespace',[selection.substr(0,selection.indexOf(target.charAt(0))),selection.substr(selection.lastIndexOf(target.charAt(target.length-1))+1)]);}}
 if(typeof text!='undefined')
 $j('#wikieditor-toolbar-link-int-text').val(text).change();if(typeof target!='undefined')
 $j('#wikieditor-toolbar-link-int-target').val(target).change();if(typeof type!='undefined')

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -16,16 +16,16 @@
 			array( 'src' => 'Modules/Preview/Preview.js', 'version' => 6 ),
 			array( 'src' => 'Modules/Publish/Publish.js', 'version' => 6 ),
 			array( 'src' => 'Modules/Toc/Toc.js', 'version' => 7 ),
-			array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 89 ),
+			array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 93 ),
 			array( 'src' => 'Modules/TemplateEditor/TemplateEditor.js', 'version' => 6 ),
 			array( 'src' => 'Modules/Templates/Templates.js', 'version' => 1 ),
 			array( 'src' => 'Modules/AddMediaWizard/AddMediaWizard.js', 'version' => 6 ),
 		),
 		'combined' => array(
-			array( 'src' => 'WikiEditor.combined.js', 'version' => 94 ),
+			array( 'src' => 'WikiEditor.combined.js', 'version' => 99 ),
 		),
 		'minified' => array(
-			array( 'src' => 'WikiEditor.combined.min.js', 'version' => 94 ),
+			array( 'src' => 'WikiEditor.combined.min.js', 'version' => 99 ),
 		),
 	);
 	static $messages = array(
@@ -443,15 +443,11 @@
 				basename( dirname( __FILE__ ) ) . '/' . $script['src'], $script['version']
 			);
 		}
-		// Preferences (maybe the UsabilityInitiative class could do most of this for us?)
-		$wgOut->addScript(
-			Xml::tags(
-				'script',
-				array( 'type' => $wgJsMimeType ),
-				'var wgWikiEditorPreferences = ' . FormatJson::encode( $preferences, true ) . ";\n" .
-				'var wgWikiEditorEnabledModules = ' . FormatJson::encode( $enabledModules, true ) . ';'
-			)
-		);
+		// Preferences
+		UsabilityInitiativeHooks::addVariables( array(
+			'wgWikiEditorPreferences' => $preferences,
+			'wgWikiEditorEnabledModules' => $enabledModules,
+		) );
 		return true;
 	}
 	

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.i18n.php	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.i18n.php	2010-06-09 19:16:16 UTC (rev 67746)
@@ -40,6 +40,16 @@
 	'wikieditor-wikitext-tab' => 'Wikiteks',
 );+/** Gheg Albanian (Gegë)
+ * @author Mdupont
+ */
+$messages['aln'] = array(
+	'wikieditor' => 'redaktimi i avancuar wikitext interface',
+	'wikieditor-desc' => 'Siguron një ndërfaqe të vazhdohet redaktimi wikitext dhe module shumë me metrazh të siguruar',
+	'wikieditor-wikitext-tab' => 'Wikitext',
+	'wikieditor-loading' => 'Ngarkim',
+);
+
 /** Arabic (العربية)
  * @author Meno25
  * @author OsamaK
@@ -78,6 +88,7 @@
  */
 $messages['bg'] = array(
 	'wikieditor' => 'Подобрен интерфейс за редактиране на уикитекст',
+	'wikieditor-desc' => 'Предлага разширяем интерфейс за редактиране на уикитекст и множество модули с допълнителни функционалности',
 	'wikieditor-wikitext-tab' => 'Уикитекст',
 	'wikieditor-loading' => 'Зареждане',
 );
@@ -114,12 +125,23 @@
 /** Catalan (Català)
  * @author Paucabot
  * @author Solde
+ * @author Vriullop
  */
 $messages['ca'] = array(
+	'wikieditor' => 'Interfície avançada de modificació de wikitext',
+	'wikieditor-desc' => 'Proporciona una interfície extensible de modificació de wikitext i diversos mòduls de funcionalitats',
 	'wikieditor-wikitext-tab' => 'Wikitext',
 	'wikieditor-loading' => 'Carregant',
 );+/** Chechen (Нохчийн)
+ * @author Sasan700
+ */
+$messages['ce'] = array(
+	'wikieditor-wikitext-tab' => 'Викийоза',
+	'wikieditor-loading' => 'Чуйолуш',
+);
+
 /** Czech (Česky)
  * @author Mormegil
  */
@@ -148,7 +170,7 @@
  */
 $messages['de'] = array(
 	'wikieditor' => 'Fortgeschrittener Wikitext-Editor',
-	'wikieditor-desc' => 'Stellt eine erweiterbare Oberfläche zur Wikitext-Bearbeitung sowie weitere funktionelle Module zur Verfügung',
+	'wikieditor-desc' => 'Erweiterbare Oberfläche zur Wikitext-Bearbeitung sowie viele weitere neue Funktionen',
 	'wikieditor-wikitext-tab' => 'Wikitext',
 	'wikieditor-loading' => 'Lade',
 );
@@ -223,6 +245,17 @@
 	'wikieditor-loading' => 'Kargatzen',
 );+/** Persian (فارسی)
+ * @author Ebraminio
+ * @author Huji
+ */
+$messages['fa'] = array(
+	'wikieditor' => 'رابط ویرایش پیشرفته ویکی‌متن',
+	'wikieditor-desc' => 'یک رابط ویرایش پیشرفته ویکی‌متن و چندین پودمان دارای قابلیت فراهم می‌کند',
+	'wikieditor-wikitext-tab' => 'ویکی‌متن',
+	'wikieditor-loading' => 'در حال بارگیری',
+);
+
 /** Finnish (Suomi)
  * @author Crt
  * @author ZeiP
@@ -400,8 +433,8 @@
  * @author Bjankuloski06
  */
 $messages['mk'] = array(
-	'wikieditor' => 'Интерфејс за напредно уредување со викитекст',
-	'wikieditor-desc' => 'Дава проширлив интерфејс за уредување со викитекст и многу модули за разни други алатки',
+	'wikieditor' => 'Посредник за напредно уредување со викитекст',
+	'wikieditor-desc' => 'Дава проширлив посредник за уредување со викитекст и многу модули за разни други алатки',
 	'wikieditor-wikitext-tab' => 'ВикиТекст',
 );@@ -511,8 +544,8 @@
  * @author Firilacroco
  */
 $messages['ro'] = array(
-	'wikieditor' => 'Interfaţă de modificare wikitext avansată',
-	'wikieditor-desc' => 'Afişează o interfaţă de modificare wikitext ce se poate extinde cu multe funcţionalităţi',
+	'wikieditor' => 'Interfață de modificare wikitext avansată',
+	'wikieditor-desc' => 'Afișează o interfață de modificare wikitext ce se poate extinde cu multe funcționalități',
 	'wikieditor-wikitext-tab' => 'Wikitext',
 );@@ -562,6 +595,7 @@
 	'wikieditor' => 'Pokročilé rozhranie na úpravu wikitextu',
 	'wikieditor-desc' => 'Poskytuje rozšíriteľné rozhranie na úpravu wikitextu a mnohé moduly poskytujúce funkcionalitu',
 	'wikieditor-wikitext-tab' => 'Wikitext',
+	'wikieditor-loading' => 'Načítava sa',
 ); /** Slovenian (Slovenščina)
@@ -574,6 +608,14 @@
 	'wikieditor-loading' => 'Nalaganje',
 );+/** Serbian Cyrillic ekavian (Српски (ћирилица))
+ * @author Михајло Анђелковић
+ */
+$messages['sr-ec'] = array(
+	'wikieditor-wikitext-tab' => 'Викитекст',
+	'wikieditor-loading' => 'Учитавање',
+);
+
 /** Swedish (Svenska)
  * @author Boivie
  * @author Sertion
@@ -612,6 +654,16 @@
 	'wikieditor-wikitext-tab' => 'Wikitekst',
 );+/** Tagalog (Tagalog)
+ * @author AnakngAraw
+ */
+$messages['tl'] = array(
+	'wikieditor' => 'Mas masulong na dugtungang-mukha na pambago ng wikiteksto',
+	'wikieditor-desc' => 'Nagbibigay ng maidurugtong na dugtungang-mukha na pambago ng wikiteksto at maraming mga modulong nagbibigay ng katangiang-kasangkapan',
+	'wikieditor-wikitext-tab' => 'Wikiteksto',
+	'wikieditor-loading' => 'Ikinakarga',
+);
+
 /** Turkish (Türkçe)
  * @author Joseph
  * @author Vito Genovese
@@ -657,6 +709,8 @@
  * @author פוילישער
  */
 $messages['yi'] = array(
+	'wikieditor' => 'פֿארטגעשריטענע וויקיטעקסט רעדאַקטירונג',
+	'wikieditor-desc' => 'פֿאַרברייטבאַרער וויקיטעקס רעדאַקטירונג אויבערפֿלאך מיט א סך מאדולן וואָס פֿאַרזארגן נײַע פֿונקציאנען',
 	'wikieditor-wikitext-tab' => 'וויקיטעקסט',
 	'wikieditor-loading' => 'לאָדנדיק',
 );
@@ -675,11 +729,13 @@ /** Traditional Chinese (‪中文(繁體)‬)
  * @author Gaoxuewei
+ * @author Horacewai2
  * @author Liangent
  */
 $messages['zh-hant'] = array(
 	'wikieditor' => '高級維基文本編輯界面',
 	'wikieditor-desc' => '提供可擴充的維基文本編輯界面及功能組件',
 	'wikieditor-wikitext-tab' => '維基文本',
+	'wikieditor-loading' => '載入中',
 );
Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/combined.css
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/combined.css	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/combined.css	2010-06-09 19:16:16 UTC (rev 67746)
@@ -65,67 +65,83 @@
 	color: white;
 	color: HighlightText;
 }/* Prototype code to show collapsing left nav options */
-#panel.collapsible-nav div.portal {
+#mw-panel.collapsible-nav div.portal {
 	background-image:url(../images/vector/collapsibleNav/portal-break.png?1);
 	background-position:left top;
 	background-repeat:no-repeat;
 	padding: 0.25em 0 !important;
 	margin: -11px 9px 10px 11px;
 }
-body.rtl #panel.collapsible-nav div.portal {
+body.rtl #mw-panel.collapsible-nav div.portal {
 	background-position: right top;
 	margin: -11px 11px 10px 9px;
 }
-#panel.collapsible-nav div.portal h5 {
+#mw-panel.collapsible-nav div.portal h5 {
 	color: #4D4D4D;
 	font-weight: normal;
 	background: url(../images/vector/collapsibleNav/arrow-down.png?1) 0 50% no-repeat;
 	padding: 4px  0 3px 1.5em;
 	margin-bottom: 0px;
 }
-body.rtl #panel.collapsible-nav div.portal h5 {
+body.rtl #mw-panel.collapsible-nav div.portal h5 {
 	background: url(../images/vector/collapsibleNav/arrow-down.png?1) 100% 50% no-repeat;
 	padding: 4px  1.5em 3px 0;
 }
-#panel.collapsible-nav div.collapsed h5 {
+#mw-panel.collapsible-nav div.collapsed h5 {
 	color: #0645AD;
 	background: url(../images/vector/collapsibleNav/arrow-right.png?1) 0 50% no-repeat;
 	margin-bottom: 0px;
 }
-body.rtl #panel.collapsible-nav div.collapsed h5 {
+body.rtl #mw-panel.collapsible-nav div.collapsed h5 {
 	background: url(../images/vector/collapsibleNav/arrow-left.png?1) 100% 50% no-repeat;
 }
-#panel.collapsible-nav div h5:hover {
+#mw-panel.collapsible-nav div h5:hover {
 	cursor: pointer;
 	text-decoration: none;
 }
-#panel.collapsible-nav div.collapsed h5:hover {
+#mw-panel.collapsible-nav div.collapsed h5:hover {
 	text-decoration: underline;
 }
-#panel.collapsible-nav div.portal div.body {
+#mw-panel.collapsible-nav div.portal div.body {
+	background: none !important;
 	padding-top: 0px;
 	display: none;
 }
-#panel.collapsible-nav div.portal div.body ul li {
-	padding: 0.25em 0;
+#mw-panel.collapsible-nav div.persistent div.body {
+	display: block;
 }
-#panel.collapsible-nav div.portal div.body {
+#mw-panel.collapsible-nav div.first h5 {
+	display: none;
+}
+#mw-panel.collapsible-nav div.persistent h5 {
 	background: none !important;
+	padding-left: 0.7em;
+	cursor: default;
 }
-#panel.collapsible-nav #p-navigation {
+#mw-panel.collapsible-nav div.portal div.body ul li {
+	padding: 0.25em 0;
+}
+#mw-panel.collapsible-nav div.first {
 	background-image: none;
 	margin-top: 0px;
 }
-#panel.collapsible-nav #p-navigation div.body {
+#mw-panel.collapsible-nav div.persistent div.body {
 	margin-left: 0.5em;
 }
-body.rtl #panel.collapsible-nav #p-navigation div.body {
+body.rtl #mw-panel.collapsible-nav div.persistent div.body {
 	margin-left: 0;
 	margin-right: 0.5em;
 }
-#panel.collapsible-nav #p-navigation h5 {
-	display: none;
+.expandableField {
+	display: block;
+	float: left;
 }
+#simpleSearch { 
+	overflow: auto;
+}
+div#simpleSearch button#searchButton {
+	margin: 0.4em 0 0 0;
+}
 /* wikiEditor plugin */ /* This ID (#editform) could change in MediaWiki */

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/combined.min.css
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/combined.min.css	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/combined.min.css	2010-06-09 19:16:16 UTC (rev 67746)
@@ -63,67 +63,83 @@
 color:white;
 color:HighlightText;
 }
-#panel.collapsible-nav div.portal{
+#mw-panel.collapsible-nav div.portal{
 background-image:url(../images/vector/collapsibleNav/portal-break.png?1);
 background-position:left top;
 background-repeat:no-repeat;
 padding:0.25em 0 !important;
 margin:-11px 9px 10px 11px;
 }
-body.rtl #panel.collapsible-nav div.portal{
+body.rtl #mw-panel.collapsible-nav div.portal{
 background-position:right top;
 margin:-11px 11px 10px 9px;
 }
-#panel.collapsible-nav div.portal h5{
+#mw-panel.collapsible-nav div.portal h5{
 color:#4D4D4D;
 font-weight:normal;
 background:url(../images/vector/collapsibleNav/arrow-down.png?1) 0 50% no-repeat;
 padding:4px  0 3px 1.5em;
 margin-bottom:0px;
 }
-body.rtl #panel.collapsible-nav div.portal h5{
+body.rtl #mw-panel.collapsible-nav div.portal h5{
 background:url(../images/vector/collapsibleNav/arrow-down.png?1) 100% 50% no-repeat;
 padding:4px  1.5em 3px 0;
 }
-#panel.collapsible-nav div.collapsed h5{
+#mw-panel.collapsible-nav div.collapsed h5{
 color:#0645AD;
 background:url(../images/vector/collapsibleNav/arrow-right.png?1) 0 50% no-repeat;
 margin-bottom:0px;
 }
-body.rtl #panel.collapsible-nav div.collapsed h5{
+body.rtl #mw-panel.collapsible-nav div.collapsed h5{
 background:url(../images/vector/collapsibleNav/arrow-left.png?1) 100% 50% no-repeat;
 }
-#panel.collapsible-nav div h5:hover{
+#mw-panel.collapsible-nav div h5:hover{
 cursor:pointer;
 text-decoration:none;
 }
-#panel.collapsible-nav div.collapsed h5:hover{
+#mw-panel.collapsible-nav div.collapsed h5:hover{
 text-decoration:underline;
 }
-#panel.collapsible-nav div.portal div.body{
+#mw-panel.collapsible-nav div.portal div.body{
+background:none !important;
 padding-top:0px;
 display:none;
 }
-#panel.collapsible-nav div.portal div.body ul li{
-padding:0.25em 0;
+#mw-panel.collapsible-nav div.persistent div.body{
+display:block;
 }
-#panel.collapsible-nav div.portal div.body{
+#mw-panel.collapsible-nav div.first h5{
+display:none;
+}
+#mw-panel.collapsible-nav div.persistent h5{
 background:none !important;
+padding-left:0.7em;
+cursor:default;
 }
-#panel.collapsible-nav #p-navigation{
+#mw-panel.collapsible-nav div.portal div.body ul li{
+padding:0.25em 0;
+}
+#mw-panel.collapsible-nav div.first{
 background-image:none;
 margin-top:0px;
 }
-#panel.collapsible-nav #p-navigation div.body{
+#mw-panel.collapsible-nav div.persistent div.body{
 margin-left:0.5em;
 }
-body.rtl #panel.collapsible-nav #p-navigation div.body{
+body.rtl #mw-panel.collapsible-nav div.persistent div.body{
 margin-left:0;
 margin-right:0.5em;
 }
-#panel.collapsible-nav #p-navigation h5{
-display:none;
+.expandableField{
+display:block;
+float:left;
 }
+#simpleSearch{
+overflow:auto;
+}
+div#simpleSearch button#searchButton{
+margin:0.4em 0 0 0;
+}
 form#editform{
 margin:0;
 padding:0;

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/vector.collapsibleNav.css
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/vector.collapsibleNav.css	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/vector.collapsibleNav.css	2010-06-09 19:16:16 UTC (rev 67746)
@@ -1,62 +1,68 @@
 /* Prototype code to show collapsing left nav options */
-#panel.collapsible-nav div.portal {
+#mw-panel.collapsible-nav div.portal {
 	background-image:url(../images/vector/collapsibleNav/portal-break.png?1);
 	background-position:left top;
 	background-repeat:no-repeat;
 	padding: 0.25em 0 !important;
 	margin: -11px 9px 10px 11px;
 }
-body.rtl #panel.collapsible-nav div.portal {
+body.rtl #mw-panel.collapsible-nav div.portal {
 	background-position: right top;
 	margin: -11px 11px 10px 9px;
 }
-#panel.collapsible-nav div.portal h5 {
+#mw-panel.collapsible-nav div.portal h5 {
 	color: #4D4D4D;
 	font-weight: normal;
 	background: url(../images/vector/collapsibleNav/arrow-down.png?1) 0 50% no-repeat;
 	padding: 4px  0 3px 1.5em;
 	margin-bottom: 0px;
 }
-body.rtl #panel.collapsible-nav div.portal h5 {
+body.rtl #mw-panel.collapsible-nav div.portal h5 {
 	background: url(../images/vector/collapsibleNav/arrow-down.png?1) 100% 50% no-repeat;
 	padding: 4px  1.5em 3px 0;
 }
-#panel.collapsible-nav div.collapsed h5 {
+#mw-panel.collapsible-nav div.collapsed h5 {
 	color: #0645AD;
 	background: url(../images/vector/collapsibleNav/arrow-right.png?1) 0 50% no-repeat;
 	margin-bottom: 0px;
 }
-body.rtl #panel.collapsible-nav div.collapsed h5 {
+body.rtl #mw-panel.collapsible-nav div.collapsed h5 {
 	background: url(../images/vector/collapsibleNav/arrow-left.png?1) 100% 50% no-repeat;
 }
-#panel.collapsible-nav div h5:hover {
+#mw-panel.collapsible-nav div h5:hover {
 	cursor: pointer;
 	text-decoration: none;
 }
-#panel.collapsible-nav div.collapsed h5:hover {
+#mw-panel.collapsible-nav div.collapsed h5:hover {
 	text-decoration: underline;
 }
-#panel.collapsible-nav div.portal div.body {
+#mw-panel.collapsible-nav div.portal div.body {
+	background: none !important;
 	padding-top: 0px;
 	display: none;
 }
-#panel.collapsible-nav div.portal div.body ul li {
-	padding: 0.25em 0;
+#mw-panel.collapsible-nav div.persistent div.body {
+	display: block;
 }
-#panel.collapsible-nav div.portal div.body {
+#mw-panel.collapsible-nav div.first h5 {
+	display: none;
+}
+#mw-panel.collapsible-nav div.persistent h5 {
 	background: none !important;
+	padding-left: 0.7em;
+	cursor: default;
 }
-#panel.collapsible-nav #p-navigation {
+#mw-panel.collapsible-nav div.portal div.body ul li {
+	padding: 0.25em 0;
+}
+#mw-panel.collapsible-nav div.first {
 	background-image: none;
 	margin-top: 0px;
 }
-#panel.collapsible-nav #p-navigation div.body {
+#mw-panel.collapsible-nav div.persistent div.body {
 	margin-left: 0.5em;
 }
-body.rtl #panel.collapsible-nav #p-navigation div.body {
+body.rtl #mw-panel.collapsible-nav div.persistent div.body {
 	margin-left: 0;
 	margin-right: 0.5em;
 }
-#panel.collapsible-nav #p-navigation h5 {
-	display: none;
-}

Copied: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/vector.expandableSearch.css (from rev 67203, trunk/extensions/UsabilityInitiative/css/vector.expandableSearch.css)
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/vector.expandableSearch.css	                        (rev 0)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/css/vector.expandableSearch.css	2010-06-09 19:16:16 UTC (rev 67746)
@@ -0,0 +1,10 @@
+.expandableField {
+	display: block;
+	float: left;
+}
+#simpleSearch { 
+	overflow: auto;
+}
+div#simpleSearch button#searchButton {
+	margin: 0.4em 0 0 0;
+}

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.browser.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.browser.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.browser.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -56,15 +56,16 @@
 			return r;
 		};-		a = (a.match(/Opera|Navigator|Minefield|KHTML|Chrome/) ? m(a, [
+		a = (a.match(/Opera|Navigator|Minefield|KHTML|Chrome|PLAYSTATION 3/) ? m(a, [
 			[/(Firefox|MSIE|KHTML,\slike\sGecko|Konqueror)/, ''],
 			['Chrome Safari', 'Chrome'],
 			['KHTML', 'Konqueror'],
 			['Minefield', 'Firefox'],
-			['Navigator', 'Netscape']
+			['Navigator', 'Netscape'],
+			['PLAYSTATION 3', 'PS3']
 		]) : a).toLowerCase();-		$.browser = $.extend((!z) ? $.browser : {}, c(a, /(camino|chrome|firefox|netscape|konqueror|lynx|msie|opera|safari|ipod|iphone|blackberry)/, [], /(camino|chrome|firefox|netscape|netscape6|opera|version|konqueror|lynx|msie|safari)(\/|\s)([a-z0-9\.\+]*?)(\;|dev|rel|\s|$)/));
+		$.browser = $.extend((!z) ? $.browser : {}, c(a, /(camino|chrome|firefox|netscape|konqueror|lynx|msie|opera|safari|ipod|iphone|blackberry|ps3)/, [], /(camino|chrome|firefox|netscape|netscape6|opera|version|konqueror|lynx|msie|safari|ps3)(\/|\;?\s|)([a-z0-9\.\+]*?)(\;|dev|rel|\)|\s|$)/)); 		$.layout = c(a, /(gecko|konqueror|msie|opera|webkit)/, [
 			['konqueror', 'khtml'],


Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:60970
/trunk/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62274,62341,62371,62380,62384,62392-62396,62458,62552,63864-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66402,66565,66623,66631,66642-66644,66655
   + /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:60970
/trunk/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62274,62341,62371,62380,62384,62392-62396,62458,62552,63864-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66337-67741,67743-67744

Copied: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.expandableField.js (from rev 66622, trunk/extensions/UsabilityInitiative/js/plugins/jquery.expandableField.js)
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.expandableField.js	                        (rev 0)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.expandableField.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -0,0 +1,127 @@
+/**
+ * This plugin provides functionallity to expand a text box on focus to double it's current width
+ *
+ * Usage:
+ *
+ * Set options:
+ *		$('#textbox').expandableField( { option1: value1, option2: value2 } );
+ *		$('#textbox').expandableField( option, value );
+ * Get option:
+ *		value = $('#textbox').expandableField( option );
+ * Initialize:
+ *		$('#textbox').expandableField();
+ *
+ * Options:
+ *
+ */
+( function( $ ) {
+
+$.expandableField = {
+	/**
+	 * Expand the field, make the callback
+	 */
+	expandField: function( e, context ) {
+		context.config.beforeExpand.call( context.data.$field, context );
+		context.data.$field
+			.animate( { 'width': context.data.expandedWidth }, 'fast', function() {
+				context.config.afterExpand.call( this, context );
+			} );
+	},
+	/**
+	 * Condense the field, make the callback
+	 */
+	condenseField: function( e, context ) {
+		context.config.beforeCondense.call( context.data.$field, context );
+		context.data.$field
+			.animate( { 'width': context.data.condensedWidth }, 'fast', function() {
+				context.config.afterCondense.call( this, context );
+			} );
+	},
+	/**
+	 * Sets the value of a property, and updates the widget accordingly
+	 * @param {String} property Name of property
+	 * @param {Mixed} value Value to set property with
+	 */
+	configure: function( context, property, value ) {
+		// Validate creation using fallback values
+		switch( property ) {
+			default:
+				context.config[property] = value;
+				break;
+		}
+	}
+
+};
+$.fn.expandableField = function() {
+	
+	// Multi-context fields
+	var returnValue = null;
+	var args = arguments;
+	
+	$( this ).each( function() {
+
+		/* Construction / Loading */
+		
+		var context = $( this ).data( 'expandableField-context' );
+		if ( context == null ) {
+			context = {
+				config: {
+					// callback function for before collapse
+					'beforeCondense': function( context ) {},
+					// callback function for before expand
+					'beforeExpand': function( context ) {},
+					// callback function for after collapse
+					'afterCondense': function( context ) {},
+					// callback function for after expand
+					'afterExpand': function( context ) {}
+				}
+			};
+		}
+		
+		/* API */
+		// Handle various calling styles
+		if ( args.length > 0 ) {
+			if ( typeof args[0] == 'object' ) {
+				// Apply set of properties
+				for ( var key in args[0] ) {
+					$.expandableField.configure( context, key, args[0][key] );
+				}
+			} else if ( typeof args[0] == 'string' ) {
+				if ( args.length > 1 ) {
+					// Set property values
+					$.expandableField.configure( context, args[0], args[1] );
+				} else if ( returnValue == null ) {
+					// Get property values, but don't give access to internal data - returns only the first
+					returnValue = ( args[0] in context.config ? undefined : context.config[args[0]] );
+				}
+			}
+		}
+		
+		/* Initialization */
+		
+		if ( typeof context.data == 'undefined' ) {
+			context.data = {
+				// The width of the field in it's condensed state
+				'condensedWidth': $( this ).width(),
+				// The width of the field in it's expanded state
+				'expandedWidth': $( this ).width() * 2,
+				// Reference to the field
+				'$field': $( this )
+			};
+			
+			$( this )
+				.addClass( 'expandableField' )
+				.focus( function( e ) {
+					$.expandableField.expandField( e, context );
+				} )
+				.delayedBind( 250, 'blur', function( e ) {
+					$.expandableField.condenseField( e, context );
+				} );
+		}
+		// Store the context for next time
+		$( this ).data( 'expandableField-context', context );
+	} );
+	return returnValue !== null ? returnValue : $(this);
+};
+
+} )( jQuery );


Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.expandableField.js
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -91,7 +91,9 @@
 		} else if ( document.selection && document.selection.createRange ) {
 			// IE
 			$(this).focus();
-			context.fn.restoreStuffForIE();
+			if ( context ) {
+				context.fn.restoreStuffForIE();
+			}
 			var selText = $(this).textSelection( 'getSelection' );
 			var scrollTop = this.scrollTop;
 			var range = document.selection.createRange();
@@ -239,7 +241,12 @@
 			if ( newLines) length = length - newLines.length;
 			selection.moveStart( 'character', options.start );
 			selection.moveEnd( 'character', -length + options.end );
-			selection.select();
+			
+			// This line can cause an error under certain circumstances (textarea empty, no selection)
+			// Silence that error
+			try {
+				selection.select();
+			} catch( e ) { }
 		}
 	});
 },


Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:60970
/trunk/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62274,62341,62371,62380,62384,62392-62396,62458,62552,63864-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66331-66335,66402,66565,66623,66631,66642-66644,66655
   + /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:60970
/trunk/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62274,62341,62371,62380,62384,62392-62396,62458,62552,63864-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66331-66335,66337-67741,67743-67744

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.dialogs.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.dialogs.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.dialogs.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -51,6 +51,12 @@
 				$.wikiEditor.modules.dialogs.fn.reallyCreate( context, mod );
 				$dialog = $( '#' + mod.id );
 			}
+			
+			// Workaround for bug in jQuery UI: close button in top right retains focus
+			$dialog.closest( '.ui-dialog' )
+				.find( '.ui-dialog-titlebar-close' )
+				.removeClass( 'ui-state-focus' );
+			
 			$dialog.dialog( 'open' );
 		}
 	},

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -403,7 +403,7 @@
 				// Surround by <p> if it does not already have it
 				var cursorPos = context.fn.getCaretPosition();
 				var t = context.fn.getOffset( cursorPos[0] );
-				if ( t && t.node.nodeName == '#text' && t.node.parentNode.nodeName.toLowerCase() == 'body' ) {
+				if ( ! $.browser.msie && t && t.node.nodeName == '#text' && t.node.parentNode.nodeName.toLowerCase() == 'body' ) {
 					$( t.node ).wrap( "<p></p>" );
 					context.fn.purgeOffsets();
 					context.fn.setSelection( { start: cursorPos[0], end: cursorPos[1] } );
@@ -425,96 +425,125 @@
 		'paste': function( event ) {
 			// Save the cursor position to restore it after all this voodoo
 			var cursorPos = context.fn.getCaretPosition();
-			var oldLength = context.fn.getContents().length - ( cursorPos[1] - cursorPos[0] );
-			context.$content.find( ':not(.wikiEditor)' ).addClass( 'wikiEditor' );
+			var offset = 0;
+			var oldLength = context.fn.getContents().length;
+			
+			//give everything the wikiEditor class so that we can easily pick out things without that class as pasted 
+			context.$content.find( '*' ).addClass( 'wikiEditor' );
 			if ( $.layout.name !== 'webkit' ) {
 				context.$content.addClass( 'pasting' );
 			}
 			setTimeout( function() {
+				
 				// Kill stuff we know we don't want
 				context.$content.find( 'script,style,img,input,select,textarea,hr,button,link,meta' ).remove();
-				// This is just downright strange - but if we do this on nodes with text nodes, it fixes allot of
-				// space collapsing issues at element boundries
-				context.$content.find( '*' ).each( function() {
-					if ( $(this).children().length == 0 && this.childNodes.length > 0 ) {
-						$(this).text( $(this).text() );
-					}
-				} );
-				// MS Word + webkit
-				context.$content.find( 'p:not(.wikiEditor) p:not(.wikiEditor)' )
-					.each( function(){
-						var outerParent = $(this).parent();
-						outerParent.replaceWith( outerParent.childNodes );
-					} );
-				// Unwrap the span found in webkit copies (Apple Richtext)
-				context.$content.find( 'span.Apple-style-span' ).each( function() {
-					$(this).replaceWith( this.childNodes );
-				} );
 				
-				// If the pasted content is plain text then wrap it in a <p> and adjust the <br> accordingly 
-				var pasteContent = context.fn.getOffset( cursorPos[0] ).node;
-				var removeNextBR = false;
-				while ( pasteContent != null && !$( pasteContent ).hasClass( 'wikiEditor' ) ) {
-					var currentNode = pasteContent;
-					pasteContent = pasteContent.nextSibling;
-					if ( currentNode.nodeName == '#text' && currentNode.nodeValue == currentNode.wholeText ) {
-						var pWrapper = $( '<p />' ).addClass( 'wikiEditor' );
-						$( currentNode ).wrap( pWrapper );
-						$( currentNode ).addClass( 'wikiEditor' );
-						removeNextBR = true;
-					} else if ( currentNode.nodeName == 'BR' && removeNextBR ) {
-						$( currentNode ).remove();
-						removeNextBR = false;
-					} else {
-						removeNextBR = false;
-					}
-				}	
+				//anything without wikiEditor class was pasted.
 				var $selection = context.$content.find( ':not(.wikiEditor)' );
-				while ( $selection.length && $selection.length > 0 ) {
-					var $currentElement = $selection.eq( 0 );
-					while ( !$currentElement.parent().is( 'body' ) && !$currentElement.parent().is( '.wikiEditor' ) ) {
-						$currentElement = $currentElement.parent();
+				var nodeToDelete = [];
+				var firstDirtyNode;
+				if  ( $selection.length == 0 ) {
+					firstDirtyNode = context.fn.getOffset( cursorPos[0] ).node;
+				} else {
+					firstDirtyNode = $selection.eq( 0 )[0];
+				}
+				while ( firstDirtyNode != null ) {
+					//go up till we find the top pasted node
+					while ( firstDirtyNode.parentNode.nodeName != 'BODY' 
+						 && ! $( firstDirtyNode.parentNode ).hasClass( 'wikiEditor' ) 
+						) {
+						firstDirtyNode = firstDirtyNode.parentNode;
 					}
 					
-					var $newElement;
-					if ( $currentElement.is( 'p' ) || $currentElement.is( 'div' ) || $currentElement.is( 'pre' ) ) {
-						//Convert all <div>, <p> and <pre> that was pasted into a <p> element
-						$newElement = $( '<p />' );
-					} else {
-						// everything else becomes a <span>
-						$newElement = $( '<span />' ).addClass( 'wikiEditor' );
+					//go back till we find the first pasted node
+					while ( firstDirtyNode.previousSibling != null
+							&& ! $( firstDirtyNode.previousSibling ).hasClass( 'wikiEditor' )
+						) {
+						
+						if ( $( firstDirtyNode.previousSibling ).hasClass( '#comment' ) ) {
+							$( firstDirtyNode ).remove();
+						} else {
+							firstDirtyNode = firstDirtyNode.previousSibling;
+						}
 					}
 					
-					// If the pasted content was html, just convert it into text and <br>
-					var pieces = $.trim( $currentElement.text() ).split( '\n' );
-					var newElementHTML = '';
-					for ( var i = 0; i < pieces.length; i++ ) {
-						if ( pieces[i] ) {
-							newElementHTML += $.trim( pieces[i] );
+					var $lastDirtyNode = $( firstDirtyNode );
+					var cc = makeContentCollector( $.browser, null );
+					while ( firstDirtyNode != null && ! $( firstDirtyNode ).hasClass( 'wikiEditor' ) ) {
+						cc.collectContent(firstDirtyNode);
+						
+						cc.notifyNextNode(firstDirtyNode.nextSibling);
+						pastedContent = cc.getLines();
+						if ((pastedContent.length <= 1 || pastedContent[pastedContent.length - 1] !== "")
+								&& firstDirtyNode.nextSibling) {
+							nodeToDelete.push( firstDirtyNode );
+							firstDirtyNode = firstDirtyNode.nextSibling;
+							cc.collectContent(firstDirtyNode);
+							cc.notifyNextNode(firstDirtyNode.nextSibling);
+						}
+						nodeToDelete.push( firstDirtyNode );
+						firstDirtyNode = firstDirtyNode.nextSibling;
+					}
+					var ccData = cc.finish();
+					var pastedContent = ccData.lines;
+					if ( pastedContent.length == 0 && firstDirtyNode ) {
+						offset += $( firstDirtyNode ).text().length;
+					}
+					
+					if ( nodeToDelete.length > 0 ) {
+						$lastDirtyNode = $( nodeToDelete[nodeToDelete.length - 1] );
+					}
+					
+					var testVal = '';
+					testVal = $( nodeToDelete[0] ).text();
+					
+					var pastedPretty = '';
+					for ( var i = 0; i < pastedContent.length; i++ ) {
+						//escape html
+						pastedPretty = pastedContent[i].replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\r?\n/g, '\\n');
+						//replace leading white spaces with &nbsp;
+						match = pastedContent[i].match(/^[\s]+[^\s]/);
+						if ( match != null && match.length > 0  ) {
+							index = match[0].length;
+							leadingSpace = match[0].replace(/[\s]/g, '&nbsp;');
+							pastedPretty = leadingSpace + pastedPretty.substring(index, pastedPretty.length);
+						}
+						
+						$newElement = $( '<p class="wikiEditor" ></p>' );
+						if ( pastedPretty ) {
+							$newElement.html( '<span class = "wikiEditor">' + pastedPretty + '</span>' );
 						} else {
-							newElementHTML += '<span><br class="wikiEditor" /></span>';
+							$newElement.html( '<br class="wikiEditor">' );
 						}
+						$newElement.insertAfter( $lastDirtyNode );
+						offset += pastedPretty.length;
+						$lastDirtyNode = $newElement;
 					}
-					$newElement.html( newElementHTML )
-						.addClass( 'wikiEditor' )
-						.insertAfter( $currentElement );
-					$currentElement.remove();
-
+					
+					while ( nodeToDelete.length > 0 ) {
+						$( nodeToDelete.pop() ).remove();
+					}
+					
+					//find the next node that may not be the next sibling (in IE)
 					$selection = context.$content.find( ':not(.wikiEditor)' );
+					if  ( $selection.length == 0 ) {
+						firstDirtyNode = null;
+					} else {
+						firstDirtyNode = $selection.eq( 0 )[0];
+					}
 				}
-
+				
 				context.$content.find( '.wikiEditor' ).removeClass( 'wikiEditor' );
-				if ( $.layout.name !== 'webkit' ) {
-					context.$content.removeClass( 'pasting' );
-				}
 				
-				// Restore cursor position
-				context.fn.purgeOffsets();
-				var newLength = context.fn.getContents().length;
-				var restoreTo = cursorPos[0] + newLength - oldLength;
+				//context.$content.find( '*' ).addClass( 'wikiEditor' );
+				
+				//now place the cursor at the end of pasted content
+				var restoreTo = cursorPos[1] + offset;
+				
 				context.fn.setSelection( { start: restoreTo, end: restoreTo } );
-			}, 0 );
-			return true;
+
+		}, 0 );
+		return true;
 		},
 		'ready': function( event ) {
 			// Initialize our history queue
@@ -1633,10 +1662,10 @@
 					end = e ? e.offset : null;
 					// Don't try to set the selection past the end of a node, causes errors
 					// Just put the selection at the end of the node in this case
-					if ( sc.nodeName == '#text' && start > sc.nodeValue.length ) {
+					if ( sc != null && sc.nodeName == '#text' && start > sc.nodeValue.length ) {
 						start = sc.nodeValue.length - 1;
 					}
-					if ( ec.nodeName == '#text' && end > ec.nodeValue.length ) {
+					if ( ec != null && ec.nodeName == '#text' && end > ec.nodeValue.length ) {
 						end = ec.nodeValue.length - 1;
 					}
 				}

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -251,17 +251,19 @@
 					'peri' : $.wikiEditor.autoMsg( action.options, 'peri' ),
 					'post' : $.wikiEditor.autoMsg( action.options, 'post' )
 				};
+				var replace = action.type == 'replace';
 				if ( 'regex' in action.options && 'regexReplace' in action.options ) {
 					var selection = context.$textarea.textSelection( 'getSelection' );
 					if ( selection != '' && selection.match( action.options.regex ) ) {
 						parts.peri = selection.replace( action.options.regex,
 							action.options.regexReplace );
 						parts.pre = parts.post = '';
+						replace = true;
 					}
 				}
 				context.$textarea.textSelection(
 					'encapsulateSelection',
-					$.extend( {}, action.options, parts, { 'replace': action.type == 'replace' } )
+					$.extend( {}, action.options, parts, { 'replace': replace } )
 				);
 				if ( typeof context.$iframe !== 'undefined' ) {
 					context.$iframe[0].contentWindow.focus();
@@ -538,9 +540,9 @@
 			character = {
 				'label' : character,
 				'action' : {
-					'type' : 'encapsulate',
+					'type' : 'replace',
 					'options' : {
-						'pre' : character
+						'peri' : character
 					}
 				}
 			};
@@ -548,9 +550,9 @@
 			character = {
 				'label' : character[0],
 				'action' : {
-					'type' : 'encapsulate',
+					'type' : 'replace',
 					'options' : {
-						'pre' : character[1]
+						'peri' : character[1]
 					}
 				}
 			};

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -5326,15 +5326,16 @@
 			return r;
 		};-		a = (a.match(/Opera|Navigator|Minefield|KHTML|Chrome/) ? m(a, [
+		a = (a.match(/Opera|Navigator|Minefield|KHTML|Chrome|PLAYSTATION 3/) ? m(a, [
 			[/(Firefox|MSIE|KHTML,\slike\sGecko|Konqueror)/, ''],
 			['Chrome Safari', 'Chrome'],
 			['KHTML', 'Konqueror'],
 			['Minefield', 'Firefox'],
-			['Navigator', 'Netscape']
+			['Navigator', 'Netscape'],
+			['PLAYSTATION 3', 'PS3']
 		]) : a).toLowerCase();-		$.browser = $.extend((!z) ? $.browser : {}, c(a, /(camino|chrome|firefox|netscape|konqueror|lynx|msie|opera|safari|ipod|iphone|blackberry)/, [], /(camino|chrome|firefox|netscape|netscape6|opera|version|konqueror|lynx|msie|safari)(\/|\s)([a-z0-9\.\+]*?)(\;|dev|rel|\s|$)/));
+		$.browser = $.extend((!z) ? $.browser : {}, c(a, /(camino|chrome|firefox|netscape|konqueror|lynx|msie|opera|safari|ipod|iphone|blackberry|ps3)/, [], /(camino|chrome|firefox|netscape|netscape6|opera|version|konqueror|lynx|msie|safari|ps3)(\/|\;?\s|)([a-z0-9\.\+]*?)(\;|dev|rel|\)|\s|$)/)); 		$.layout = c(a, /(gecko|konqueror|msie|opera|webkit)/, [
 			['konqueror', 'khtml'],
@@ -5758,6 +5759,133 @@
 } );
 } )( jQuery );
 /**
+ * This plugin provides functionallity to expand a text box on focus to double it's current width
+ *
+ * Usage:
+ *
+ * Set options:
+ *		$('#textbox').expandableField( { option1: value1, option2: value2 } );
+ *		$('#textbox').expandableField( option, value );
+ * Get option:
+ *		value = $('#textbox').expandableField( option );
+ * Initialize:
+ *		$('#textbox').expandableField();
+ *
+ * Options:
+ *
+ */
+( function( $ ) {
+
+$.expandableField = {
+	/**
+	 * Expand the field, make the callback
+	 */
+	expandField: function( e, context ) {
+		context.config.beforeExpand.call( context.data.$field, context );
+		context.data.$field
+			.animate( { 'width': context.data.expandedWidth }, 'fast', function() {
+				context.config.afterExpand.call( this, context );
+			} );
+	},
+	/**
+	 * Condense the field, make the callback
+	 */
+	condenseField: function( e, context ) {
+		context.config.beforeCondense.call( context.data.$field, context );
+		context.data.$field
+			.animate( { 'width': context.data.condensedWidth }, 'fast', function() {
+				context.config.afterCondense.call( this, context );
+			} );
+	},
+	/**
+	 * Sets the value of a property, and updates the widget accordingly
+	 * @param {String} property Name of property
+	 * @param {Mixed} value Value to set property with
+	 */
+	configure: function( context, property, value ) {
+		// Validate creation using fallback values
+		switch( property ) {
+			default:
+				context.config[property] = value;
+				break;
+		}
+	}
+
+};
+$.fn.expandableField = function() {
+	
+	// Multi-context fields
+	var returnValue = null;
+	var args = arguments;
+	
+	$( this ).each( function() {
+
+		/* Construction / Loading */
+		
+		var context = $( this ).data( 'expandableField-context' );
+		if ( context == null ) {
+			context = {
+				config: {
+					// callback function for before collapse
+					'beforeCondense': function( context ) {},
+					// callback function for before expand
+					'beforeExpand': function( context ) {},
+					// callback function for after collapse
+					'afterCondense': function( context ) {},
+					// callback function for after expand
+					'afterExpand': function( context ) {}
+				}
+			};
+		}
+		
+		/* API */
+		// Handle various calling styles
+		if ( args.length > 0 ) {
+			if ( typeof args[0] == 'object' ) {
+				// Apply set of properties
+				for ( var key in args[0] ) {
+					$.expandableField.configure( context, key, args[0][key] );
+				}
+			} else if ( typeof args[0] == 'string' ) {
+				if ( args.length > 1 ) {
+					// Set property values
+					$.expandableField.configure( context, args[0], args[1] );
+				} else if ( returnValue == null ) {
+					// Get property values, but don't give access to internal data - returns only the first
+					returnValue = ( args[0] in context.config ? undefined : context.config[args[0]] );
+				}
+			}
+		}
+		
+		/* Initialization */
+		
+		if ( typeof context.data == 'undefined' ) {
+			context.data = {
+				// The width of the field in it's condensed state
+				'condensedWidth': $( this ).width(),
+				// The width of the field in it's expanded state
+				'expandedWidth': $( this ).width() * 2,
+				// Reference to the field
+				'$field': $( this )
+			};
+			
+			$( this )
+				.addClass( 'expandableField' )
+				.focus( function( e ) {
+					$.expandableField.expandField( e, context );
+				} )
+				.delayedBind( 250, 'blur', function( e ) {
+					$.expandableField.condenseField( e, context );
+				} );
+		}
+		// Store the context for next time
+		$( this ).data( 'expandableField-context', context );
+	} );
+	return returnValue !== null ? returnValue : $(this);
+};
+
+} )( jQuery );
+/**
  * This plugin provides a generic way to add suggestions to a text box.
  *
  * Usage:
@@ -6357,7 +6485,9 @@
 		} else if ( document.selection && document.selection.createRange ) {
 			// IE
 			$(this).focus();
-			context.fn.restoreStuffForIE();
+			if ( context ) {
+				context.fn.restoreStuffForIE();
+			}
 			var selText = $(this).textSelection( 'getSelection' );
 			var scrollTop = this.scrollTop;
 			var range = document.selection.createRange();
@@ -6505,7 +6635,12 @@
 			if ( newLines) length = length - newLines.length;
 			selection.moveStart( 'character', options.start );
 			selection.moveEnd( 'character', -length + options.end );
-			selection.select();
+			
+			// This line can cause an error under certain circumstances (textarea empty, no selection)
+			// Silence that error
+			try {
+				selection.select();
+			} catch( e ) { }
 		}
 	});
 },
@@ -7065,7 +7200,7 @@
 				// Surround by <p> if it does not already have it
 				var cursorPos = context.fn.getCaretPosition();
 				var t = context.fn.getOffset( cursorPos[0] );
-				if ( t && t.node.nodeName == '#text' && t.node.parentNode.nodeName.toLowerCase() == 'body' ) {
+				if ( ! $.browser.msie && t && t.node.nodeName == '#text' && t.node.parentNode.nodeName.toLowerCase() == 'body' ) {
 					$( t.node ).wrap( "<p></p>" );
 					context.fn.purgeOffsets();
 					context.fn.setSelection( { start: cursorPos[0], end: cursorPos[1] } );
@@ -7087,96 +7222,125 @@
 		'paste': function( event ) {
 			// Save the cursor position to restore it after all this voodoo
 			var cursorPos = context.fn.getCaretPosition();
-			var oldLength = context.fn.getContents().length - ( cursorPos[1] - cursorPos[0] );
-			context.$content.find( ':not(.wikiEditor)' ).addClass( 'wikiEditor' );
+			var offset = 0;
+			var oldLength = context.fn.getContents().length;
+			
+			//give everything the wikiEditor class so that we can easily pick out things without that class as pasted 
+			context.$content.find( '*' ).addClass( 'wikiEditor' );
 			if ( $.layout.name !== 'webkit' ) {
 				context.$content.addClass( 'pasting' );
 			}
 			setTimeout( function() {
+				
 				// Kill stuff we know we don't want
 				context.$content.find( 'script,style,img,input,select,textarea,hr,button,link,meta' ).remove();
-				// This is just downright strange - but if we do this on nodes with text nodes, it fixes allot of
-				// space collapsing issues at element boundries
-				context.$content.find( '*' ).each( function() {
-					if ( $(this).children().length == 0 && this.childNodes.length > 0 ) {
-						$(this).text( $(this).text() );
-					}
-				} );
-				// MS Word + webkit
-				context.$content.find( 'p:not(.wikiEditor) p:not(.wikiEditor)' )
-					.each( function(){
-						var outerParent = $(this).parent();
-						outerParent.replaceWith( outerParent.childNodes );
-					} );
-				// Unwrap the span found in webkit copies (Apple Richtext)
-				context.$content.find( 'span.Apple-style-span' ).each( function() {
-					$(this).replaceWith( this.childNodes );
-				} );
 				
-				// If the pasted content is plain text then wrap it in a <p> and adjust the <br> accordingly 
-				var pasteContent = context.fn.getOffset( cursorPos[0] ).node;
-				var removeNextBR = false;
-				while ( pasteContent != null && !$( pasteContent ).hasClass( 'wikiEditor' ) ) {
-					var currentNode = pasteContent;
-					pasteContent = pasteContent.nextSibling;
-					if ( currentNode.nodeName == '#text' && currentNode.nodeValue == currentNode.wholeText ) {
-						var pWrapper = $( '<p />' ).addClass( 'wikiEditor' );
-						$( currentNode ).wrap( pWrapper );
-						$( currentNode ).addClass( 'wikiEditor' );
-						removeNextBR = true;
-					} else if ( currentNode.nodeName == 'BR' && removeNextBR ) {
-						$( currentNode ).remove();
-						removeNextBR = false;
-					} else {
-						removeNextBR = false;
-					}
-				}	
+				//anything without wikiEditor class was pasted.
 				var $selection = context.$content.find( ':not(.wikiEditor)' );
-				while ( $selection.length && $selection.length > 0 ) {
-					var $currentElement = $selection.eq( 0 );
-					while ( !$currentElement.parent().is( 'body' ) && !$currentElement.parent().is( '.wikiEditor' ) ) {
-						$currentElement = $currentElement.parent();
+				var nodeToDelete = [];
+				var firstDirtyNode;
+				if  ( $selection.length == 0 ) {
+					firstDirtyNode = context.fn.getOffset( cursorPos[0] ).node;
+				} else {
+					firstDirtyNode = $selection.eq( 0 )[0];
+				}
+				while ( firstDirtyNode != null ) {
+					//go up till we find the top pasted node
+					while ( firstDirtyNode.parentNode.nodeName != 'BODY' 
+						 && ! $( firstDirtyNode.parentNode ).hasClass( 'wikiEditor' ) 
+						) {
+						firstDirtyNode = firstDirtyNode.parentNode;
 					}
 					
-					var $newElement;
-					if ( $currentElement.is( 'p' ) || $currentElement.is( 'div' ) || $currentElement.is( 'pre' ) ) {
-						//Convert all <div>, <p> and <pre> that was pasted into a <p> element
-						$newElement = $( '<p />' );
-					} else {
-						// everything else becomes a <span>
-						$newElement = $( '<span />' ).addClass( 'wikiEditor' );
+					//go back till we find the first pasted node
+					while ( firstDirtyNode.previousSibling != null
+							&& ! $( firstDirtyNode.previousSibling ).hasClass( 'wikiEditor' )
+						) {
+						
+						if ( $( firstDirtyNode.previousSibling ).hasClass( '#comment' ) ) {
+							$( firstDirtyNode ).remove();
+						} else {
+							firstDirtyNode = firstDirtyNode.previousSibling;
+						}
 					}
 					
-					// If the pasted content was html, just convert it into text and <br>
-					var pieces = $.trim( $currentElement.text() ).split( '\n' );
-					var newElementHTML = '';
-					for ( var i = 0; i < pieces.length; i++ ) {
-						if ( pieces[i] ) {
-							newElementHTML += $.trim( pieces[i] );
+					var $lastDirtyNode = $( firstDirtyNode );
+					var cc = makeContentCollector( $.browser, null );
+					while ( firstDirtyNode != null && ! $( firstDirtyNode ).hasClass( 'wikiEditor' ) ) {
+						cc.collectContent(firstDirtyNode);
+						
+						cc.notifyNextNode(firstDirtyNode.nextSibling);
+						pastedContent = cc.getLines();
+						if ((pastedContent.length <= 1 || pastedContent[pastedContent.length - 1] !== "")
+								&& firstDirtyNode.nextSibling) {
+							nodeToDelete.push( firstDirtyNode );
+							firstDirtyNode = firstDirtyNode.nextSibling;
+							cc.collectContent(firstDirtyNode);
+							cc.notifyNextNode(firstDirtyNode.nextSibling);
+						}
+						nodeToDelete.push( firstDirtyNode );
+						firstDirtyNode = firstDirtyNode.nextSibling;
+					}
+					var ccData = cc.finish();
+					var pastedContent = ccData.lines;
+					if ( pastedContent.length == 0 && firstDirtyNode ) {
+						offset += $( firstDirtyNode ).text().length;
+					}
+					
+					if ( nodeToDelete.length > 0 ) {
+						$lastDirtyNode = $( nodeToDelete[nodeToDelete.length - 1] );
+					}
+					
+					var testVal = '';
+					testVal = $( nodeToDelete[0] ).text();
+					
+					var pastedPretty = '';
+					for ( var i = 0; i < pastedContent.length; i++ ) {
+						//escape html
+						pastedPretty = pastedContent[i].replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\r?\n/g, '\\n');
+						//replace leading white spaces with &nbsp;
+						match = pastedContent[i].match(/^[\s]+[^\s]/);
+						if ( match != null && match.length > 0  ) {
+							index = match[0].length;
+							leadingSpace = match[0].replace(/[\s]/g, '&nbsp;');
+							pastedPretty = leadingSpace + pastedPretty.substring(index, pastedPretty.length);
+						}
+						
+						$newElement = $( '<p class="wikiEditor" ></p>' );
+						if ( pastedPretty ) {
+							$newElement.html( '<span class = "wikiEditor">' + pastedPretty + '</span>' );
 						} else {
-							newElementHTML += '<span><br class="wikiEditor" /></span>';
+							$newElement.html( '<br class="wikiEditor">' );
 						}
+						$newElement.insertAfter( $lastDirtyNode );
+						offset += pastedPretty.length;
+						$lastDirtyNode = $newElement;
 					}
-					$newElement.html( newElementHTML )
-						.addClass( 'wikiEditor' )
-						.insertAfter( $currentElement );
-					$currentElement.remove();
-
+					
+					while ( nodeToDelete.length > 0 ) {
+						$( nodeToDelete.pop() ).remove();
+					}
+					
+					//find the next node that may not be the next sibling (in IE)
 					$selection = context.$content.find( ':not(.wikiEditor)' );
+					if  ( $selection.length == 0 ) {
+						firstDirtyNode = null;
+					} else {
+						firstDirtyNode = $selection.eq( 0 )[0];
+					}
 				}
-
+				
 				context.$content.find( '.wikiEditor' ).removeClass( 'wikiEditor' );
-				if ( $.layout.name !== 'webkit' ) {
-					context.$content.removeClass( 'pasting' );
-				}
 				
-				// Restore cursor position
-				context.fn.purgeOffsets();
-				var newLength = context.fn.getContents().length;
-				var restoreTo = cursorPos[0] + newLength - oldLength;
+				//context.$content.find( '*' ).addClass( 'wikiEditor' );
+				
+				//now place the cursor at the end of pasted content
+				var restoreTo = cursorPos[1] + offset;
+				
 				context.fn.setSelection( { start: restoreTo, end: restoreTo } );
-			}, 0 );
-			return true;
+
+		}, 0 );
+		return true;
 		},
 		'ready': function( event ) {
 			// Initialize our history queue
@@ -8295,10 +8459,10 @@
 					end = e ? e.offset : null;
 					// Don't try to set the selection past the end of a node, causes errors
 					// Just put the selection at the end of the node in this case
-					if ( sc.nodeName == '#text' && start > sc.nodeValue.length ) {
+					if ( sc != null && sc.nodeName == '#text' && start > sc.nodeValue.length ) {
 						start = sc.nodeValue.length - 1;
 					}
-					if ( ec.nodeName == '#text' && end > ec.nodeValue.length ) {
+					if ( ec != null && ec.nodeName == '#text' && end > ec.nodeValue.length ) {
 						end = ec.nodeValue.length - 1;
 					}
 				}
@@ -8564,6 +8728,12 @@
 				$.wikiEditor.modules.dialogs.fn.reallyCreate( context, mod );
 				$dialog = $( '#' + mod.id );
 			}
+			
+			// Workaround for bug in jQuery UI: close button in top right retains focus
+			$dialog.closest( '.ui-dialog' )
+				.find( '.ui-dialog-titlebar-close' )
+				.removeClass( 'ui-state-focus' );
+			
 			$dialog.dialog( 'open' );
 		}
 	},
@@ -11172,17 +11342,19 @@
 					'peri' : $.wikiEditor.autoMsg( action.options, 'peri' ),
 					'post' : $.wikiEditor.autoMsg( action.options, 'post' )
 				};
+				var replace = action.type == 'replace';
 				if ( 'regex' in action.options && 'regexReplace' in action.options ) {
 					var selection = context.$textarea.textSelection( 'getSelection' );
 					if ( selection != '' && selection.match( action.options.regex ) ) {
 						parts.peri = selection.replace( action.options.regex,
 							action.options.regexReplace );
 						parts.pre = parts.post = '';
+						replace = true;
 					}
 				}
 				context.$textarea.textSelection(
 					'encapsulateSelection',
-					$.extend( {}, action.options, parts, { 'replace': action.type == 'replace' } )
+					$.extend( {}, action.options, parts, { 'replace': replace } )
 				);
 				if ( typeof context.$iframe !== 'undefined' ) {
 					context.$iframe[0].contentWindow.focus();
@@ -11459,9 +11631,9 @@
 			character = {
 				'label' : character,
 				'action' : {
-					'type' : 'encapsulate',
+					'type' : 'replace',
 					'options' : {
-						'pre' : character
+						'peri' : character
 					}
 				}
 			};
@@ -11469,9 +11641,9 @@
 			character = {
 				'label' : character[0],
 				'action' : {
-					'type' : 'encapsulate',
+					'type' : 'replace',
 					'options' : {
-						'pre' : character[1]
+						'peri' : character[1]
 					}
 				}
 			};
@@ -11675,3 +11847,426 @@
 } }; } )( jQuery );
+// THIS FILE HAS BEEN MODIFIED for use with the mediawiki wikiEditor
+// It no longer requires etherpad.collab.ace.easysync2.Changeset
+// THIS FILE WAS ORIGINALLY AN APPJET MODULE: etherpad.collab.ace.contentcollector
+
+/**
+ * Copyright 2009 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+var _MAX_LIST_LEVEL = 8;
+
+function sanitizeUnicode(s) {
+	return s.replace(/[\uffff\ufffe\ufeff\ufdd0-\ufdef\ud800-\udfff]/g, '?');
+}
+
+function makeContentCollector( browser, domInterface ) {
+	browser = browser || {};
+
+	var dom = domInterface || {
+		isNodeText : function(n) {
+			return (n.nodeType == 3);
+		},
+		nodeTagName : function(n) {
+			return n.tagName;
+		},
+		nodeValue : function(n) {
+			return n.nodeValue;
+		},
+		nodeNumChildren : function(n) {
+			return n.childNodes.length;
+		},
+		nodeChild : function(n, i) {
+			return n.childNodes.item(i);
+		},
+		nodeProp : function(n, p) {
+			return n[p];
+		},
+		nodeAttr : function(n, a) {
+			return n.getAttribute(a);
+		},
+		optNodeInnerHTML : function(n) {
+			return n.innerHTML;
+		}
+	};
+
+	var _blockElems = {
+		"div" : 1,
+		"p" : 1,
+		"pre" : 1,
+		"li" : 1
+	};
+	function isBlockElement(n) {
+		return !!_blockElems[(dom.nodeTagName(n) || "").toLowerCase()];
+	}
+	function textify(str) {
+		return sanitizeUnicode(str.replace(/[\n\r ]/g, ' ').replace(/\xa0/g,
+				' ').replace(/\t/g, '        '));
+	}
+	function getAssoc(node, name) {
+		return dom.nodeProp(node, "_magicdom_" + name);
+	}
+
+	var lines = (function() {
+		var textArray = [];
+		var self = {
+			length : function() {
+				return textArray.length;
+			},
+			atColumnZero : function() {
+				return textArray[textArray.length - 1] === "";
+			},
+			startNew : function() {
+				textArray.push("");
+				self.flush(true);
+			},
+			textOfLine : function(i) {
+				return textArray[i];
+			},
+			appendText : function(txt, attrString) {
+				textArray[textArray.length - 1] += txt;
+				// dmesg(txt+" / "+attrString);
+		},
+		textLines : function() {
+			return textArray.slice();
+		},
+		// call flush only when you're done
+			flush : function(withNewline) {
+				
+			}
+		};
+		self.startNew();
+		return self;
+	}());
+	var cc = {};
+	function _ensureColumnZero(state) {
+		if (!lines.atColumnZero()) {
+			_startNewLine(state);
+		}
+	}
+	var selection, startPoint, endPoint;
+	var selStart = [ -1, -1 ], selEnd = [ -1, -1 ];
+	var blockElems = {
+		"div" : 1,
+		"p" : 1,
+		"pre" : 1
+	};
+	function _isEmpty(node, state) {
+		// consider clean blank lines pasted in IE to be empty
+		if (dom.nodeNumChildren(node) == 0)
+			return true;
+		if (dom.nodeNumChildren(node) == 1 && getAssoc(node, "shouldBeEmpty")
+				&& dom.optNodeInnerHTML(node) == "&nbsp;"
+				&& !getAssoc(node, "unpasted")) {
+			if (state) {
+				var child = dom.nodeChild(node, 0);
+				_reachPoint(child, 0, state);
+				_reachPoint(child, 1, state);
+			}
+			return true;
+		}
+		return false;
+	}
+	function _pointHere(charsAfter, state) {
+		var ln = lines.length() - 1;
+		var chr = lines.textOfLine(ln).length;
+		if (chr == 0 && state.listType && state.listType != 'none') {
+			chr += 1; // listMarker
+		}
+		chr += charsAfter;
+		return [ ln, chr ];
+	}
+	function _reachBlockPoint(nd, idx, state) {
+		if (!dom.isNodeText(nd))
+			_reachPoint(nd, idx, state);
+	}
+	function _reachPoint(nd, idx, state) {
+		if (startPoint && nd == startPoint.node && startPoint.index == idx) {
+			selStart = _pointHere(0, state);
+		}
+		if (endPoint && nd == endPoint.node && endPoint.index == idx) {
+			selEnd = _pointHere(0, state);
+		}
+	}
+	function _incrementFlag(state, flagName) {
+		state.flags[flagName] = (state.flags[flagName] || 0) + 1;
+	}
+	function _decrementFlag(state, flagName) {
+		state.flags[flagName]--;
+	}
+	function _enterList(state, listType) {
+		var oldListType = state.listType;
+		state.listLevel = (state.listLevel || 0) + 1;
+		if (listType != 'none') {
+			state.listNesting = (state.listNesting || 0) + 1;
+		}
+		state.listType = listType;
+		return oldListType;
+	}
+	function _exitList(state, oldListType) {
+		state.listLevel--;
+		if (state.listType != 'none') {
+			state.listNesting--;
+		}
+		state.listType = oldListType;
+	}
+	function _produceListMarker(state) {
+		
+	}
+	function _startNewLine(state) {
+		if (state) {
+			var atBeginningOfLine = lines.textOfLine(lines.length() - 1).length == 0;
+			if (atBeginningOfLine && state.listType && state.listType != 'none') {
+				_produceListMarker(state);
+			}
+		}
+		lines.startNew();
+	}
+	cc.notifySelection = function(sel) {
+		if (sel) {
+			selection = sel;
+			startPoint = selection.startPoint;
+			endPoint = selection.endPoint;
+		}
+	};
+	cc.collectContent = function(node, state) {
+		if (!state) {
+			state = {
+				flags : {/* name -> nesting counter */}
+			};
+		}
+		var isBlock = isBlockElement(node);
+		var isEmpty = _isEmpty(node, state);
+		if (isBlock)
+			_ensureColumnZero(state);
+		var startLine = lines.length() - 1;
+		_reachBlockPoint(node, 0, state);
+		if (dom.isNodeText(node)) {
+			var txt = dom.nodeValue(node);
+			var rest = '';
+			var x = 0; // offset into original text
+			if (txt.length == 0) {
+				if (startPoint && node == startPoint.node) {
+					selStart = _pointHere(0, state);
+				}
+				if (endPoint && node == endPoint.node) {
+					selEnd = _pointHere(0, state);
+				}
+			}
+			while (txt.length > 0) {
+				var consumed = 0;
+				if (!browser.firefox || state.flags.preMode) {
+					var firstLine = txt.split('\n', 1)[0];
+					consumed = firstLine.length + 1;
+					rest = txt.substring(consumed);
+					txt = firstLine;
+				} else { /* will only run this loop body once */
+				}
+				if (startPoint && node == startPoint.node
+						&& startPoint.index - x <= txt.length) {
+					selStart = _pointHere(startPoint.index - x, state);
+				}
+				if (endPoint && node == endPoint.node
+						&& endPoint.index - x <= txt.length) {
+					selEnd = _pointHere(endPoint.index - x, state);
+				}
+				var txt2 = txt;
+				if ((!state.flags.preMode) && /^[\r\n]*$/.exec(txt)) {
+					// prevents textnodes containing just "\n" from being
+					// significant
+					// in safari when pasting text, now that we convert them to
+					// spaces instead of removing them, because in other cases
+					// removing "\n" from pasted HTML will collapse words
+					// together.
+					txt2 = "";
+				}
+				var atBeginningOfLine = lines.textOfLine(lines.length() - 1).length == 0;
+				if (atBeginningOfLine) {
+					// newlines in the source mustn't become spaces at beginning
+					// of line box
+					txt2 = txt2.replace(/^\n*/, '');
+				}
+				if (atBeginningOfLine && state.listType
+						&& state.listType != 'none') {
+					_produceListMarker(state);
+				}
+				lines.appendText(textify(txt2));
+				
+				x += consumed;
+				txt = rest;
+				if (txt.length > 0) {
+					_startNewLine(state);
+				}
+			}
+			
+		} else {
+			var tname = (dom.nodeTagName(node) || "").toLowerCase();
+			if (tname == "br") {
+				_startNewLine(state);
+			} else if (tname == "script" || tname == "style") {
+				// ignore
+			} else if (!isEmpty) {
+				var styl = dom.nodeAttr(node, "style");
+				var cls = dom.nodeProp(node, "className");
+
+				var isPre = (tname == "pre");
+				if ((!isPre) && browser.safari) {
+					isPre = (styl && /\bwhite-space:\s*pre\b/i.exec(styl));
+				}
+				if (isPre)
+					_incrementFlag(state, 'preMode');
+				var oldListTypeOrNull = null;
+
+				var nc = dom.nodeNumChildren(node);
+				for ( var i = 0; i < nc; i++) {
+					var c = dom.nodeChild(node, i);
+					cc.collectContent(c, state);
+				}
+
+				if (isPre)
+					_decrementFlag(state, 'preMode');
+				
+				if (oldListTypeOrNull) {
+					_exitList(state, oldListTypeOrNull);
+				}
+			}
+		}
+		if (!browser.msie) {
+			_reachBlockPoint(node, 1, state);
+		}
+		if (isBlock) {
+			if (lines.length() - 1 == startLine) {
+				_startNewLine(state);
+			} else {
+				_ensureColumnZero(state);
+			}
+		}
+
+		if (browser.msie) {
+			// in IE, a point immediately after a DIV appears on the next line
+			//_reachBlockPoint(node, 1, state);
+		}
+	};
+	// can pass a falsy value for end of doc
+	cc.notifyNextNode = function(node) {
+		// an "empty block" won't end a line; this addresses an issue in IE with
+		// typing into a blank line at the end of the document. typed text
+		// goes into the body, and the empty line div still looks clean.
+		// it is incorporated as dirty by the rule that a dirty region has
+		// to end a line.
+		if ((!node) || (isBlockElement(node) && !_isEmpty(node))) {
+			_ensureColumnZero(null);
+		}
+	};
+	// each returns [line, char] or [-1,-1]
+	var getSelectionStart = function() {
+		return selStart;
+	};
+	var getSelectionEnd = function() {
+		return selEnd;
+	};
+
+	// returns array of strings for lines found, last entry will be "" if
+	// last line is complete (i.e. if a following span should be on a new line).
+	// can be called at any point
+	cc.getLines = function() {
+		return lines.textLines();
+	};
+
+	// cc.applyHints = function(hints) {
+	// if (hints.pastedLines) {
+	//
+	// }
+	// }
+
+	cc.finish = function() {
+		lines.flush();
+		var lineStrings = cc.getLines();
+
+		lineStrings.length--;
+
+		var ss = getSelectionStart();
+		var se = getSelectionEnd();
+
+		function fixLongLines() {
+			// design mode does not deal with with really long lines!
+			var lineLimit = 2000; // chars
+			var buffer = 10; // chars allowed over before wrapping
+			var linesWrapped = 0;
+			var numLinesAfter = 0;
+			for ( var i = lineStrings.length - 1; i >= 0; i--) {
+				var oldString = lineStrings[i];
+				if (oldString.length > lineLimit + buffer) {
+					var newStrings = [];
+					while (oldString.length > lineLimit) {
+						// var semiloc = oldString.lastIndexOf(';',
+						// lineLimit-1);
+						// var lengthToTake = (semiloc >= 0 ? (semiloc+1) :
+						// lineLimit);
+						lengthToTake = lineLimit;
+						newStrings.push(oldString.substring(0, lengthToTake));
+						oldString = oldString.substring(lengthToTake);
+						
+					}
+					if (oldString.length > 0) {
+						newStrings.push(oldString);
+					}
+					function fixLineNumber(lineChar) {
+						if (lineChar[0] < 0)
+							return;
+						var n = lineChar[0];
+						var c = lineChar[1];
+						if (n > i) {
+							n += (newStrings.length - 1);
+						} else if (n == i) {
+							var a = 0;
+							while (c > newStrings[a].length) {
+								c -= newStrings[a].length;
+								a++;
+							}
+							n += a;
+						}
+						lineChar[0] = n;
+						lineChar[1] = c;
+					}
+					fixLineNumber(ss);
+					fixLineNumber(se);
+					linesWrapped++;
+					numLinesAfter += newStrings.length;
+
+					newStrings.unshift(i, 1);
+					lineStrings.splice.apply(lineStrings, newStrings);
+					
+				}
+			}
+			return {
+				linesWrapped : linesWrapped,
+				numLinesAfter : numLinesAfter
+			};
+		}
+		var wrapData = fixLongLines();
+
+		return {
+			selStart : ss,
+			selEnd : se,
+			linesWrapped : wrapData.linesWrapped,
+			numLinesAfter : wrapData.numLinesAfter,
+			lines : lineStrings
+		};
+	}
+
+	return cc;
+}

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.min.js
===================================================================
--- branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.min.js	2010-06-09 19:07:11 UTC (rev 67745)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.min.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -372,7 +372,7 @@
 return r;},c=function(i,a,b,c){var r={name:m((a.exec(i)||[u,u])[1],b)};r[r.name]=true;r.version=(c.exec(i)||[x,x,x,x])[3];if(r.name.match(/safari/)&&r.version>400){r.version='2.0';}
 if(r.name==='presto'){r.version=($.browser.version>9.27)?'futhark':'linear_b';}
 if(r.name==='opera'&&$.browser.version>=9.8){r.version=i.match(/version\/([0-9\.]*)/i)[1]||10;}
-r.versionNumber=parseFloat(r.version,10)||0;r.versionX=(r.version!==x)?(r.version+'').substr(0,1):x;r.className=r.name+r.versionX;return r;};a=(a.match(/Opera|Navigator|Minefield|KHTML|Chrome/)?m(a,[[/(Firefox|MSIE|KHTML,\slike\sGecko|Konqueror)/,''],['Chrome Safari','Chrome'],['KHTML','Konqueror'],['Minefield','Firefox'],['Navigator','Netscape']]):a).toLowerCase();$.browser=$.extend((!z)?$.browser:{},c(a,/(camino|chrome|firefox|netscape|konqueror|lynx|msie|opera|safari|ipod|iphone|blackberry)/,[],/(camino|chrome|firefox|netscape|netscape6|opera|version|konqueror|lynx|msie|safari)(\/|\s)([a-z0-9\.\+]*?)(\;|dev|rel|\s|$)/));$.layout=c(a,/(gecko|konqueror|msie|opera|webkit)/,[['konqueror','khtml'],['msie','trident'],['opera','presto']],/(applewebkit|rv|konqueror|msie)(\:|\/|\s)([a-z0-9\.]*?)(\;|\)|\s)/);$.os={name:(/(win|mac|linux|sunos|solaris|iphone)/.exec(navigator.platform.toLowerCase())||[u])[0].replace('sunos','solaris')};if(!z){$('html').addClass([$.os.name,$.browser.name,$.browser.className,$.layout.name,$.layout.className].join(' '));}};$.browserTest(navigator.userAgent);})(jQuery);(function($){$.fn.collapsibleTabs=function($$options){if(!this.length)return this;var $settings=$.extend({},$.collapsibleTabs.defaults,$$options);this.each(function(){var $this=$(this);$.collapsibleTabs.instances=($.collapsibleTabs.instances.length==0?$this:$.collapsibleTabs.instances.add($this));$this.data('collapsibleTabsSettings',$settings);$this.children($settings.collapsible).each(function(){$.collapsibleTabs.addData($(this));});});if(!$.collapsibleTabs.boundEvent){$(window).delayedBind('500','resize',function(){$.collapsibleTabs.handleResize();});}
+r.versionNumber=parseFloat(r.version,10)||0;r.versionX=(r.version!==x)?(r.version+'').substr(0,1):x;r.className=r.name+r.versionX;return r;};a=(a.match(/Opera|Navigator|Minefield|KHTML|Chrome|PLAYSTATION 3/)?m(a,[[/(Firefox|MSIE|KHTML,\slike\sGecko|Konqueror)/,''],['Chrome Safari','Chrome'],['KHTML','Konqueror'],['Minefield','Firefox'],['Navigator','Netscape'],['PLAYSTATION 3','PS3']]):a).toLowerCase();$.browser=$.extend((!z)?$.browser:{},c(a,/(camino|chrome|firefox|netscape|konqueror|lynx|msie|opera|safari|ipod|iphone|blackberry|ps3)/,[],/(camino|chrome|firefox|netscape|netscape6|opera|version|konqueror|lynx|msie|safari|ps3)(\/|\;?\s|)([a-z0-9\.\+]*?)(\;|dev|rel|\)|\s|$)/));$.layout=c(a,/(gecko|konqueror|msie|opera|webkit)/,[['konqueror','khtml'],['msie','trident'],['opera','presto']],/(applewebkit|rv|konqueror|msie)(\:|\/|\s)([a-z0-9\.]*?)(\;|\)|\s)/);$.os={name:(/(win|mac|linux|sunos|solaris|iphone)/.exec(navigator.platform.toLowerCase())||[u])[0].replace('sunos','solaris')};if(!z){$('html').addClass([$.os.name,$.browser.name,$.browser.className,$.layout.name,$.layout.className].join(' '));}};$.browserTest(navigator.userAgent);})(jQuery);(function($){$.fn.collapsibleTabs=function($$options){if(!this.length)return this;var $settings=$.extend({},$.collapsibleTabs.defaults,$$options);this.each(function(){var $this=$(this);$.collapsibleTabs.instances=($.collapsibleTabs.instances.length==0?$this:$.collapsibleTabs.instances.add($this));$this.data('collapsibleTabsSettings',$settings);$this.children($settings.collapsible).each(function(){$.collapsibleTabs.addData($(this));});});if(!$.collapsibleTabs.boundEvent){$(window).delayedBind('500','resize',function(){$.collapsibleTabs.handleResize();});}
 $.collapsibleTabs.handleResize();return this;};$.collapsibleTabs={instances:[],boundEvent:null,defaults:{expandedContainer:'#p-views ul',collapsedContainer:'#p-cactions ul',collapsible:'li.collapsible',shifting:false,expandCondition:function(eleWidth){return($('#left-navigation').position().left+$('#left-navigation').width())<($('#right-navigation').position().left-eleWidth);},collapseCondition:function(){return($('#left-navigation').position().left+$('#left-navigation').width())>$('#right-navigation').position().left;}},addData:function($collapsible){var $settings=$collapsible.parent().data('collapsibleTabsSettings');$collapsible.data('collapsibleTabsSettings',{'expandedContainer':$settings.expandedContainer,'collapsedContainer':$settings.collapsedContainer,'expandedWidth':$collapsible.width(),'prevElement':$collapsible.prev()});},getSettings:function($collapsible){var $settings=$collapsible.data('collapsibleTabsSettings');if(typeof $settings=='undefined'){$.collapsibleTabs.addData($collapsible);$settings=$collapsible.data('collapsibleTabsSettings');}
 return $settings;},handleResize:function(e){$.collapsibleTabs.instances.each(function(){var $this=$(this),data=$.collapsibleTabs.getSettings($this);if(data.shifting)return;if($this.children(data.collapsible).length>0&&data.collapseCondition()){$this.trigger("beforeTabCollapse");$.collapsibleTabs.moveToCollapsed($this.children(data.collapsible+':last'));}
 if($(data.collapsedContainer+' '+data.collapsible).length>0&&data.expandCondition($.collapsibleTabs.getSettings($(data.collapsedContainer).children(data.collapsible+":first")).expandedWidth)){$this.trigger("beforeTabExpand");$.collapsibleTabs.moveToExpanded(data.collapsedContainer+" "+data.collapsible+':first');}});},moveToCollapsed:function(ele){var $moving=$(ele);var data=$.collapsibleTabs.getSettings($moving);var dataExp=$.collapsibleTabs.getSettings(data.expandedContainer);dataExp.shifting=true;$moving.remove().prependTo(data.collapsedContainer).data('collapsibleTabsSettings',data);dataExp.shifting=false;$.collapsibleTabs.handleResize();},moveToExpanded:function(ele){var $moving=$(ele);var data=$.collapsibleTabs.getSettings($moving);var dataExp=$.collapsibleTabs.getSettings(data.expandedContainer);dataExp.shifting=true;$moving.remove().insertAfter(data.prevElement).data('collapsibleTabsSettings',data);dataExp.shifting=false;$.collapsibleTabs.handleResize();}};})(jQuery);(function(jQuery){jQuery.each(['backgroundColor','borderBottomColor','borderLeftColor','borderRightColor','borderTopColor','color','outlineColor'],function(i,attr){jQuery.fx.step[attr]=function(fx){if(fx.state==0){fx.start=getColor(fx.elem,attr);fx.end=getRGB(fx.end);}
@@ -391,7 +391,10 @@
 $.fn.extend({delayedBind:function(timeout,event,data,callback){var encEvent=encodeEvent(event);return this.each(function(){var that=this;if(!($(this).data('_delayedBindBound-'+encEvent+'-'+timeout))){$(this).data('_delayedBindBound-'+encEvent+'-'+timeout,true);$(this).bind(event,function(){var timerID=$(this).data('_delayedBindTimerID-'+encEvent+'-'+timeout);if(typeof timerID!='undefined')
 clearTimeout(timerID);timerID=setTimeout(function(){$(that).trigger('_delayedBind-'+encEvent+'-'+timeout);},timeout);$(this).data('_delayedBindTimerID-'+encEvent+'-'+timeout,timerID);});}
 $(this).bind('_delayedBind-'+encEvent+'-'+timeout,data,callback);});},delayedBindCancel:function(timeout,event){var encEvent=encodeEvent(event);return this.each(function(){var timerID=$(this).data('_delayedBindTimerID-'+encEvent+'-'+timeout);if(typeof timerID!='undefined')
-clearTimeout(timerID);});},delayedBindUnbind:function(timeout,event,callback){var encEvent=encodeEvent(event);return this.each(function(){$(this).unbind('_delayedBind-'+encEvent+'-'+timeout,callback);});}});})(jQuery);(function($){$.suggestions={cancel:function(context){if(context.data.timerID!=null){clearTimeout(context.data.timerID);}
+clearTimeout(timerID);});},delayedBindUnbind:function(timeout,event,callback){var encEvent=encodeEvent(event);return this.each(function(){$(this).unbind('_delayedBind-'+encEvent+'-'+timeout,callback);});}});})(jQuery);(function($){$.expandableField={expandField:function(e,context){context.config.beforeExpand.call(context.data.$field,context);context.data.$field.animate({'width':context.data.expandedWidth},'fast',function(){context.config.afterExpand.call(this,context);});},condenseField:function(e,context){context.config.beforeCondense.call(context.data.$field,context);context.data.$field.animate({'width':context.data.condensedWidth},'fast',function(){context.config.afterCondense.call(this,context);});},configure:function(context,property,value){switch(property){default:context.config[property]=value;break;}}};$.fn.expandableField=function(){var returnValue=null;var args=arguments;$(this).each(function(){var context=$(this).data('expandableField-context');if(context==null){context={config:{'beforeCondense':function(context){},'beforeExpand':function(context){},'afterCondense':function(context){},'afterExpand':function(context){}}};}
+if(args.length>0){if(typeof args[0]=='object'){for(var key in args[0]){$.expandableField.configure(context,key,args[0][key]);}}else if(typeof args[0]=='string'){if(args.length>1){$.expandableField.configure(context,args[0],args[1]);}else if(returnValue==null){returnValue=(args[0]in context.config?undefined:context.config[args[0]]);}}}
+if(typeof context.data=='undefined'){context.data={'condensedWidth':$(this).width(),'expandedWidth':$(this).width()*2,'$field':$(this)};$(this).addClass('expandableField').focus(function(e){$.expandableField.expandField(e,context);}).delayedBind(250,'blur',function(e){$.expandableField.condenseField(e,context);});}
+$(this).data('expandableField-context',context);});return returnValue!==null?returnValue:$(this);};})(jQuery);(function($){$.suggestions={cancel:function(context){if(context.data.timerID!=null){clearTimeout(context.data.timerID);}
 if(typeof context.config.cancel=='function'){context.config.cancel.call(context.data.$textbox);}},restore:function(context){context.data.$textbox.val(context.data.prevText);},update:function(context,delayed){function maybeFetch(){if(context.data.$textbox.val()!==context.data.prevText){context.data.prevText=context.data.$textbox.val();if(typeof context.config.fetch=='function'){context.config.fetch.call(context.data.$textbox,context.data.$textbox.val());}}}
 if(context.data.timerID!=null){clearTimeout(context.data.timerID);}
 if(delayed){context.data.timerID=setTimeout(maybeFetch,context.config.delay);}else{maybeFetch();}
@@ -426,7 +429,8 @@
 this.value=this.value.substring(0,startPos)+options.pre+selText+options.post+
 this.value.substring(endPos,this.value.length);this.scrollTop=scrollTop;if(window.opera){options.pre=options.pre.replace(/\r?\n/g,"\r\n");selText=selText.replace(/\r?\n/g,"\r\n");options.post=options.post.replace(/\r?\n/g,"\r\n");}
 if(isSample){this.selectionStart=startPos+options.pre.length;this.selectionEnd=startPos+options.pre.length+selText.length;}else{this.selectionStart=startPos+options.pre.length+selText.length+
-options.post.length;this.selectionEnd=this.selectionStart;}}else if(document.selection&&document.selection.createRange){$(this).focus();context.fn.restoreStuffForIE();var selText=$(this).textSelection('getSelection');var scrollTop=this.scrollTop;var range=document.selection.createRange();if(options.ownline&&range.moveStart){var range2=document.selection.createRange();range2.collapse();range2.moveStart('character',-1);if(range2.text!="\r"&&range2.text!="\n"&&range2.text!=""){options.pre="\n"+options.pre;}
+options.post.length;this.selectionEnd=this.selectionStart;}}else if(document.selection&&document.selection.createRange){$(this).focus();if(context){context.fn.restoreStuffForIE();}
+var selText=$(this).textSelection('getSelection');var scrollTop=this.scrollTop;var range=document.selection.createRange();if(options.ownline&&range.moveStart){var range2=document.selection.createRange();range2.collapse();range2.moveStart('character',-1);if(range2.text!="\r"&&range2.text!="\n"&&range2.text!=""){options.pre="\n"+options.pre;}
 var range3=document.selection.createRange();range3.collapse(false);range3.moveEnd('character',1);if(range3.text!="\r"&&range3.text!="\n"&&range3.text!=""){options.post+="\n";}}
 checkSelectedText();range.text=options.pre+selText+options.post;if(isSample&&range.moveStart){range.moveStart('character',-options.post.length-selText.length);range.moveEnd('character',-options.post.length);}
 range.select();this.scrollTop=scrollTop;}
@@ -437,7 +441,7 @@
 if(!postFinished){if(postRange.compareEndPoints("StartToEnd",postRange)==0){postFinished=true;}else{postRange.moveEnd("character",-1)
 if(postRange.text==postText){rawPostText+="\r\n";}else{postFinished=true;}}}}while((!preFinished||!periFinished||!postFinished));caretPos=rawPreText.replace(/\r\n/g,"\n").length;endPos=caretPos+rawPeriText.replace(/\r\n/g,"\n").length;}else if(e.selectionStart||e.selectionStart=='0'){caretPos=e.selectionStart;endPos=e.selectionEnd;}
 return options.startAndEnd?[caretPos,endPos]:caretPos;}
-return getCaret(this.get(0));},setSelection:function(options){return this.each(function(){if($(this).is(':hidden')){}else if(this.selectionStart||this.selectionStart=='0'){if(options.start>this.selectionEnd){this.selectionEnd=options.end;this.selectionStart=options.start;}else{this.selectionStart=options.start;this.selectionEnd=options.end;}}else if(document.body.createTextRange){var selection=document.body.createTextRange();selection.moveToElementText(this);var length=this.value.length;var newLines=this.value.match(/\n/g);if(newLines)length=length-newLines.length;selection.moveStart('character',options.start);selection.moveEnd('character',-length+options.end);selection.select();}});},scrollToCaretPosition:function(options){function getLineLength(e){return Math.floor(e.scrollWidth/($.os.name=='linux'?7:8));}
+return getCaret(this.get(0));},setSelection:function(options){return this.each(function(){if($(this).is(':hidden')){}else if(this.selectionStart||this.selectionStart=='0'){if(options.start>this.selectionEnd){this.selectionEnd=options.end;this.selectionStart=options.start;}else{this.selectionStart=options.start;this.selectionEnd=options.end;}}else if(document.body.createTextRange){var selection=document.body.createTextRange();selection.moveToElementText(this);var length=this.value.length;var newLines=this.value.match(/\n/g);if(newLines)length=length-newLines.length;selection.moveStart('character',options.start);selection.moveEnd('character',-length+options.end);try{selection.select();}catch(e){}}});},scrollToCaretPosition:function(options){function getLineLength(e){return Math.floor(e.scrollWidth/($.os.name=='linux'?7:8));}
 function getCaretScrollPosition(e){var text=e.value.replace(/\r/g,"");var caret=$(e).textSelection('getCaretPosition');var lineLength=getLineLength(e);var row=0;var charInLine=0;var lastSpaceInLine=0;for(i=0;i<caret;i++){charInLine++;if(text.charAt(i)==" "){lastSpaceInLine=charInLine;}else if(text.charAt(i)=="\n"){lastSpaceInLine=0;charInLine=0;row++;}
 if(charInLine>lineLength){if(lastSpaceInLine>0){charInLine=charInLine-lastSpaceInLine;lastSpaceInLine=0;row++;}}}
 var nextSpace=0;for(j=caret;j<caret+lineLength;j++){if(text.charAt(j)==" "||text.charAt(j)=="\n"||caret==text.length){nextSpace=j;break;}}
@@ -469,15 +473,21 @@
 break;}
 return true;},'change':function(event){event.data.scope='division';var newHTML=context.$content.html();if(context.oldHTML!=newHTML){context.fn.purgeOffsets();context.oldHTML=newHTML;event.data.scope='realchange';}
 if(context.$content.children().length==0){context.$content.append('<p></p>');}
-return true;},'delayedChange':function(event){event.data.scope='division';var newHTML=context.$content.html();if(context.oldDelayedHTML!=newHTML){context.oldDelayedHTML=newHTML;event.data.scope='realchange';var cursorPos=context.fn.getCaretPosition();var t=context.fn.getOffset(cursorPos[0]);if(t&&t.node.nodeName=='#text'&&t.node.parentNode.nodeName.toLowerCase()=='body'){$(t.node).wrap("<p></p>");context.fn.purgeOffsets();context.fn.setSelection({start:cursorPos[0],end:cursorPos[1]});}}
-context.fn.updateHistory(event.data.scope=='realchange');return true;},'cut':function(event){setTimeout(function(){context.$content.find('br').each(function(){if($(this).parent().is('body')){$(this).wrap($('<p></p>'));}});},100);return true;},'paste':function(event){var cursorPos=context.fn.getCaretPosition();var oldLength=context.fn.getContents().length-(cursorPos[1]-cursorPos[0]);context.$content.find(':not(.wikiEditor)').addClass('wikiEditor');if($.layout.name!=='webkit'){context.$content.addClass('pasting');}
-setTimeout(function(){context.$content.find('script,style,img,input,select,textarea,hr,button,link,meta').remove();context.$content.find('*').each(function(){if($(this).children().length==0&&this.childNodes.length>0){$(this).text($(this).text());}});context.$content.find('p:not(.wikiEditor) p:not(.wikiEditor)').each(function(){var outerParent=$(this).parent();outerParent.replaceWith(outerParent.childNodes);});context.$content.find('span.Apple-style-span').each(function(){$(this).replaceWith(this.childNodes);});var pasteContent=context.fn.getOffset(cursorPos[0]).node;var removeNextBR=false;while(pasteContent!=null&&!$(pasteContent).hasClass('wikiEditor')){var currentNode=pasteContent;pasteContent=pasteContent.nextSibling;if(currentNode.nodeName=='#text'&&currentNode.nodeValue==currentNode.wholeText){var pWrapper=$('<p />').addClass('wikiEditor');$(currentNode).wrap(pWrapper);$(currentNode).addClass('wikiEditor');removeNextBR=true;}else if(currentNode.nodeName=='BR'&&removeNextBR){$(currentNode).remove();removeNextBR=false;}else{removeNextBR=false;}}
-var $selection=context.$content.find(':not(.wikiEditor)');while($selection.length&&$selection.length>0){var $currentElement=$selection.eq(0);while(!$currentElement.parent().is('body')&&!$currentElement.parent().is('.wikiEditor')){$currentElement=$currentElement.parent();}
-var $newElement;if($currentElement.is('p')||$currentElement.is('div')||$currentElement.is('pre')){$newElement=$('<p />');}else{$newElement=$('<span />').addClass('wikiEditor');}
-var pieces=$.trim($currentElement.text()).split('\n');var newElementHTML='';for(var i=0;i<pieces.length;i++){if(pieces[i]){newElementHTML+=$.trim(pieces[i]);}else{newElementHTML+='<span><br class="wikiEditor" /></span>';}}
-$newElement.html(newElementHTML).addClass('wikiEditor').insertAfter($currentElement);$currentElement.remove();$selection=context.$content.find(':not(.wikiEditor)');}
-context.$content.find('.wikiEditor').removeClass('wikiEditor');if($.layout.name!=='webkit'){context.$content.removeClass('pasting');}
-context.fn.purgeOffsets();var newLength=context.fn.getContents().length;var restoreTo=cursorPos[0]+newLength-oldLength;context.fn.setSelection({start:restoreTo,end:restoreTo});},0);return true;},'ready':function(event){context.history.push({'html':context.$content.html(),'sel':context.fn.getCaretPosition()});return true;}};context.fn={'trigger':function(name,event){if(typeof event=='undefined'){event={'type':'custom'};}
+return true;},'delayedChange':function(event){event.data.scope='division';var newHTML=context.$content.html();if(context.oldDelayedHTML!=newHTML){context.oldDelayedHTML=newHTML;event.data.scope='realchange';var cursorPos=context.fn.getCaretPosition();var t=context.fn.getOffset(cursorPos[0]);if(!$.browser.msie&&t&&t.node.nodeName=='#text'&&t.node.parentNode.nodeName.toLowerCase()=='body'){$(t.node).wrap("<p></p>");context.fn.purgeOffsets();context.fn.setSelection({start:cursorPos[0],end:cursorPos[1]});}}
+context.fn.updateHistory(event.data.scope=='realchange');return true;},'cut':function(event){setTimeout(function(){context.$content.find('br').each(function(){if($(this).parent().is('body')){$(this).wrap($('<p></p>'));}});},100);return true;},'paste':function(event){var cursorPos=context.fn.getCaretPosition();var offset=0;var oldLength=context.fn.getContents().length;context.$content.find('*').addClass('wikiEditor');if($.layout.name!=='webkit'){context.$content.addClass('pasting');}
+setTimeout(function(){context.$content.find('script,style,img,input,select,textarea,hr,button,link,meta').remove();var $selection=context.$content.find(':not(.wikiEditor)');var nodeToDelete=[];var firstDirtyNode;if($selection.length==0){firstDirtyNode=context.fn.getOffset(cursorPos[0]).node;}else{firstDirtyNode=$selection.eq(0)[0];}
+while(firstDirtyNode!=null){while(firstDirtyNode.parentNode.nodeName!='BODY'&&!$(firstDirtyNode.parentNode).hasClass('wikiEditor')){firstDirtyNode=firstDirtyNode.parentNode;}
+while(firstDirtyNode.previousSibling!=null&&!$(firstDirtyNode.previousSibling).hasClass('wikiEditor')){if($(firstDirtyNode.previousSibling).hasClass('#comment')){$(firstDirtyNode).remove();}else{firstDirtyNode=firstDirtyNode.previousSibling;}}
+var $lastDirtyNode=$(firstDirtyNode);var cc=makeContentCollector($.browser,null);while(firstDirtyNode!=null&&!$(firstDirtyNode).hasClass('wikiEditor')){cc.collectContent(firstDirtyNode);cc.notifyNextNode(firstDirtyNode.nextSibling);pastedContent=cc.getLines();if((pastedContent.length<=1||pastedContent[pastedContent.length-1]!=="")&&firstDirtyNode.nextSibling){nodeToDelete.push(firstDirtyNode);firstDirtyNode=firstDirtyNode.nextSibling;cc.collectContent(firstDirtyNode);cc.notifyNextNode(firstDirtyNode.nextSibling);}
+nodeToDelete.push(firstDirtyNode);firstDirtyNode=firstDirtyNode.nextSibling;}
+var ccData=cc.finish();var pastedContent=ccData.lines;if(pastedContent.length==0&&firstDirtyNode){offset+=$(firstDirtyNode).text().length;}
+if(nodeToDelete.length>0){$lastDirtyNode=$(nodeToDelete[nodeToDelete.length-1]);}
+var testVal='';testVal=$(nodeToDelete[0]).text();var pastedPretty='';for(var i=0;i<pastedContent.length;i++){pastedPretty=pastedContent[i].replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/\r?\n/g,'\\n');match=pastedContent[i].match(/^[\s]+[^\s]/);if(match!=null&&match.length>0){index=match[0].length;leadingSpace=match[0].replace(/[\s]/g,'&nbsp;');pastedPretty=leadingSpace+pastedPretty.substring(index,pastedPretty.length);}
+$newElement=$('<p class="wikiEditor" ></p>');if(pastedPretty){$newElement.html('<span class = "wikiEditor">'+pastedPretty+'</span>');}else{$newElement.html('<br class="wikiEditor">');}
+$newElement.insertAfter($lastDirtyNode);offset+=pastedPretty.length;$lastDirtyNode=$newElement;}
+while(nodeToDelete.length>0){$(nodeToDelete.pop()).remove();}
+$selection=context.$content.find(':not(.wikiEditor)');if($selection.length==0){firstDirtyNode=null;}else{firstDirtyNode=$selection.eq(0)[0];}}
+context.$content.find('.wikiEditor').removeClass('wikiEditor');var restoreTo=cursorPos[1]+offset;context.fn.setSelection({start:restoreTo,end:restoreTo});},0);return true;},'ready':function(event){context.history.push({'html':context.$content.html(),'sel':context.fn.getCaretPosition()});return true;}};context.fn={'trigger':function(name,event){if(typeof event=='undefined'){event={'type':'custom'};}
 if(typeof event.data=='undefined'){event.data={};}
 if(name in context.evt){if(!context.evt[name](event)){return false;}}
 var returnFromModules=null;for(var module in context.modules){if(module in $.wikiEditor.modules&&'evt'in $.wikiEditor.modules[module]&&name in $.wikiEditor.modules[module].evt){var ret=$.wikiEditor.modules[module].evt[name](context,event);if(ret!=null){if(returnFromModules==null){returnFromModules=ret;}else{returnFromModules=returnFromModules&&ret;}}}}
@@ -567,8 +577,8 @@
 if(periRange.text==periText){rawPeriText+="\r\n";}else{periFinished=true;}}}
 if(!postFinished){if(postRange.compareEndPoints("StartToEnd",postRange)==0){postFinished=true;}else{postRange.moveEnd("character",-1)
 if(postRange.text==postText){rawPostText+="\r\n";}else{postFinished=true;}}}}while((!postFinished||!periFinished||!postFinished));startPos=rawPreText.replace(/\r\n/g,"\n").length;endPos=startPos+rawPeriText.replace(/\r\n/g,"\n").length;}catch(e){startPos=endPos=0;}}
-return[startPos,endPos];},'setSelection':function(options){var sc=options.startContainer,ec=options.endContainer;sc=sc&&sc.jquery?sc[0]:sc;ec=ec&&ec.jquery?ec[0]:ec;if(context.$iframe[0].contentWindow.getSelection){var start=options.start,end=options.end;if(!sc||!ec){var s=context.fn.getOffset(start);var e=context.fn.getOffset(end);sc=s?s.node:null;ec=e?e.node:null;start=s?s.offset:null;end=e?e.offset:null;if(sc.nodeName=='#text'&&start>sc.nodeValue.length){start=sc.nodeValue.length-1;}
-if(ec.nodeName=='#text'&&end>ec.nodeValue.length){end=ec.nodeValue.length-1;}}
+return[startPos,endPos];},'setSelection':function(options){var sc=options.startContainer,ec=options.endContainer;sc=sc&&sc.jquery?sc[0]:sc;ec=ec&&ec.jquery?ec[0]:ec;if(context.$iframe[0].contentWindow.getSelection){var start=options.start,end=options.end;if(!sc||!ec){var s=context.fn.getOffset(start);var e=context.fn.getOffset(end);sc=s?s.node:null;ec=e?e.node:null;start=s?s.offset:null;end=e?e.offset:null;if(sc!=null&&sc.nodeName=='#text'&&start>sc.nodeValue.length){start=sc.nodeValue.length-1;}
+if(ec!=null&&ec.nodeName=='#text'&&end>ec.nodeValue.length){end=ec.nodeValue.length-1;}}
 if(!sc||!ec){return context.$textarea;}
 var sel=context.$iframe[0].contentWindow.getSelection();while(sc.firstChild&&sc.nodeName!='#text'){sc=sc.firstChild;}
 while(ec.firstChild&&ec.nodeName!='#text'){ec=ec.firstChild;}
@@ -589,7 +599,7 @@
 for(module in modules){if(module in $.wikiEditor.modules&&$.wikiEditor.isSupported($.wikiEditor.modules[module])&&$.wikiEditor.isRequired($.wikiEditor.modules[module],'iframe')){context.fn.setupIframe();break;}}}
 if(args.length>0){var call=args.shift();if(call in context.api){context.api[call](context,typeof args[0]=='undefined'?{}:args[0]);}}
 return $(this).data('wikiEditor-context',context);};})(jQuery);RegExp.escape=function(s){return s.replace(/([.*+?^${}()|\/\\[\]])/g,'\\$1');};(function($){$.wikiEditor.modules.dialogs={'browsers':{'ltr':{'msie':[['>=',7]],'firefox':[['>=',2],['!=','2.0'],['!=','2.0.0.1'],['!=','2.0.0.2'],['!=','2.0.0.3'],['!=','2.0.0.4']],'opera':[['>=',9.6]],'safari':[['>=',3]],'chrome':[['>=',3]]},'rtl':{'msie':[['>=',7]],'firefox':[['>=',2],['!=','2.0'],['!=','2.0.0.1'],['!=','2.0.0.2'],['!=','2.0.0.3'],['!=','2.0.0.4']],'opera':[['>=',9.6]],'safari':[['>=',3]],'chrome':[['>=',3]]}},api:{addDialog:function(context,data){$.wikiEditor.modules.dialogs.fn.create(context,data)},openDialog:function(context,module){if(module in $.wikiEditor.modules.dialogs.modules){var mod=$.wikiEditor.modules.dialogs.modules[module];var $dialog=$('#'+mod.id);if($dialog.length==0){$.wikiEditor.modules.dialogs.fn.reallyCreate(context,mod);$dialog=$('#'+mod.id);}
-$dialog.dialog('open');}},closeDialog:function(context,module){if(module in $.wikiEditor.modules.dialogs.modules){$('#'+$.wikiEditor.modules.dialogs.modules[module].id).dialog('close');}}},fn:{create:function(context,config){for(mod in config){var module=config[mod];var filtered=false;if(typeof module.filters!='undefined'){for(var i=0;i<module.filters.length;i++){if($(module.filters[i]).length==0){filtered=true;break;}}}
+$dialog.closest('.ui-dialog').find('.ui-dialog-titlebar-close').removeClass('ui-state-focus');$dialog.dialog('open');}},closeDialog:function(context,module){if(module in $.wikiEditor.modules.dialogs.modules){$('#'+$.wikiEditor.modules.dialogs.modules[module].id).dialog('close');}}},fn:{create:function(context,config){for(mod in config){var module=config[mod];var filtered=false;if(typeof module.filters!='undefined'){for(var i=0;i<module.filters.length;i++){if($(module.filters[i]).length==0){filtered=true;break;}}}
 if(!filtered&&$.wikiEditor.isSupported(module)&&$('#'+module.id).size()==0){$.wikiEditor.modules.dialogs.modules[mod]=module;if(typeof context.$iframe=='undefined'&&$.wikiEditor.isRequired(module,'iframe')){context.fn.setupIframe();}
 context.$textarea.trigger('wikiEditor-dialogs-setup-'+mod);}}},reallyCreate:function(context,module){mw.usability.load(['$j.ui','$j.ui.dialog','$j.ui.draggable','$j.ui.resizable'],function(){var configuration=module.dialog;configuration.bgiframe=true;configuration.autoOpen=false;configuration.modal=true;configuration.title=$.wikiEditor.autoMsg(module,'title');configuration.newButtons={};for(msg in configuration.buttons)
 configuration.newButtons[mw.usability.getMsg(msg)]=configuration.buttons[msg];configuration.buttons=configuration.newButtons;var dialogDiv=$('<div />').attr('id',module.id).html(module.html).data('context',context).appendTo($('body')).each(module.init).dialog(configuration);$.wikiEditor.modules.dialogs.fn.setTabindexes(dialogDiv.closest('.ui-dialog').find('button').not('[tabindex]'));if(!('resizeme'in module)||module.resizeme){dialogDiv.bind('dialogopen',$.wikiEditor.modules.dialogs.fn.resize).find('.ui-tabs').bind('tabsshow',function(){$(this).closest('.ui-dialog-content').each($.wikiEditor.modules.dialogs.fn.resize);});}
@@ -761,8 +771,8 @@
 i++;var rel=step.attr('rel');if(rel){rels.push(step.attr('rel'));}
 step=step.parent();}
 rels.reverse();var id=rels.join('.');$.trackAction(id);}
-switch(action.type){case'replace':case'encapsulate':var parts={'pre':$.wikiEditor.autoMsg(action.options,'pre'),'peri':$.wikiEditor.autoMsg(action.options,'peri'),'post':$.wikiEditor.autoMsg(action.options,'post')};if('regex'in action.options&&'regexReplace'in action.options){var selection=context.$textarea.textSelection('getSelection');if(selection!=''&&selection.match(action.options.regex)){parts.peri=selection.replace(action.options.regex,action.options.regexReplace);parts.pre=parts.post='';}}
-context.$textarea.textSelection('encapsulateSelection',$.extend({},action.options,parts,{'replace':action.type=='replace'}));if(typeof context.$iframe!=='undefined'){context.$iframe[0].contentWindow.focus();}
+switch(action.type){case'replace':case'encapsulate':var parts={'pre':$.wikiEditor.autoMsg(action.options,'pre'),'peri':$.wikiEditor.autoMsg(action.options,'peri'),'post':$.wikiEditor.autoMsg(action.options,'post')};var replace=action.type=='replace';if('regex'in action.options&&'regexReplace'in action.options){var selection=context.$textarea.textSelection('getSelection');if(selection!=''&&selection.match(action.options.regex)){parts.peri=selection.replace(action.options.regex,action.options.regexReplace);parts.pre=parts.post='';replace=true;}}
+context.$textarea.textSelection('encapsulateSelection',$.extend({},action.options,parts,{'replace':replace}));if(typeof context.$iframe!=='undefined'){context.$iframe[0].contentWindow.focus();}
 break;case'callback':if(typeof action.execute=='function'){action.execute(context);}
 break;case'dialog':context.fn.saveSelection();context.$textarea.wikiEditor('openDialog',action.module);break;default:break;}},buildGroup:function(context,id,group){var $group=$('<div />').attr({'class':'group group-'+id,'rel':id});var label=$.wikiEditor.autoMsg(group,'label');if(label){$group.append('<div class="label">'+label+'</div>')}
 var empty=true;if('tools'in group){for(tool in group.tools){var tool=$.wikiEditor.modules.toolbar.fn.buildTool(context,tool,group.tools[tool]);if(tool){empty=empty&&tool.css('display')=='none';$group.append(tool);}}}
@@ -783,7 +793,7 @@
 return $page;},buildHeading:function(context,headings){var html='<tr>';for(heading in headings){html+='<th>'+$.wikiEditor.autoMsg(headings[heading],['html','text'])+'</th>';}
 return html;},buildRow:function(context,row){var html='<tr>';for(cell in row){html+='<td class="cell cell-'+cell+'" valign="top"><span>'+
 $.wikiEditor.autoMsg(row[cell],['html','text'])+'</span></td>';}
-html+='</tr>';return html;},buildCharacter:function(character,actions){if(typeof character=='string'){character={'label':character,'action':{'type':'encapsulate','options':{'pre':character}}};}else if(0 in character&&1 in character){character={'label':character[0],'action':{'type':'encapsulate','options':{'pre':character[1]}}};}
+html+='</tr>';return html;},buildCharacter:function(character,actions){if(typeof character=='string'){character={'label':character,'action':{'type':'replace','options':{'peri':character}}};}else if(0 in character&&1 in character){character={'label':character[0],'action':{'type':'replace','options':{'peri':character[1]}}};}
 if('action'in character&&'label'in character){actions[character.label]=character.action;return'<span rel="'+character.label+'">'+character.label+'</span>';}},buildTab:function(context,id,section){var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');if(selected!=null){$.cookie('wikiEditor-'+context.instance+'-toolbar-section',selected,{expires:30,path:'/'});}
 return $('<span />').attr({'class':'tab tab-'+id,'rel':id}).append($('<a />').addClass(selected==id?'current':null).attr('href','#').text($.wikiEditor.autoMsg(section,'label')).data('context',context).mouseup(function(e){$(this).blur();}).mousedown(function(e){e.preventDefault();return false;}).click(function(e){var $sections=$(this).data('context').$ui.find('.sections');var $section=$(this).data('context').$ui.find('.section-'+$(this).parent().attr('rel'));var show=$section.css('display')=='none';$previousSections=$section.parent().find('.section-visible');$previousSections.css('position','absolute');$previousSections.removeClass('section-visible');$previousSections.fadeOut('fast',function(){$(this).css('position','relative');});$(this).parent().parent().find('a').removeClass('current');$sections.css('overflow','hidden');function animate($this){$sections.css('display','block').animate({'height':$section.outerHeight()},$section.outerHeight()*2,function(){$this.css('overflow','visible').css('height','auto');context.fn.trigger('resize');});}
 if(show){$section.addClass('section-visible');$section.fadeIn('fast');if($section.hasClass('loading')){$this=$(this);$this.addClass('current loading');setTimeout(function(){$section.trigger('loadSection');animate($(this));$this.removeClass('loading');},1000);}else{animate($(this));$(this).addClass('current');}}else{$sections.css('height',$section.outerHeight()).animate({'height':'hide'},$section.outerHeight()*2,function(){$(this).css({'overflow':'visible','height':0});context.fn.trigger('resize');});}
@@ -796,4 +806,54 @@
 $section.append($index).append($pages);$.wikiEditor.modules.toolbar.fn.updateBookletSelection(context,page,$pages,$index);break;}},updateBookletSelection:function(context,id,$pages,$index){var cookie='wikiEditor-'+context.instance+'-booklet-'+id+'-page';var selected=$.cookie(cookie);if(selected!=null){$.cookie(cookie,selected,{expires:30,path:'/'});}
 var $selectedIndex=$index.find('*[rel='+selected+']');if($selectedIndex.size()==0){selected=$index.children().eq(0).attr('rel');$.cookie(cookie,selected,{expires:30,path:'/'});}
 $pages.children().hide();$pages.find('*[rel='+selected+']').show();$index.children().removeClass('current');$selectedIndex.addClass('current');},build:function(context,config){var $tabs=$('<div />').addClass('tabs').appendTo(context.modules.toolbar.$toolbar);var $sections=$('<div />').addClass('sections').appendTo(context.modules.toolbar.$toolbar);context.modules.toolbar.$toolbar.append($('<div />').css('clear','both'));var sectionQueue=[];for(section in config){if(section=='main'){context.modules.toolbar.$toolbar.prepend($.wikiEditor.modules.toolbar.fn.buildSection(context,section,config[section]));}else{sectionQueue.push({'$sections':$sections,'context':context,'id':section,'config':config[section]});$tabs.append($.wikiEditor.modules.toolbar.fn.buildTab(context,section,config[section]));}}
-$.eachAsync(sectionQueue,{'bulk':0,'end':function(){var oldValue=$('body').css('position');$('body').css('position','static');$('body').css('position',oldValue);},'loop':function(i,s){s.$sections.append($.wikiEditor.modules.toolbar.fn.buildSection(s.context,s.id,s.config));var $section=s.$sections.find('.section:visible');if($section.size()){$sections.animate({'height':$section.outerHeight()},$section.outerHeight()*2,function(){context.fn.trigger('resize');});}}});}}};})(jQuery);
\ No newline at end of file
+$.eachAsync(sectionQueue,{'bulk':0,'end':function(){var oldValue=$('body').css('position');$('body').css('position','static');$('body').css('position',oldValue);},'loop':function(i,s){s.$sections.append($.wikiEditor.modules.toolbar.fn.buildSection(s.context,s.id,s.config));var $section=s.$sections.find('.section:visible');if($section.size()){$sections.animate({'height':$section.outerHeight()},$section.outerHeight()*2,function(){context.fn.trigger('resize');});}}});}}};})(jQuery);var _MAX_LIST_LEVEL=8;function sanitizeUnicode(s){return s.replace(/[\uffff\ufffe\ufeff\ufdd0-\ufdef\ud800-\udfff]/g,'?');}
+function makeContentCollector(browser,domInterface){browser=browser||{};var dom=domInterface||{isNodeText:function(n){return(n.nodeType==3);},nodeTagName:function(n){return n.tagName;},nodeValue:function(n){return n.nodeValue;},nodeNumChildren:function(n){return n.childNodes.length;},nodeChild:function(n,i){return n.childNodes.item(i);},nodeProp:function(n,p){return n[p];},nodeAttr:function(n,a){return n.getAttribute(a);},optNodeInnerHTML:function(n){return n.innerHTML;}};var _blockElems={"div":1,"p":1,"pre":1,"li":1};function isBlockElement(n){return!!_blockElems[(dom.nodeTagName(n)||"").toLowerCase()];}
+function textify(str){return sanitizeUnicode(str.replace(/[\n\r ]/g,' ').replace(/\xa0/g,' ').replace(/\t/g,'        '));}
+function getAssoc(node,name){return dom.nodeProp(node,"_magicdom_"+name);}
+var lines=(function(){var textArray=[];var self={length:function(){return textArray.length;},atColumnZero:function(){return textArray[textArray.length-1]==="";},startNew:function(){textArray.push("");self.flush(true);},textOfLine:function(i){return textArray[i];},appendText:function(txt,attrString){textArray[textArray.length-1]+=txt;},textLines:function(){return textArray.slice();},flush:function(withNewline){}};self.startNew();return self;}());var cc={};function _ensureColumnZero(state){if(!lines.atColumnZero()){_startNewLine(state);}}
+var selection,startPoint,endPoint;var selStart=[-1,-1],selEnd=[-1,-1];var blockElems={"div":1,"p":1,"pre":1};function _isEmpty(node,state){if(dom.nodeNumChildren(node)==0)
+return true;if(dom.nodeNumChildren(node)==1&&getAssoc(node,"shouldBeEmpty")&&dom.optNodeInnerHTML(node)=="&nbsp;"&&!getAssoc(node,"unpasted")){if(state){var child=dom.nodeChild(node,0);_reachPoint(child,0,state);_reachPoint(child,1,state);}
+return true;}
+return false;}
+function _pointHere(charsAfter,state){var ln=lines.length()-1;var chr=lines.textOfLine(ln).length;if(chr==0&&state.listType&&state.listType!='none'){chr+=1;}
+chr+=charsAfter;return[ln,chr];}
+function _reachBlockPoint(nd,idx,state){if(!dom.isNodeText(nd))
+_reachPoint(nd,idx,state);}
+function _reachPoint(nd,idx,state){if(startPoint&&nd==startPoint.node&&startPoint.index==idx){selStart=_pointHere(0,state);}
+if(endPoint&&nd==endPoint.node&&endPoint.index==idx){selEnd=_pointHere(0,state);}}
+function _incrementFlag(state,flagName){state.flags[flagName]=(state.flags[flagName]||0)+1;}
+function _decrementFlag(state,flagName){state.flags[flagName]--;}
+function _enterList(state,listType){var oldListType=state.listType;state.listLevel=(state.listLevel||0)+1;if(listType!='none'){state.listNesting=(state.listNesting||0)+1;}
+state.listType=listType;return oldListType;}
+function _exitList(state,oldListType){state.listLevel--;if(state.listType!='none'){state.listNesting--;}
+state.listType=oldListType;}
+function _produceListMarker(state){}
+function _startNewLine(state){if(state){var atBeginningOfLine=lines.textOfLine(lines.length()-1).length==0;if(atBeginningOfLine&&state.listType&&state.listType!='none'){_produceListMarker(state);}}
+lines.startNew();}
+cc.notifySelection=function(sel){if(sel){selection=sel;startPoint=selection.startPoint;endPoint=selection.endPoint;}};cc.collectContent=function(node,state){if(!state){state={flags:{}};}
+var isBlock=isBlockElement(node);var isEmpty=_isEmpty(node,state);if(isBlock)
+_ensureColumnZero(state);var startLine=lines.length()-1;_reachBlockPoint(node,0,state);if(dom.isNodeText(node)){var txt=dom.nodeValue(node);var rest='';var x=0;if(txt.length==0){if(startPoint&&node==startPoint.node){selStart=_pointHere(0,state);}
+if(endPoint&&node==endPoint.node){selEnd=_pointHere(0,state);}}
+while(txt.length>0){var consumed=0;if(!browser.firefox||state.flags.preMode){var firstLine=txt.split('\n',1)[0];consumed=firstLine.length+1;rest=txt.substring(consumed);txt=firstLine;}else{}
+if(startPoint&&node==startPoint.node&&startPoint.index-x<=txt.length){selStart=_pointHere(startPoint.index-x,state);}
+if(endPoint&&node==endPoint.node&&endPoint.index-x<=txt.length){selEnd=_pointHere(endPoint.index-x,state);}
+var txt2=txt;if((!state.flags.preMode)&&/^[\r\n]*$/.exec(txt)){txt2="";}
+var atBeginningOfLine=lines.textOfLine(lines.length()-1).length==0;if(atBeginningOfLine){txt2=txt2.replace(/^\n*/,'');}
+if(atBeginningOfLine&&state.listType&&state.listType!='none'){_produceListMarker(state);}
+lines.appendText(textify(txt2));x+=consumed;txt=rest;if(txt.length>0){_startNewLine(state);}}}else{var tname=(dom.nodeTagName(node)||"").toLowerCase();if(tname=="br"){_startNewLine(state);}else if(tname=="script"||tname=="style"){}else if(!isEmpty){var styl=dom.nodeAttr(node,"style");var cls=dom.nodeProp(node,"className");var isPre=(tname=="pre");if((!isPre)&&browser.safari){isPre=(styl&&/\bwhite-space:\s*pre\b/i.exec(styl));}
+if(isPre)
+_incrementFlag(state,'preMode');var oldListTypeOrNull=null;var nc=dom.nodeNumChildren(node);for(var i=0;i<nc;i++){var c=dom.nodeChild(node,i);cc.collectContent(c,state);}
+if(isPre)
+_decrementFlag(state,'preMode');if(oldListTypeOrNull){_exitList(state,oldListTypeOrNull);}}}
+if(!browser.msie){_reachBlockPoint(node,1,state);}
+if(isBlock){if(lines.length()-1==startLine){_startNewLine(state);}else{_ensureColumnZero(state);}}
+if(browser.msie){}};cc.notifyNextNode=function(node){if((!node)||(isBlockElement(node)&&!_isEmpty(node))){_ensureColumnZero(null);}};var getSelectionStart=function(){return selStart;};var getSelectionEnd=function(){return selEnd;};cc.getLines=function(){return lines.textLines();};cc.finish=function(){lines.flush();var lineStrings=cc.getLines();lineStrings.length--;var ss=getSelectionStart();var se=getSelectionEnd();function fixLongLines(){var lineLimit=2000;var buffer=10;var linesWrapped=0;var numLinesAfter=0;for(var i=lineStrings.length-1;i>=0;i--){var oldString=lineStrings[i];if(oldString.length>lineLimit+buffer){var newStrings=[];while(oldString.length>lineLimit){lengthToTake=lineLimit;newStrings.push(oldString.substring(0,lengthToTake));oldString=oldString.substring(lengthToTake);}
+if(oldString.length>0){newStrings.push(oldString);}
+function fixLineNumber(lineChar){if(lineChar[0]<0)
+return;var n=lineChar[0];var c=lineChar[1];if(n>i){n+=(newStrings.length-1);}else if(n==i){var a=0;while(c>newStrings[a].length){c-=newStrings[a].length;a++;}
+n+=a;}
+lineChar[0]=n;lineChar[1]=c;}
+fixLineNumber(ss);fixLineNumber(se);linesWrapped++;numLinesAfter+=newStrings.length;newStrings.unshift(i,1);lineStrings.splice.apply(lineStrings,newStrings);}}
+return{linesWrapped:linesWrapped,numLinesAfter:numLinesAfter};}
+var wrapData=fixLongLines();return{selStart:ss,selEnd:se,linesWrapped:wrapData.linesWrapped,numLinesAfter:wrapData.numLinesAfter,lines:lineStrings};}
+return cc;}
\ No newline at end of file

Modified: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/thirdparty/contentCollector.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/thirdparty/contentCollector.js	2010-06-03 14:55:54 UTC (rev 67280)
+++ branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/thirdparty/contentCollector.js	2010-06-09 19:16:16 UTC (rev 67746)
@@ -196,7 +196,7 @@
 	cc.collectContent = function(node, state) {
 		if (!state) {
 			state = {
-				flags : {/* name -> nesting counter */},
+				flags : {/* name -> nesting counter */}
 			};
 		}
 		var isBlock = isBlockElement(node);
Home | About | Privacy