[livejournal] r18923: LJSUP-7240: fixes for the new Control St...

U   trunk/bin/upgrading/en.dat
U   trunk/templates/ControlStrip/main.tmpl

Modified: trunk/bin/upgrading/en.dat
===================================================================
--- trunk/bin/upgrading/en.dat	2011-04-20 09:16:13 UTC (rev 18922)
+++ trunk/bin/upgrading/en.dat	2011-04-20 09:49:14 UTC (rev 18923)
@@ -6211,6 +6211,12 @@
 
 web.controlstrip.login.remember=Remember Me
 
+web.controlstrip.login.openid=Open ID
+
+web.controlstrip.login.mailru=Mail.ru
+
+web.controlstrip.login.vkontakte=Vkontakte
+
 web.controlstrip.nouserpic.alt=Upload Userpic
 
 web.controlstrip.nouserpic.title=Edit Userpics

Modified: trunk/templates/ControlStrip/main.tmpl
===================================================================
--- trunk/templates/ControlStrip/main.tmpl	2011-04-20 09:16:13 UTC (rev 18922)
+++ trunk/templates/ControlStrip/main.tmpl	2011-04-20 09:49:14 UTC (rev 18923)
@@ -5,6 +5,3 @@
 <TMPL_ELSE>
 <TMPL_INCLUDE name="login.tmpl">
 </TMPL_IF>
-<script>
-	ControlStrip.init();
-</script>