From efedc973eb7442c004ed045f7f5f81e3f9ec2d4e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 2 Aug 2010 12:01:06 +0200 Subject: [PATCH] [ticket/6109] MSN is now called Windows Live Messenger (WLM) Replaced the logo with the current one and changed the language strings. PHPBB3-6109 --- phpBB/language/en/acp/styles.php | 2 +- phpBB/language/en/common.php | 6 +++--- phpBB/language/en/memberlist.php | 6 +++--- phpBB/language/en/ucp.php | 2 +- .../prosilver/imageset/icon_contact_msnm.gif | Bin 588 -> 1466 bytes 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 642a3a57c1..707d9ac7bd 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -223,7 +223,7 @@ $lang = array_merge($lang, array( 'IMG_ICON_CONTACT_EMAIL' => 'Send e-mail', 'IMG_ICON_CONTACT_ICQ' => 'ICQ', 'IMG_ICON_CONTACT_JABBER' => 'Jabber', - 'IMG_ICON_CONTACT_MSNM' => 'MSNM', + 'IMG_ICON_CONTACT_MSNM' => 'WLM', 'IMG_ICON_CONTACT_PM' => 'Send message', 'IMG_ICON_CONTACT_YAHOO' => 'YIM', 'IMG_ICON_CONTACT_WWW' => 'Website', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 7daa5a0c9e..d5311c5820 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -339,7 +339,7 @@ $lang = array_merge($lang, array( 'MODERATORS' => 'Moderators', 'MONTH' => 'Month', 'MOVE' => 'Move', - 'MSNM' => 'MSNM/WLM', + 'MSNM' => 'WLM', 'NA' => 'N/A', 'NEWEST_USER' => 'Our newest member %s', @@ -580,7 +580,7 @@ $lang = array_merge($lang, array( 'TOO_LONG_INTERESTS' => 'The interests you entered is too long.', 'TOO_LONG_JABBER' => 'The Jabber account name you entered is too long.', 'TOO_LONG_LOCATION' => 'The location you entered is too long.', - 'TOO_LONG_MSN' => 'The MSNM/WLM name you entered is too long.', + 'TOO_LONG_MSN' => 'The WLM name you entered is too long.', 'TOO_LONG_NEW_PASSWORD' => 'The password you entered is too long.', 'TOO_LONG_OCCUPATION' => 'The occupation you entered is too long.', 'TOO_LONG_PASSWORD_CONFIRM' => 'The password confirmation you entered is too long.', @@ -602,7 +602,7 @@ $lang = array_merge($lang, array( 'TOO_SHORT_INTERESTS' => 'The interests you entered is too short.', 'TOO_SHORT_JABBER' => 'The Jabber account name you entered is too short.', 'TOO_SHORT_LOCATION' => 'The location you entered is too short.', - 'TOO_SHORT_MSN' => 'The MSNM/WLM name you entered is too short.', + 'TOO_SHORT_MSN' => 'The WLM name you entered is too short.', 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', 'TOO_SHORT_OCCUPATION' => 'The occupation you entered is too short.', 'TOO_SHORT_PASSWORD_CONFIRM' => 'The password confirmation you entered is too short.', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 76dd5d0423..07edb2bb85 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -79,9 +79,9 @@ $lang = array_merge($lang, array( 'IM_JABBER' => 'Please note that users may have selected to not receive unsolicited instant messages.', 'IM_JABBER_SUBJECT' => 'This is an automated message please do not reply! Message from user %1$s at %2$s.', 'IM_MESSAGE' => 'Your message', - 'IM_MSNM' => 'Please note that you need Windows Messenger installed to use this.', + 'IM_MSNM' => 'Please note that you need Windows Live Messenger installed to use this.', 'IM_MSNM_BROWSER' => 'Your browser does not support this.', - 'IM_MSNM_CONNECT' => 'MSNM is not connected.\nYou have to connect to MSNM to continue.', + 'IM_MSNM_CONNECT' => 'WLM is not connected.\nYou have to connect to WLM to continue.', 'IM_NAME' => 'Your Name', 'IM_NO_DATA' => 'There is no suitable contact information for this user.', 'IM_NO_JABBER' => 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.', @@ -124,7 +124,7 @@ $lang = array_merge($lang, array( 'SEND_IM' => 'Instant messaging', 'SEND_JABBER_MESSAGE' => 'Send Jabber message', 'SEND_MESSAGE' => 'Message', - 'SEND_MSNM_MESSAGE' => 'Send MSNM/WLM message', + 'SEND_MSNM_MESSAGE' => 'Send WLM message', 'SEND_YIM_MESSAGE' => 'Send YIM message', 'SORT_EMAIL' => 'E-mail', 'SORT_LAST_ACTIVE' => 'Last active', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 7bc4ad73aa..2bb9025037 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -425,7 +425,7 @@ $lang = array_merge($lang, array( 'UCP_MAIN_FRONT' => 'Front page', 'UCP_MAIN_SUBSCRIBED' => 'Manage subscriptions', - 'UCP_MSNM' => 'WL/MSN Messenger', + 'UCP_MSNM' => 'Windows Live Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files.', 'UCP_PREFS' => 'Board preferences', diff --git a/phpBB/styles/prosilver/imageset/icon_contact_msnm.gif b/phpBB/styles/prosilver/imageset/icon_contact_msnm.gif index b82253599bb00d665e3e626999f546159fc701e1..e25469c3a547aaaeebfc0a3823ec365171295357 100644 GIT binary patch literal 1466 zcmV;r1x5NtNk%w1VH5x;0QUd@00030|NrFU-{a!l&(F`x%Eq>~wqAs=Vv4p{e57WK zw{4TXbDG9%khpuJ&Ul{4f~nMLg{6I-#FM$>hpNzSh^2Fkr@`L-p0?1KuExvb{?zFI zX_CBekh6D}xS`1JsLuAKzuAeNw3e;Jm#e^(q_tUssEoGUldZ&@wal~4<)*mFtGUMH z^8Z_ry=aW9e4@dZyV|wc_=~2!p0UBd)#s_U!MVZ6D{-hwiMeB|;8&K#YNO3!jI5Ne z!^PwK%G>DB;OswyvrUr2U!l=pn80L~x=wVDgum#2xZjz_=%?2Bs=dm%$kVgE#Bs9R zY>}wO-tA?p)o!uaY_8Ic$m^4~%Z;$Zx#Rn=(&ewr+{@C|(AC&umaxX^{kq%irNPh3 zz+I^dnQJa0*-`v#M)?=Y|oU)?V z-q@+htK8q*+1%Nk&zp?Zht%WKY`$S|plVQ$MvcjYc*tpXv}$CRTZYDZkk)^a#e}Tn zox1a@ztOsIwp@nOaH#2(qT-Op(ZtZ@$%w~lx$2&((30NZ+~()yu+Mkh_NeFR<>2An z)##Ps;@#HXvFrG&;^ooA&w1tMkK*Fp@9*sE>*(p}=Huhw;o;xc*VW0%$Lr{v@#u)= z<=eZoeCOGQ)ys?S?dQF;iR0O;+uGIF*3s3}&(P1x%*)2)gVd|=HK4i+}qgK*3;J2((v!??Ca^^-`&5yy~M=Cy}iA< zy1KWwxBvhDA^8LW00930EC2ui02BZy000R80RIsfNU)$mf&z;TSje!U!vVzxKAh-K zBE>B#Vz8)4prIc-br5m+(Ez%^5w5GCWw&;l{#SvLxP$)Tfc5FKJ+0Xt6B`n;JpFd_ZtQLSe%MA_dBG=S>?t zJt#y0qQV1(2bdNP{FO-0nKpdxm~gN}Mu-$4Fl@PWOC^{*SLi^Y4FW=f1{Ai)>Wy=u zfMLT1EdcSsfr%p)ZmDkW&$e%PF9UqK6k=R6)cGx4bybeA{dj4JxFll8PsQAc4daJ6I4- zklW0s&6Kuu;)y4y%+f;+E|{>zIND%S&wSEE6Amw#d=g3~l~}<;5k@p|OEl-O!;b;b zn4^v_yVL^9D2!mS#~w250L?k?*x8Rc=q!WFF~}g(%OPIufyD_)P=d}n;ux?`I_kut z$tkeV(#taCY@);vNu0q>IM8^Py3RYVfO3i{uRtP)F3T|Uh#5R26Hcf8G@}kJoUFo1 zDv;=~1Rs_tcJ2F&A4JeG_yN-C2`F~=NJ2+@Tg&sd9XIN=Bo&pp5ZqsR_% z#6d+4IB)e# U@y8$wV2lCs-Dh%r{{#d8JNsN~L;wH) literal 588 zcmV-S0<--`Nk%w1VH5x;0K@#G+}zmI)X?hc=+Dl{ z!>iq0abwrBM6xDC>|FJ zI30z4K#$K=OBF;NVG2Nfe^C`o2m%KL19~2GbB_j#1qKF>g$e~3WeWue2NeYenW&uz z85tuB7?}i+UIqecMUAc8yy?1&T4LA2xZV4+|jNK z9ytuI-P_&g=+fNg=N!-EHUFa&&f?_mZB6(lIQ@Bl&tjM*N^3iR;MB9j0N8bEN+06z@Z@p17Wl}h+vm+g9Hiy0JxBW<%KU2W(vJaGXY`%0xpnc zQMaZ{2Llc#P+UOsq&OOC0%(v|XioqOG;kmr=Yj^?4_x;QkU&G6do)zo)}R5x0yxBF a&-So`28-Jlc36Eu{l&q40|$Nx0RTH3g!NPa