| Index: branches/liquidthreads/skins/monobook/main.css |
| — | — | @@ -1102,7 +1102,7 @@ |
| 1103 | 1103 | font-size: 85%; |
| 1104 | 1104 | } |
| 1105 | 1105 | |
| 1106 | | -#login-emailforlost { |
| | 1106 | +#login-sectiontip { |
| 1107 | 1107 | font-size: 85%; |
| 1108 | 1108 | line-height: 1.2; |
| 1109 | 1109 | padding-top: 2em; |
| Index: branches/liquidthreads/languages/MessagesIt.php |
| — | — | @@ -344,7 +344,6 @@ |
| 345 | 345 | "yournick" => "Soprannome (nickname):", |
| 346 | 346 | "badsig" => "Errore nella firma non standard, verificare i tag HTML.", |
| 347 | 347 | "email" => "Indirizzo e-mail", |
| 348 | | -"emailforlost" => '<div style="width:30em">* Dati opzionali. Specificando un indirizzo e-mail si può essere contattati dagli altri utenti del sito (senza dover rivelare l\'indirizzo stesso) e si può ricevere una nuova password qualora venisse dimenticata.<br /><br />Il nome vero verrà utilizzato, se lo si desidera, per attribuire la paternità dei contenuti inviati.</div>', |
| 349 | 348 | "prefs-help-email-enotif" => "L'indirizzo verrà inoltre usato per le segnalazioni via e-mail, se richieste con le apposite opzioni.", |
| 350 | 349 | "prefs-help-realname" => "* Nome vero (opzionale): se si sceglie di inserirlo, verrà utilizzato per attribuire la paternità dei contenuti inviati.", |
| 351 | 350 | "loginerror" => "Errore nell'accesso", |
| Index: branches/liquidthreads/languages/MessagesMs.php |
| — | — | @@ -241,7 +241,6 @@ |
| 242 | 242 | 'yourvariant' => "Kelainan", #"Variant", |
| 243 | 243 | 'email' => "Emel", #"Email", |
| 244 | 244 | "yournick" => "Nama Samaran<br /><small>(untuk tandatangan)</small>", #"Your nickname (for signatures)", |
| 245 | | -"emailforlost" => "Medan yang ditandai dengan superskrip * tidak wajib. Bagaimanapun, jika anda memberikan alamat emel anda, pengguna lain dapat menghubungi anda melalui laman web tanpa mengetahui alamat emel anda. Alamat emel ini juga digunakan untuk mengirimkan kata laluan kepada anda jika anda terlupa.<br /><br />Jika anda memberikan nama yang benar, pengakuan akan diberikan kepada karya anda.", #"Fields marked with superscripts are optional. Storing an email address enables people to contact you through the website without you having to reveal your email address to them, and it can be used to send you a new password if you forget it.<br /><br />Your real name, if you choose to provide it, will be used for giving you attribution for your work.", |
| 246 | 245 | "prefs-help-realname" => "* Nama benar (tidak wajib): Jika anda memberikan nama yang benar, pengakuan akan diberikan kepada karya anda.", #"* Real name (optional): if you choose to provide it this will be used for giving you attribution for your work.", |
| 247 | 246 | "prefs-help-email" => "Emel (tidak wajib): Alamat emel anda memungkinkan pengguna lain untuk menghubungi anda melalui laman web tanpa mengetahui alamat emel anda. Alamat emel ini juga digunakan untuk mengirimkan kata laluan kepada anda jika anda terlupa.", |
| 248 | 247 | "prefs-help-email-enotif" => 'Alamat emel ini juga boleh digunakan untuk mengirimkan pemberitahuan emel jika anda menghidupkan pilihan tersebut.', #'This address is also used to send you email notifications if you enabled the options.', |
| Index: branches/liquidthreads/languages/MessagesUk.php |
| — | — | @@ -221,9 +221,6 @@ |
| 222 | 222 | "userexists" => "Введене вами ім'я користувача вже існує. Виберіть будь-ласка інше ім'я.", |
| 223 | 223 | "youremail" => "Адреса вашої електронної пошти*", |
| 224 | 224 | "yournick" => "Ваш псевдонім (для підписів)", |
| 225 | | -"emailforlost" => "* Вказувати адресу вашої електронної пошти необов'язково. |
| 226 | | -Але це дозволить людям зв’язатися з вами через веб-сайт без інформування їх про адресу вашої електронної пошти, |
| 227 | | -а також допоможе вам якщо ви забудете свій пароль.", |
| 228 | 225 | "loginerror" => "Помилка при вході в систему", |
| 229 | 226 | "noname" => "Користувача з таким іменем не існує.", |
| 230 | 227 | "loginsuccesstitle" => "Успішний вхід в систему", |
| Index: branches/liquidthreads/languages/MessagesNds.php |
| — | — | @@ -273,7 +273,6 @@ |
| 274 | 274 | 'yourrealname' => 'Dien echten Naam (kene Plicht)', |
| 275 | 275 | 'yourlanguage' => 'Snittstellenspraak', |
| 276 | 276 | 'yourvariant' => 'Dien Spraak', |
| 277 | | -'emailforlost' => 'Wenn du dien Password vergeten hest, kann en nieg Password an dien E-Mail-Adress send warrn.', |
| 278 | 277 | // FIXME: following should be split to 'prefs-help-realname' & 'prefs-help-email' |
| 279 | 278 | #'prefs-help-userdata' => '* <strong>E-Mail</strong> (kene Plicht): Wenn du en E-Mailadress angiffst, könen annere di E-Mails sennen, |
| 280 | 279 | #ahn dat diene Adress no buten künnig warrt. Wenn du dien ol Password vergeten hest, |
| Index: branches/liquidthreads/languages/MessagesBg.php |
| — | — | @@ -304,7 +304,6 @@ |
| 305 | 305 | 'yourvariant' => 'Вариант', |
| 306 | 306 | 'yournick' => 'Псевдоним (за подписи чрез <code><nowiki>~~~~</nowiki></code>)', |
| 307 | 307 | 'email' => 'Е-поща', |
| 308 | | -'emailforlost' => '* Полетата, обозначени със звездичка, са незадължителни.<br /> Посочването на електронна поща позволява на хората да се свържат с Вас, без да се налага да им съобщавате адреса си, а също може да се използва, за да Ви се изпрати нова парола, ако случайно забравите сегашната си.', |
| 309 | 308 | 'prefs-help-email' => '* <strong>Електронна поща</strong> <em>(незадължително)</em>: Позволява на хората да се свържат с Вас, без да се налага да им съобщавате адреса си, а също може да се използва, за да Ви се изпрати нова парола, ако случайно забравите сегашната си.', |
| 310 | 309 | # TODO |
| 311 | 310 | 'prefs-help-email-enotif' => 'This address is also used to send you email notifications if you enabled the options.', |
| Index: branches/liquidthreads/languages/MessagesJa.php |
| — | — | @@ -295,7 +295,6 @@ |
| 296 | 296 | 'yournick' => 'ニックネーム（署名用）:', |
| 297 | 297 | 'badsig' => '署名が正しくありません。HTMLタグを見直してください。', |
| 298 | 298 | 'email' => 'メールアドレス', |
| 299 | | -'emailforlost' => '<div style="width:30em">* メールアドレスの登録は任意です。メールアドレスを入力すると、他の利用者があなたのメールアドレスを知ることなくあなたにメールを送れるようになります。また、パスワードを忘れた際にメールでパスワードの再発行を受けられます。</div>', |
| 300 | 299 | 'prefs-help-email-enotif'=> 'このアドレスはあなたが有効にした各種メール通知の送信先としても利用されます。', |
| 301 | 300 | 'prefs-help-realname' => '* 本名 (任意): 本名を入力すると、ページ・クレジットに利用者名（アカウント名）の代わりに本名が表示されます。', |
| 302 | 301 | 'loginerror' => 'ログイン失敗', |
| Index: branches/liquidthreads/languages/MessagesBs.php |
| — | — | @@ -259,7 +259,6 @@ |
| 260 | 260 | 'editsection' => 'uredite', |
| 261 | 261 | 'editold' => 'uredite', |
| 262 | 262 | 'editthispage' => 'Uredite ovu stranicu', |
| 263 | | -'emailforlost' => '* Unošenje adrese e-pošte nije obavezno. Međutim, unos će omogućiti ljude da Vas kontaktiraju kroz sajt, a da ne morate da im otkrijete svoju adresu. Takođe će Vam pomoći ukoliko zaboravite svoju lozinku.', |
| 264 | 263 | 'emailfrom' => 'Od', |
| 265 | 264 | 'emailmessage' => 'Poruka', |
| 266 | 265 | 'emailpage' => 'Pošalji e-pismo korisniku', |
| Index: branches/liquidthreads/languages/MessagesFr.php |
| — | — | @@ -314,7 +314,6 @@ |
| 315 | 315 | 'yournick' => 'Pseudonyme :', |
| 316 | 316 | 'badsig' => 'Signature brute incorrecte, vérifiez vos balises HTML.', |
| 317 | 317 | 'email' => 'Courriel', |
| 318 | | -'emailforlost' => 'Si vous égarez votre mot de passe, vous pouvez demander à ce qu\'un nouveau vous soit envoyé à votre adresse électronique.', |
| 319 | 318 | 'prefs-help-email-enotif' => 'Cette adresse est aussi utilisée pour vous envoyer des notifications par courriel si vous avez activé les options correspondantes.', |
| 320 | 319 | 'prefs-help-realname' => '* Nom réel (facultatif): si vous le spécifiez, il sera utilisé pour l\'attribution de vos contributions.', |
| 321 | 320 | 'loginerror' => 'Problème d\'identification', |
| Index: branches/liquidthreads/languages/MessagesNl.php |
| — | — | @@ -290,7 +290,6 @@ |
| 291 | 291 | 'yournick' => 'Uw bijnaam (voor handtekeningen)', |
| 292 | 292 | 'badsig' => 'Ongeldige ondertekening; controleer de HTML-tags.', |
| 293 | 293 | 'email' => 'E-mail', |
| 294 | | -'emailforlost' => '<div style="width:30em">* Optioneel. Een e-mail laat anderen op deze wiki contact met u op nemen zonder dat uw adres getoond wordt, en hiermee kunnen wij u een nieuw wachtwoord zenden wanneer u deze vergeten bent.<br /><br />Uw echte naam wordt gebruikt bij het aangeven wie wat bijgedragen heeft aan deze Wiki.</div>', |
| 295 | 294 | 'prefs-help-email-enotif'=> 'Dit adres wordt ook gebruikt om e-mailmededelingen naar u toe te sturen, als u deze optie heeft ingesteld.', |
| 296 | 295 | 'prefs-help-realname' => '* Echte naam (facultatief): Wanneer u er voor kiest om dit in te vullen kan het gebruikt worden om u erkenning te geven voor uw werk.', |
| 297 | 296 | 'loginerror' => 'Inlogfout', |
| Index: branches/liquidthreads/languages/MessagesNn.php |
| — | — | @@ -291,7 +291,6 @@ |
| 292 | 292 | 'yourvariant' => 'Språkvariant', |
| 293 | 293 | 'yournick' => 'Kallenamn (for signaturar)', |
| 294 | 294 | 'email' => 'E-post', |
| 295 | | -'emailforlost' => 'Felt merkte med ei stjerne (*) er valfrie. E-postadressa gjer det mogleg for andre brukarar å ta kontakt med deg utan at du offentleggjer ho. Ho kan òg bli brukt til å sende deg nytt passord. Namnet ditt, dersom du vel å fylle ut dette feltet, vil bli brukt til å godskrive arbeid du har gjort.<br /><br />', |
| 296 | 295 | 'prefs-help-email-enotif' => 'Denne adressa blir også brukt til å sende deg endringsmeldingar dersom du har valt å ta den funksjonen i bruk.', |
| 297 | 296 | 'prefs-help-realname' => '* Namn (valfritt): Om du vel å fylle ut dette feltet, vil informasjonen bli brukt til å godskrive arbeid du har gjort.', |
| 298 | 297 | 'loginerror' => 'Innloggingsfeil', |
| Index: branches/liquidthreads/languages/Messages.php |
| — | — | @@ -158,7 +158,7 @@ |
| 159 | 159 | 'navigation' => 'Navigation', |
| 160 | 160 | |
| 161 | 161 | # Metadata in edit box |
| 162 | | -'metadata_help' => 'Metadata (see [[{{ns:project}}:Metadata]] for an explanation):', |
| | 162 | +'metadata_help' => 'Metadata (see [[Project:Metadata]] for an explanation):', |
| 163 | 163 | |
| 164 | 164 | 'currentevents' => 'Current events', |
| 165 | 165 | 'currentevents-url' => 'Current events', |
| — | — | @@ -276,7 +276,7 @@ |
| 277 | 277 | 'nosuchactiontext' => 'The action specified by the URL is not |
| 278 | 278 | recognized by the wiki', |
| 279 | 279 | 'nosuchspecialpage' => 'No such special page', |
| 280 | | -'nospecialpagetext' => 'You have requested an invalid special page, a list of valid special pages may be found at [[{{ns:special}}:Specialpages]].', |
| | 280 | +'nospecialpagetext' => 'You have requested an invalid special page, a list of valid special pages may be found at [[Special:Specialpages]].', |
| 281 | 281 | |
| 282 | 282 | # General errors |
| 283 | 283 | # |
| — | — | @@ -334,7 +334,7 @@ |
| 335 | 335 | 'viewsourcefor' => 'for $1', |
| 336 | 336 | 'protectedtext' => 'This page has been locked to prevent editing; there are |
| 337 | 337 | a number of reasons why this may be so, please see |
| 338 | | -[[{{ns:project}}:Protected page]]. |
| | 338 | +[[Project:Protected page]]. |
| 339 | 339 | |
| 340 | 340 | You can view and copy the source of this page:', |
| 341 | 341 | 'protectedinterface' => 'This page provides interface text for the software, and is locked to prevent abuse.', |
| — | — | @@ -387,7 +387,6 @@ |
| 388 | 388 | 'yournick' => 'Nickname:', |
| 389 | 389 | 'badsig' => 'Invalid raw signature; check HTML tags.', |
| 390 | 390 | 'email' => 'E-mail', |
| 391 | | -'emailforlost' => '<div style="width:30em">* Optional. An e-mail lets others contact you on this site without revealing your address, and lets us send you a new password if you forget it.<br /><br />Your real name will be used to give you attribution for your work.</div>', |
| 392 | 391 | 'prefs-help-email-enotif' => 'This address is also used to send you e-mail notifications if you enabled the options.', |
| 393 | 392 | 'prefs-help-realname' => '* Real name (optional): if you choose to provide it this will be used for giving you attribution for your work.', |
| 394 | 393 | 'loginerror' => 'Login error', |
| — | — | @@ -472,7 +471,7 @@ |
| 473 | 472 | 'blockedtitle' => 'User is blocked', |
| 474 | 473 | 'blockedtext' => 'Your user name or IP address has been blocked by $1. |
| 475 | 474 | The reason given is this:<br />\'\'$2\'\'<br />You may contact $1 or one of the other |
| 476 | | -[[{{ns:project}}:Administrators|administrators]] to discuss the block. |
| | 475 | +[[Project:Administrators|administrators]] to discuss the block. |
| 477 | 476 | |
| 478 | 477 | Note that you may not use the "e-mail this user" feature unless you have a valid e-mail address registered in your [[Special:Preferences|user preferences]]. |
| 479 | 478 | |
| — | — | @@ -494,12 +493,12 @@ |
| 495 | 494 | 'newarticletext' => |
| 496 | 495 | "You've followed a link to a page that doesn't exist yet. |
| 497 | 496 | To create the page, start typing in the box below |
| 498 | | -(see the [[{{ns:project}}:Help|help page]] for more info). |
| | 497 | +(see the [[Help:Contents|help page]] for more info). |
| 499 | 498 | If you are here by mistake, just click your browser's '''back''' button.", |
| 500 | 499 | 'newarticletextanon' => '{{int:newarticletext}}', |
| 501 | 500 | 'talkpagetext' => '<!-- MediaWiki:talkpagetext -->', |
| 502 | 501 | 'anontalkpagetext' => "----''This is the discussion page for an anonymous user who has not created an account yet or who does not use it. We therefore have to use the numerical IP address to identify him/her. Such an IP address can be shared by several users. If you are an anonymous user and feel that irrelevant comments have been directed at you, please [[Special:Userlogin|create an account or log in]] to avoid future confusion with other anonymous users.''", |
| 503 | | -'noarticletext' => 'There is currently no text in this page, you can [[{{ns:special}}:Search/{{PAGENAME}}|search for this page title]] in other pages or [{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} edit this page].', |
| | 502 | +'noarticletext' => 'There is currently no text in this page, you can [[Special:Search/{{PAGENAME}}|search for this page title]] in other pages or [{{fullurl:{{FULLPAGENAMEE}}|action=edit}} edit this page].', |
| 504 | 503 | 'noarticletextanon' => '{{int:noarticletext}}', |
| 505 | 504 | 'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes. '''Mozilla / Firefox / Safari:''' hold down ''Shift'' while clicking ''Reload'', or press ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac); '''IE:''' hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''; '''Konqueror:''': simply click the ''Reload'' button, or press ''F5''; '''Opera''' users may need to completely clear their cache in ''Tools→Preferences''.", |
| 506 | 505 | 'usercssjsyoucanpreview' => '<strong>Tip:</strong> Use the \'Show preview\' button to test your new CSS/JS before saving.', |
| — | — | @@ -550,7 +549,7 @@ |
| 551 | 550 | 'readonlywarning' => '<strong>WARNING: The database has been locked for maintenance, |
| 552 | 551 | so you will not be able to save your edits right now. You may wish to cut-n-paste |
| 553 | 552 | the text into a text file and save it for later.</strong>', |
| 554 | | -'protectedpagewarning' => "<strong>WARNING: This page has been locked so that only users with sysop privileges can edit it. Be sure you are following the [[{{ns:project}}:Protected_page_guidelines|protected page guidelines]].</strong>", |
| | 553 | +'protectedpagewarning' => "<strong>WARNING: This page has been locked so that only users with sysop privileges can edit it. Be sure you are following the [[Project:Protected page guidelines|protected page guidelines]].</strong>", |
| 555 | 554 | 'semiprotectedpagewarning' => "'''Note:''' This page has been locked so that only registered users can edit it.", |
| 556 | 555 | 'templatesused' => 'Templates used on this page:', |
| 557 | 556 | 'edittools' => '<!-- Text here will be shown below edit and upload forms. -->', |
| — | — | @@ -636,7 +635,7 @@ |
| 637 | 636 | # Search results |
| 638 | 637 | # |
| 639 | 638 | 'searchresults' => 'Search results', |
| 640 | | -'searchresulttext' => "For more information about searching {{SITENAME}}, see [[{{ns:project}}:Searching|Searching {{SITENAME}}]].", |
| | 639 | +'searchresulttext' => "For more information about searching {{SITENAME}}, see [[Project:Searching|Searching {{SITENAME}}]].", |
| 641 | 640 | 'searchquery' => "For query \"$1\"", |
| 642 | 641 | 'badquery' => 'Badly formed search query', |
| 643 | 642 | 'badquerytext' => 'We could not process your query. |
| — | — | @@ -761,9 +760,9 @@ |
| 762 | 761 | 'group-bureaucrat-member' => 'Bureaucrat', |
| 763 | 762 | 'group-steward-member' => 'Steward', |
| 764 | 763 | |
| 765 | | -'grouppage-bot' => '{{ns:project}}:Bots', |
| 766 | | -'grouppage-sysop' => '{{ns:project}}:Administrators', |
| 767 | | -'grouppage-bureaucrat' => '{{ns:project}}:Bureaucrats', |
| | 764 | +'grouppage-bot' => 'Project:Bots', |
| | 765 | +'grouppage-sysop' => 'Project:Administrators', |
| | 766 | +'grouppage-bureaucrat' => 'Project:Bureaucrats', |
| 768 | 767 | |
| 769 | 768 | # Recent changes |
| 770 | 769 | # |
| — | — | @@ -808,11 +807,11 @@ |
| 809 | 808 | 'uploadtext' => "Use the form below to upload files, to view or search previously uploaded images go to the [[Special:Imagelist|list of uploaded files]], uploads and deletions are also logged in the [[Special:Log/upload|upload log]]. |
| 810 | 809 | |
| 811 | 810 | To include the image in a page, use a link in the form |
| 812 | | -'''<nowiki>[[{{ns:6}}:file.jpg]]</nowiki>''', |
| 813 | | -'''<nowiki>[[{{ns:6}}:file.png|alt text]]</nowiki>''' or |
| 814 | | -'''<nowiki>[[{{ns:-2}}:file.ogg]]</nowiki>''' for directly linking to the file.", |
| | 811 | +'''<nowiki>[[Image:File.jpg]]</nowiki>''', |
| | 812 | +'''<nowiki>[[Image:File.png|alt text]]</nowiki>''' or |
| | 813 | +'''<nowiki>[[Media:File.ogg]]</nowiki>''' for directly linking to the file.", |
| 815 | 814 | 'uploadlog' => 'upload log', |
| 816 | | -'uploadlogpage' => 'Upload_log', |
| | 815 | +'uploadlogpage' => 'Upload log', |
| 817 | 816 | 'uploadlogpagetext' => 'Below is a list of the most recent file uploads.', |
| 818 | 817 | 'filename' => 'Filename', |
| 819 | 818 | 'filedesc' => 'Summary', |
| — | — | @@ -1138,12 +1137,12 @@ |
| 1139 | 1138 | or image along with all of its history from the database. |
| 1140 | 1139 | Please confirm that you intend to do this, that you understand the |
| 1141 | 1140 | consequences, and that you are doing this in accordance with |
| 1142 | | -[[{{ns:project}}:Policy]].", |
| | 1141 | +[[Project:Policy]].", |
| 1143 | 1142 | 'actioncomplete' => 'Action complete', |
| 1144 | 1143 | 'deletedtext' => "\"$1\" has been deleted. |
| 1145 | 1144 | See $2 for a record of recent deletions.", |
| 1146 | 1145 | 'deletedarticle' => "deleted \"[[$1]]\"", |
| 1147 | | -'dellogpage' => 'Deletion_log', |
| | 1146 | +'dellogpage' => 'Deletion log', |
| 1148 | 1147 | 'dellogpagetext' => 'Below is a list of the most recent deletions.', |
| 1149 | 1148 | 'deletionlog' => 'deletion log', |
| 1150 | 1149 | 'reverted' => 'Reverted to earlier revision', |
| — | — | @@ -1164,9 +1163,9 @@ |
| 1165 | 1164 | 'sessionfailure' => 'There seems to be a problem with your login session; |
| 1166 | 1165 | this action has been canceled as a precaution against session hijacking. |
| 1167 | 1166 | Please hit "back" and reload the page you came from, then try again.', |
| 1168 | | -'protectlogpage' => 'Protection_log', |
| | 1167 | +'protectlogpage' => 'Protection log', |
| 1169 | 1168 | 'protectlogtext' => "Below is a list of page locks/unlocks. |
| 1170 | | -See [[{{ns:project}}:Protected page]] for more information.", |
| | 1169 | +See [[Project:Protected page]] for more information.", |
| 1171 | 1170 | 'protectedarticle' => 'protected "[[$1]]"', |
| 1172 | 1171 | 'unprotectedarticle' => 'unprotected "[[$1]]"', |
| 1173 | 1172 | 'protectsub' => '(Protecting "$1")', |
| — | — | @@ -1180,7 +1179,7 @@ |
| 1181 | 1180 | 'unprotectcomment' => 'Reason for unprotecting', |
| 1182 | 1181 | 'protect-unchain' => 'Unlock move permissions', |
| 1183 | 1182 | 'protect-text' => 'You may view and change the protection level here for the page <strong>$1</strong>. |
| 1184 | | -Please be sure you are following the [[{{ns:project}}:Protected page|project guidelines]].', |
| | 1183 | +Please be sure you are following the [[Project:Protected page|project guidelines]].', |
| 1185 | 1184 | 'protect-viewtext' => 'Your account does not have permission to change |
| 1186 | 1185 | page protection levels. Here are the current settings for the page <strong>$1</strong>:', |
| 1187 | 1186 | 'protect-default' => '(default)', |
| — | — | @@ -1266,7 +1265,7 @@ |
| 1267 | 1266 | 'blockiptext' => "Use the form below to block write access |
| 1268 | 1267 | from a specific IP address or username. |
| 1269 | 1268 | This should be done only only to prevent vandalism, and in |
| 1270 | | -accordance with [[{{ns:project}}:Policy|policy]]. |
| | 1269 | +accordance with [[Project:Policy|policy]]. |
| 1271 | 1270 | Fill in a specific reason below (for example, citing particular |
| 1272 | 1271 | pages that were vandalized).", |
| 1273 | 1272 | 'ipaddress' => 'IP Address', |
| — | — | @@ -1279,8 +1278,8 @@ |
| 1280 | 1279 | 'ipbotheroption' => 'other', |
| 1281 | 1280 | 'badipaddress' => 'Invalid IP address', |
| 1282 | 1281 | 'blockipsuccesssub' => 'Block succeeded', |
| 1283 | | -'blockipsuccesstext' => '[[{{ns:Special}}:Contributions/$1|$1]] has been blocked. |
| 1284 | | -<br />See [[{{ns:Special}}:Ipblocklist|IP block list]] to review blocks.', |
| | 1282 | +'blockipsuccesstext' => '[[Special:Contributions/$1|$1]] has been blocked. |
| | 1283 | +<br />See [[Special:Ipblocklist|IP block list]] to review blocks.', |
| 1285 | 1284 | 'unblockip' => 'Unblock user', |
| 1286 | 1285 | 'unblockiptext' => 'Use the form below to restore write access |
| 1287 | 1286 | to a previously blocked IP address or username.', |
| — | — | @@ -1295,7 +1294,7 @@ |
| 1296 | 1295 | 'unblocklink' => 'unblock', |
| 1297 | 1296 | 'contribslink' => 'contribs', |
| 1298 | 1297 | 'autoblocker' => 'Autoblocked because your IP address has been recently used by "[[User:$1|$1]]". The reason given for $1\'s block is: "\'\'\'$2\'\'\'"', |
| 1299 | | -'blocklogpage' => 'Block_log', |
| | 1298 | +'blocklogpage' => 'Block log', |
| 1300 | 1299 | 'blocklogentry' => 'blocked "[[$1]]" with an expiry time of $2', |
| 1301 | 1300 | 'blocklogtext' => 'This is a log of user blocking and unblocking actions. Automatically |
| 1302 | 1301 | blocked IP addresses are not listed. See the [[Special:Ipblocklist|IP block list]] for |
| — | — | @@ -1429,7 +1428,7 @@ |
| 1430 | 1429 | select whether you want the current version as well as all old versions, with the page |
| 1431 | 1430 | history lines, or just the current version with the info about the last edit. |
| 1432 | 1431 | |
| 1433 | | -In the latter case you can also use a link, e.g. [[{{ns:Special}}:Export/{{Mediawiki:mainpage}}]] for the page {{Mediawiki:mainpage}}.', |
| | 1432 | +In the latter case you can also use a link, e.g. [[Special:Export/{{int:mainpage}}]] for the page {{int:mainpage}}.', |
| 1434 | 1433 | 'exportcuronly' => 'Include only the current revision, not the full history', |
| 1435 | 1434 | 'exportnohistory' => "---- |
| 1436 | 1435 | '''Note:''' exporting the full history of pages through this form has been disabled due to performance reasons.", |
| Index: branches/liquidthreads/languages/MessagesRo.php |
| — | — | @@ -237,7 +237,6 @@ |
| 238 | 238 | 'editsection' => "editează", |
| 239 | 239 | 'editold' => "editează", |
| 240 | 240 | 'editthispage' => "Editează pagina", |
| 241 | | -'emailforlost' => "Dacă ţi-ai pierdut parola, poţi cere să ţi se trimită una nouă la adresa de e-mail.", |
| 242 | 241 | 'emailfrom' => "De la", |
| 243 | 242 | 'emailmessage' => "Mesaj", |
| 244 | 243 | 'emailpage' => "E-mail către utilizator", |
| Index: branches/liquidthreads/languages/MessagesRu.php |
| — | — | @@ -352,8 +352,6 @@ |
| 353 | 353 | 'yournick' => 'Ваш псевдоним (для подписей):', |
| 354 | 354 | 'badsig' => 'Неверная подпись. Проверьте корректность HTML-тегов.', |
| 355 | 355 | 'email' => 'Эл. почта', |
| 356 | | -'emailforlost' => '<div style="width:30em">* Необязательное поле. Введя адрес электронной почты вы позволите другим участникам отправлять вам сообщения через веб-форму не раскрывая им адрес вашей электронной почты. Также это поможет в случае, если вы забудете свой пароль.<br /> |
| 357 | | -Ваше настоящее имя будет использовано для подписи ваших работ.', |
| 358 | 356 | 'prefs-help-email-enotif' => 'Этот адрес также используется для отправки по электронной почте оповещений об изменении страниц, если вы активировали соответствующую опцию.', |
| 359 | 357 | 'prefs-help-realname' => '* Настоящее имя (необязательное поле): если вы укажите его, то оно будет использовано для того чтобы показать кем был внесена правка страницы.', |
| 360 | 358 | 'loginerror' => 'Ошибка опознавания участника', |
| Index: branches/liquidthreads/languages/MessagesGa.php |
| — | — | @@ -329,10 +329,6 @@ |
| 330 | 330 | 'yourlanguage' => 'Teanga', |
| 331 | 331 | 'yourvariant' => 'Malairt', |
| 332 | 332 | "yournick" => "Do leasainm (i síniuithe)", |
| 333 | | -"emailforlost" => "* Níl na boscaí le réalt (*, **) ach roghnach. Le seoladh ríomhphoist i dtaisce, ba féidir le |
| 334 | | -daoine teagmhail a dhéanamh leat tríd an suíomh gan do sheoladh ríomhphoist a nochtaigh dóibh. Ina theannta sin, |
| 335 | | -is cabhair é má dheanfá dearmad ar d'fhocal faire.<br /><br />Má toghaíonn tú d'ainm ceart a chur isteach, |
| 336 | | -úsáidfear é chun do chuid dreachtaí a chur i leith tusa.", |
| 337 | 333 | 'prefs-help-email' => '** <strong>Ríomhphost</strong> (roghnach): Leis an tréith seo is féidir teagmháil a dhéanamh leat tríd do leathanach úsáideora nó phlé_úsáideora gan do sheoladh ríomhphost a thaispeáint.', |
| 338 | 334 | 'prefs-help-email-enotif' => 'Úsáidtear an seoladh seo chun fógraíocht ríomhphoist a sheoladh dhuit, má chumasaigh tú an rogha sin.', |
| 339 | 335 | 'prefs-help-realname' => '* <strong>Fíorainm</strong> (roghnach): má toghaíonn tú é sin a chur ar fáil, úsáidfear é chun |
| Index: branches/liquidthreads/languages/MessagesZh_tw.php |
| — | — | @@ -208,7 +208,6 @@ |
| 209 | 209 | "userexists" => "您所輸入的用戶名已有人使用。請另選一個。", |
| 210 | 210 | "youremail" => "您的電子郵件*", |
| 211 | 211 | "yournick" => "綽號（簽名時用）", |
| 212 | | -"emailforlost" => "* 輸入一個電郵地址並不是必須的。但是這將允許他人在您未告知的情況下通過電子郵件與您聯繫，如果您忘了密碼的話電郵地址也會有幫助。", |
| 213 | 212 | "loginerror" => "登錄錯誤", |
| 214 | 213 | "noname" => "你沒有輸入一個有效的用戶名。", |
| 215 | 214 | "loginsuccesstitle" => "登錄成功", |
| Index: branches/liquidthreads/languages/MessagesGsw.php |
| — | — | @@ -242,10 +242,6 @@ |
| 243 | 243 | 'yournick' => 'Spitzname (zuem Untrschriibe):', |
| 244 | 244 | 'badsig' => 'Dr Syntax vun de Signatur isch ungültig; luege uffs HTML.', |
| 245 | 245 | 'email' => 'E-Bost', |
| 246 | | -'emailforlost' => '* <u>E-Mail-Adrässe</u> (optional): We du en E-Mail-Adrässen aagisch, de chöi dir anderi Lüt über nes Web-Interface E-Mails schicke. Dyni E-Mail-Adrässe wird daderby aber \'\'\'nid\'\'\' aazeigt. Falls du dys Passwort vergissisch, cha dir ussertdäm a die E-Mail-Adrässe nes nöis gschickt wärde. |
| 247 | | -<br /> |
| 248 | | -<br /> |
| 249 | | -<div align="center" style="background-color:white; font-size:14px;"><b>Willkomme in dr {{SITENAME}}!</b></div>', |
| 250 | 246 | 'prefs-help-email-enotif'=> 'A die Adrässe wärden o Mails mit Benachrichtigunge geschickt, falls du das ygschalte hesch.', |
| 251 | 247 | 'prefs-help-realname' => '* <strong>Dy ächt Name</strong> (optional): We du wosch, das dyni Änderigen uf di chöi zrüggfüert wärde.', |
| 252 | 248 | 'loginerror' => 'Fähler bir Aamäldig', |
| Index: branches/liquidthreads/languages/MessagesOc.php |
| — | — | @@ -213,7 +213,6 @@ |
| 214 | 214 | "userexists" => "Le nom d'utilisateur que vous avez saisi est déjà utilisé. Veuillez en choisir un autre.", |
| 215 | 215 | "youremail" => "Mon adresse électronique", |
| 216 | 216 | "yournick" => "Mon surnom (pour les signatures)", |
| 217 | | -"emailforlost" => "Si vous égarez votre mot de passe, vous pouvez demander à ce qu'un nouveau vous soit envoyé à votre adresse électronique.", |
| 218 | 217 | "loginerror" => "Problème d'identification", |
| 219 | 218 | "noname" => "Vous n'avez pas saisi de nom d'utilisateur.", |
| 220 | 219 | "loginsuccesstitle" => "Identification réussie.", |
| Index: branches/liquidthreads/languages/MessagesWa.php |
| — | — | @@ -334,13 +334,6 @@ |
| 335 | 335 | 'yourvariant' => 'Variante do lingaedje', |
| 336 | 336 | 'yournick' => 'Vosse no metou (po les sinateures)', |
| 337 | 337 | 'email' => 'Emile', |
| 338 | | -'emailforlost' => 'Les tchamps avou ene sitoele (*) èn sont nén obligatweres.<br /> |
| 339 | | -L\' adresse emile, si vos ndè dnez ene, vos permetrè di rçure et |
| 340 | | -d\' evoyî des emiles å dtruviè di cisse waibe chal, sins vos dveur |
| 341 | | -diner voste adresse emile, çoula vos srè eto foirt ahessåve si vos rovyîz |
| 342 | | -måy vosse sicret (on novea scret vos pôrè-st esse evoyî pa emile).<br /> |
| 343 | | -Vosse vraiy no, si vos l\' dinez, pôrè esse eployî po mete a costé |
| 344 | | -di vos ovraedjes.', |
| 345 | 338 | 'prefs-help-email-enotif' => 'Ciste adresse chal est ossu eployeye po vs evoyî des notifiaedjes pa emile si vos avoz tchoezi cisse tchuze la.', |
| 346 | 339 | 'prefs-help-realname' => '* Li vraiy no da vosse (opcionel): si vos tchoezixhoz del diner i serè-st eployî po les contribouwaedjes da vosse.', |
| 347 | 340 | 'loginerror' => 'Aroke d\' elodjaedje', |
| Index: branches/liquidthreads/languages/MessagesSl.php |
| — | — | @@ -184,7 +184,6 @@ |
| 185 | 185 | "userexists" => "Uporabniško ime, ki ste ga vnesli, je že v uporabi. Prosimo izberite drugačno ime.", |
| 186 | 186 | "youremail" => "Vaša elektronska pošta", |
| 187 | 187 | "yournick" => "Vaš vzdevek (za podpise)", |
| 188 | | -"emailforlost" => "Če ste pozabili geslo, imate lahko novo, poslano na naslov vaše elektronske pošte.", |
| 189 | 188 | "loginerror" => "Napaka vpisa", |
| 190 | 189 | "noname" => "Niste navedli veljavnega uporabniškega imena.", |
| 191 | 190 | "loginsuccesstitle" => "Vpis uspešen", |
| Index: branches/liquidthreads/languages/MessagesDa.php |
| — | — | @@ -316,7 +316,6 @@ |
| 317 | 317 | 'yourlanguage' => 'Grænsefladesprog', |
| 318 | 318 | 'yourvariant' => 'Sprogvariant', |
| 319 | 319 | "yournick" => "Dit kaldenavn (til signaturer)", |
| 320 | | -"emailforlost" => " ", |
| 321 | 320 | 'prefs-help-email' => '** <strong>E-mail-adresse</strong> (valgfrit): Giver andre mulighed for at kontakte dig, uden du behøver at afsløre din e-mail-adresse. Det kan også bruges til at fremsende en ny adgangskode til dig, hvis du glemmer den du har.', |
| 322 | 321 | 'prefs-help-email-enotif' => 'Denne e-mail-adresse bruges også til at sende beskeder til dig via e-mail, hvis du har aktiveret funktionerne.', |
| 323 | 322 | 'prefs-help-realname' => '* <strong>Dit rigtige navn</strong> (valgfrit): Hvis du vælger at oplyse dit navn vil dette blive brugt til at tilskrive dig dit arbejde.', |
| Index: branches/liquidthreads/languages/MessagesDe.php |
| — | — | @@ -344,7 +344,6 @@ |
| 345 | 345 | 'yourvariant' => 'Variante', |
| 346 | 346 | 'badsig' => 'Die Syntax der Signatur ist ungültig; bitte HTML überprüfen.', |
| 347 | 347 | 'email' => 'E-Mail', |
| 348 | | -"emailforlost" => "Falls Sie Ihr Passwort vergessen haben, kann Ihnen ein neues an Ihre E-Mail-Adresse gesendet werden.", |
| 349 | 348 | 'prefs-help-email' => '** <strong>E-Mail-Adresse</strong> (optional): Erlaubt anderen Benutzern Sie über Ihre Benutzerseiten zu kontaktieren, |
| 350 | 349 | ohne dass Sie Ihre E-Mail-Adresse veröffentlichen müssen. |
| 351 | 350 | Für den Fall, dass Sie Ihr Passwort vergessen haben, kann Ihnen ein temporäres Einmal-Passwort gesendet werden.', |
| Index: branches/liquidthreads/languages/MessagesSv.php |
| — | — | @@ -280,7 +280,6 @@ |
| 281 | 281 | 'yournick' => 'Ditt smeknamn (till signaturer)', |
| 282 | 282 | 'badsig' => 'Det är något fel med råsignaturen, kontrollera HTML-koden.', |
| 283 | 283 | 'email' => 'E-post', |
| 284 | | -'emailforlost' => 'Om du glömt ditt lösenord, kan du få ett nytt lösenord skickat till din e-post.', |
| 285 | 284 | 'prefs-help-email-enotif'=> 'Om du slagit på funktionen för att få meddelanden om uppdateringar i mail, kommer denna adress att användas även för det.', |
| 286 | 285 | 'prefs-help-realname' => '¹ Riktigt namn (valfritt): Om du väljer att ange ditt riktiga namn, kommer det att användas för att tillskriva dig ditt arbete.', |
| 287 | 286 | 'loginerror' => 'Inloggningsproblem', |
| Index: branches/liquidthreads/languages/Language.php |
| — | — | @@ -855,16 +855,21 @@ |
| 856 | 856 | * @return bool |
| 857 | 857 | */ |
| 858 | 858 | function isRTL() { return false; } |
| 859 | | - function getDirMark() { return $this->isRTL() ? '‏' : '‎'; } |
| 860 | 859 | |
| 861 | 860 | /** |
| | 861 | + * A hidden direction mark (LRM or RLM), depending on the language direction |
| | 862 | + * |
| | 863 | + * @return string |
| | 864 | + */ |
| | 865 | + function getDirMark() { return $this->isRTL() ? "\xE2\x80\x8F" : "\xE2\x80\x8E"; } |
| | 866 | + |
| | 867 | + /** |
| 862 | 868 | * To allow "foo[[bar]]" to extend the link over the whole word "foobar" |
| 863 | 869 | * |
| 864 | 870 | * @return bool |
| 865 | 871 | */ |
| 866 | 872 | function linkPrefixExtension() { return false; } |
| 867 | 873 | |
| 868 | | - |
| 869 | 874 | function &getMagicWords() { |
| 870 | 875 | global $wgMagicWordsEn; |
| 871 | 876 | return $wgMagicWordsEn; |
| Index: branches/liquidthreads/languages/MessagesLa.php |
| — | — | @@ -165,7 +165,6 @@ |
| 166 | 166 | 'youremail' => 'Inscriptio electronica tua', |
| 167 | 167 | 'yourrealname' => 'Nomen tuum verum*', |
| 168 | 168 | 'yournick' => 'Agnomen tuum (in subscriptiones)', |
| 169 | | -'emailforlost' => 'Si tesserae tuae obliviscisti, tessera nova rogare potes per cursum publicum electronicum.', |
| 170 | 169 | 'loginerror' => 'Error est in aperiens conventum', |
| 171 | 170 | 'prefs-help-email' => '* E-mail (optional): Enables others to contact you through your user or user_talk page without the need of revealing your identity.', |
| 172 | 171 | 'nocookiesnew' => 'Ratio usoris creatur est, sed conventum non apertum est. {{SITENAME}} Cookies utitur ut conventum aperire. Cookies tua debiles sunt. Ea potestatem fac, tum conventum aperire cum nomine usoris tesseraque tuis novis.', |
| Index: branches/liquidthreads/languages/MessagesLi.php |
| — | — | @@ -159,7 +159,6 @@ |
| 160 | 160 | "userexists" => "De gebroekersnaam die u heeft ingevoerd is al in gebruik. Gelieve een andere naam te kiezen.", |
| 161 | 161 | "youremail" => "Uw e-mailadres", |
| 162 | 162 | "yournick" => "Uw bijnaam (voor handtekeningen)", |
| 163 | | -"emailforlost" => "Als u uw wachtwoord bent vergeten kun u een nieuw naar uw e-mailadres laten opsturen.", |
| 164 | 163 | "loginerror" => "Inlogfout", |
| 165 | 164 | "noname" => "U dient een gebroekersnaam op te geven.", |
| 166 | 165 | "loginsuccesstitle" => "Aanmelden gelukt.", |
| Index: branches/liquidthreads/languages/MessagesTa.php |
| — | — | @@ -222,7 +222,6 @@ |
| 223 | 223 | "userexists" => "நீங்கள் பதிந்த கடவுச் சொல் ஏற்கெனவே உபயோகத்தில் உள்ளது. தயவுசெய்து வேறு பெயர் தெரியவும்.", |
| 224 | 224 | "youremail" => "உங்கள் மின்னஞ்சல்*", |
| 225 | 225 | "yournick" => "உங்கள் அழைக்கும் பெயர் (கையொப்பத்துக்காக)", |
| 226 | | -"emailforlost" => "* விரும்பினால் மட்டும் மின்னஞ்சல் முகவரியைக் கொடுக்கவும். ஆனால் இது நீங்கள் உங்கள் மின்னஞ்சல் முகவரியை வெளிப்படுத்தாமலே மற்றவர்கள் இணையத்தளம் மூலம் உங்களைத் தொடர்புகொள்ள வழி வகுக்கும். அத்துடன் உங்கள் கடவுச்சொல்லை நீங்கள் மற்ந்துபோகும் சந்தர்ப்பங்களிலும் இது உதவும்.", |
| 227 | 226 | "loginerror" => "புகுபதிகைத் தவறு", "noname" => "நீங்கள் கொடுத்த பயனர் பெயர் செல்லுபடி இல்லை.", |
| 228 | 227 | "loginsuccesstitle" => "புகுபதிகை வெற்றி", |
| 229 | 228 | "loginsuccess" => "நீங்கள் இப்பொழுது \"$1\" ஆக விக்கிபீடியாவில் புகுபதிகை செய்துள்ளீர்கள்.", |
| Index: branches/liquidthreads/languages/MessagesHr.php |
| — | — | @@ -369,8 +369,6 @@ |
| 370 | 370 | 'badsig' => "Kôd vašeg potpisa nije valjan; provjerite HTML tagove.", |
| 371 | 371 | 'email' => "Adresa elektronske pošte *", |
| 372 | 372 | "yourrealname" => "Pravo ime (nije obvezno)*", |
| 373 | | -"emailforlost" => '* <div style="width:30em">* Nije obvezno. Unošenje e-mail adrese omogućava drugima da vam se jave kroz wiki bez da znaju vašu adresu, |
| 374 | | -a ako zaboravite lozinku, možemo vam na ovu adresu poslati novu. Pravo ime koristit će se za atribuciju (pripisivanje) vaših doprinosa</div>.', |
| 375 | 373 | 'prefs-help-email' => '* E-mail (nije obvezno): Omogućuje drugima da vas kontaktiraju na suradničkoj stranici ili stranici za razgovor bez javnog otkrivanja vaše e-mail adrese. |
| 376 | 374 | Također, ako zaboravite lozinku možemo vam na ovu adresu poslati novu, privremenu.', |
| 377 | 375 | 'prefs-help-email-enotif' => 'Ova će se adresa koristiti i za slanje izvješća o promjenama u wikiju, ako ih uključite.', |
| Index: branches/liquidthreads/languages/MessagesPl.php |
| — | — | @@ -321,7 +321,6 @@ |
| 322 | 322 | 'yourvariant' => 'Wariant', |
| 323 | 323 | 'yournick' => 'Twój podpis', |
| 324 | 324 | 'badsig' => 'Błędny podpis, sprawdź tagi HTML.', |
| 325 | | -'emailforlost' => '<div style="width:30em">* Wpisanie adresu e-mailowego nie jest obowiązkowe. Pozwala to jednak innym użytkownikom skontaktowanie się z Tobą bez jawnej znajomości Twojego adresu. Przyda się także, gdy zapomnisz hasła - możesz wtedy poprosić o przesłanie nowego na podany adres.</div>', |
| 326 | 325 | 'loginerror' => 'Błąd logowania', |
| 327 | 326 | 'prefs-help-email' => '* E-mail (opcjonalnie): Podanie e-maila pozwala innym skontaktować się z tobą za pośrednictwem twojej strony użytkownika |
| 328 | 327 | lub twojej strony dyskusji bez potrzeby ujawniania twoich danych identyfikacyjnych.', |
| Index: branches/liquidthreads/languages/MessagesPt.php |
| — | — | @@ -353,7 +353,6 @@ |
| 354 | 354 | 'yournick' => 'Alcunha:', |
| 355 | 355 | 'badsig' => 'Assinatura inválida; verifique o código HTML utilizado.', |
| 356 | 356 | 'email' => 'Correio electrónico', |
| 357 | | -'emailforlost' => "Os campos marcados são opcionais. Colocando o seu endereço de correio electrónico permite que outras pessoas entrem em contacto consigo sem que tenha que revelar o esse mesmo endereço a elas, e também é útil caso se esquecer da sua palavra-chave.<br /><br />O seu nome real, se o indicar, será utilizado para dar atribuição do seu trabalho.", |
| 358 | 357 | 'prefs-help-email-enotif' => 'Este endereço é também utilizado para enviar-lhe notificações caso as active nas preferências.', |
| 359 | 358 | 'prefs-help-realname' => '* Nome verdadeiro (opcional): caso decida indicar, este será utilizado para lhe dar atributo do seu trabalho.', |
| 360 | 359 | 'loginerror' => 'Erro de autentificação', |
| Index: branches/liquidthreads/languages/MessagesIa.php |
| — | — | @@ -202,7 +202,6 @@ |
| 203 | 203 | "userexists" => "Le nomine de usator que tu selectionava ja es in uso. Per favor selectiona un nomine differente.", |
| 204 | 204 | "youremail" => "Tu e-mail", |
| 205 | 205 | "yournick" => "Tu pseudonymo (pro signaturas)", |
| 206 | | -"emailforlost" => "Si tu oblida tu contrasigno, tu pote demandar un nove contrasigno via e-mail.", |
| 207 | 206 | "loginerror" => "Error in le apertura del session", |
| 208 | 207 | "noname" => "Tu non specificava un nomine de usator valide.", |
| 209 | 208 | "loginsuccesstitle" => "Session aperte con successo", |
| Index: branches/liquidthreads/languages/MessagesSr_ec.php |
| — | — | @@ -337,7 +337,6 @@ |
| 338 | 338 | 'email' => 'Е-пошта', |
| 339 | 339 | 'emailauthenticated' => 'Ваша адреса е-поште је проверена на $1.', |
| 340 | 340 | 'emailconfirmlink' => 'Потврдите вашу адресу е-поште', |
| 341 | | -'emailforlost' => '* Уношење адресе е-поште није обавезно. Међутим, унос ће омогућити људима да Вас контатирају кроз сајт, а да не морате да им откријете своју адресу. Такође ће Вам помоћи уколико заборавите вашу лозинку.', |
| 342 | 341 | 'emailfrom' => 'Од', |
| 343 | 342 | 'emailmessage' => 'Порука', |
| 344 | 343 | 'emailnotauthenticated' => 'Ваша адреса е-поште <strong>још увек није потврђена</strong>. Е-пошта неће бити послата ни за једну од следећих могућности.', |
| Index: branches/liquidthreads/languages/MessagesEl.php |
| — | — | @@ -321,8 +321,6 @@ |
| 322 | 322 | 'yournick' => 'Το ψευδώνυμό σας (για την υπογραφή)', |
| 323 | 323 | 'email' => 'αλληλογραφία', |
| 324 | 324 | |
| 325 | | -'emailforlost' => 'Τα πεδία που σημειώνονται με αστερίσκο (*) είναι προαιρετικά. Αφήνοντας μια ηλεκτρονική διεύθυνση στο αρχείο δίνετε τη δυνατότητα σε άλλους χρήστες να επικοινωνήσουν μαζί σας μέσω αυτής της ιστοσελίδας, χωρίς η διεύθυνσή σας να εμφανίζεται δημόσια. Η ηλεκτρονική σας διεύθυνση μπορεί επίσης να χρησιμοποιηθεί για να σας σταλεί ένας νέος κωδικός πρόσβασης αν κάποτε τον χάσετε. Το πραγματικό σας όνομα, αν επιλέξετε να μας το δώσετε, θα χρησιμοποιηθεί μόνον για την αναγνώριση της συνεισφοράς σας.', |
| 326 | | - |
| 327 | 325 | 'prefs-help-email-enotif' => 'Αυτή η διεύθυνση χρησιμοποιείται για να σας αποστέλλονται ειδοποιήσεις εφόσον έχετε ενεργοποιήσει τις σχετικές επιλογές.', |
| 328 | 326 | 'prefs-help-realname' => '* Πραγματικό όνομα (προαιρετικό): εφόσον εισάγετε το όνομά σας, αυτό θα μπορεί να χρησιμοποιηθεί για να αναγνωριστεί ευρύτερα η δουλειά σας.', |
| 329 | 327 | 'loginerror' => 'Λάθος σύνδεσης', |
| Index: branches/liquidthreads/languages/MessagesEt.php |
| — | — | @@ -263,7 +263,6 @@ |
| 264 | 264 | "userexists" => "Sisestatud kasutajanimi on juba kasutusel. Valige uus nimi.", |
| 265 | 265 | "youremail" => "Teie e-posti aadress*", |
| 266 | 266 | "yournick" => "Teie hüüdnimi (allakirjutamiseks)", |
| 267 | | -"emailforlost" => "* Meiliaadressi sisestamine ei ole kohustuslik. Kuid see aitab inimestel Teiega veebisaidi kaudu ühendust võtta, ilma et Te peaksite neile oma meiliaadressi avaldama, ning samuti on sellest kasu, kui unustate parooli. <br /><br />Teie päris nime, kui otsustate selle avaldada, kasutatakse Teie tööpanuse seostamiseks Teiega.", |
| 268 | 267 | 'prefs-help-realname' => '* <strong>Tegelik nimi</strong> (pole kohustuslik): kui otsustate selle avaldada, kasutatakse seda Teie tööpanuse seostamiseks Teiega.<br />', |
| 269 | 268 | 'prefs-help-email' => '* <strong>E-post</strong> (pole kohustuslik): Võimaldab inimestel Teiega veebisaidi kaudu ühendust võtta, ilma et Te peaksite neile oma meiliaadressi avaldama, samuti on sellest kasu, kui unustate parooli.', |
| 270 | 269 | |
| Index: branches/liquidthreads/languages/MessagesIs.php |
| — | — | @@ -194,7 +194,6 @@ |
| 195 | 195 | 'editsection' => "breyta", |
| 196 | 196 | 'editold' => "breyta", |
| 197 | 197 | 'editthispage' => "Breyta þessari síðu", |
| 198 | | -'emailforlost' => "Ekki er nauðsynlegt að gefa upp netfang. Ef þú gefur upp netfang getur fólk sent þér tölvupóst í gegnum {{SITENAME}} án þess að sjá netfangið þitt og þú getur fengið nýtt lykilorð sent ef það gleymist. Einnig er mögulegt fyrir nýja notendur að skrá sig með því að fylla bara út í reiti fyrir notendanafn og tölvupóst og smella svo á „með netfangi“ takkan, þá verður lykilorð sent á viðkomandi netfang.", |
| 199 | 198 | 'emailfrom' => "Frá", |
| 200 | 199 | 'emailmessage' => "Skilaboð", |
| 201 | 200 | 'emailpage' => "Senda tölvupóst", |
| Index: branches/liquidthreads/languages/MessagesFa.php |
| — | — | @@ -230,9 +230,6 @@ |
| 231 | 231 | 'userexists' => "نام کاربریای که وارد کردید قبلاً استفاده شده است. لطفاً یک نام دیگر انتخاب کنید.", |
| 232 | 232 | 'youremail' => "پست الکترونیکی شما*", |
| 233 | 233 | 'yournick' => "لقب شما (برای امضاها)", |
| 234 | | -'emailforlost' => "* وارد کردن نشانی پست الکترونیکی اختیاری است. اما اجازه میدهد دیگران، |
| 235 | | -بدون نیاز به این که نشانی پست الکترونیکتان را افشا کنید، با شما از طریق وبگاه تماس بگیرند، |
| 236 | | -و اگر کلمهی عبورتان را فراموش کنید نیز کمکتان میکند.", |
| 237 | 234 | 'loginerror' => "خطا در ورود به سیستم", |
| 238 | 235 | 'nocookiesnew' => "حساب کاربری ایجاد شد، اما شما وارد سیستم نشدید. {{SITENAME}} برای ورود کاربران به سیستم از cookie استفاده میکند. شما |
| 239 | 236 | cookieها را از کار انداختهاید. لطفاً cookieها را به کار بیندازید، و سپس با نام کاربری و کلمهی عبور جدیدتان به سیستم وارد شوید.", |
| Index: branches/liquidthreads/languages/MessagesFi.php |
| — | — | @@ -317,7 +317,6 @@ |
| 318 | 318 | 'yournick' => 'Nimimerkki allekirjoituksia varten:', |
| 319 | 319 | 'badsig' => 'Allekirjoitus on epävalidi.', |
| 320 | 320 | 'email' => 'Sähköpostitoiminnot', |
| 321 | | -'emailforlost' => ' ', |
| 322 | 321 | 'prefs-help-email-enotif' => 'Tätä osoitetta käytetään myös artikkelien muuttumisilmoituksiin, jos ominaisuus on käytössä.', |
| 323 | 322 | 'prefs-help-realname' => 'Nimi (vapaaehtoinen): Nimeäsi käytetään antaamaan kunnia työllesi.', |
| 324 | 323 | 'loginerror' => 'Sisäänkirjautumisvirhe', |
| Index: branches/liquidthreads/languages/MessagesBr.php |
| — | — | @@ -270,7 +270,6 @@ |
| 271 | 271 | 'youremail' => 'Ma chomlec\'h elektronek', |
| 272 | 272 | 'yournick' => 'Sinadur evit ar c\'haozeadennoù (gant <tt><nowiki>~~~</nowiki></tt>) ', |
| 273 | 273 | 'yourrealname' => 'Hoc\'h anv gwir*', |
| 274 | | -'emailforlost' => 'Ma tiankit ho ker-tremen e c\'hallit goulenn ma vo kaset deoc\'h ur ger-tremen nevez d\'ho chomlec\'h postel.', |
| 275 | 274 | 'prefs-help-realname' => '* <strong>Hoc\'h anv</strong> (diret): ma vez spisaet ganeoc\'h e vo implijet evit merkañ ho tegasadennoù.', |
| 276 | 275 | 'prefs-help-email' => '* <strong>Chomlec\'h postel</strong> (diret): gantañ e vo aes mont e darempred ganeoc\'h adal al lec\'hienn o terc\'hel kuzh ho chomlec\'h, hag adkas ur ger-tremen deoc\'h ma tichañsfe deoc\'h koll ho hini.', |
| 277 | 276 | 'loginerror' => 'Kudenn zisklêriañ', |
| Index: branches/liquidthreads/languages/MessagesNo.php |
| — | — | @@ -223,7 +223,6 @@ |
| 224 | 224 | "userexists" => "Brukernavnet er allerede i bruk. Velg et nytt.", |
| 225 | 225 | "youremail" => "E-postadresse", |
| 226 | 226 | "yournick" => "Økenavn (for signaturer)", |
| 227 | | -"emailforlost" => "Hvis du glemmer passordet, kan du få et nytt sendt til din e-postadresse.", |
| 228 | 227 | "loginerror" => "Innloggingsfeil", |
| 229 | 228 | "noname" => "Du har ikke oppgitt et gyldig brukernavn.", |
| 230 | 229 | "loginsuccesstitle" => "Du er nå innlogget", |
| Index: branches/liquidthreads/languages/MessagesVi.php |
| — | — | @@ -274,7 +274,6 @@ |
| 275 | 275 | 'youremail' => 'Thư điện tử *', |
| 276 | 276 | 'yournick' => 'Chữ ký trong thảo luận (dùng <tt><nowiki>~~~</nowiki></tt>) ', |
| 277 | 277 | 'yourrealname' => 'Tên thật *', |
| 278 | | -'emailforlost' => 'Nếu quên mật khẩu, bạn có thể yêu cầu mật khẩu mới được gửi về thư điện tử của bạn.', |
| 279 | 278 | 'prefs-help-realname' => '* <strong>Tên thật</strong> (tùy): tên này (nếu được nhập) sẽ được dùng trong các đóng góp của bạn.', |
| 280 | 279 | 'prefs-help-email' => '* <strong>Thư điện tử</strong> (tùy): người khác có thể gửi thư từ trang này cho bạn mà họ vẫn không biết địa chỉ thư của bạn; địa chỉ thư còn giúp gửi bạn mật khẩu nếu bạn quên.', |
| 281 | 280 | 'loginerror' => 'Lỗi đăng nhập', |
| Index: branches/liquidthreads/languages/MessagesFy.php |
| — | — | @@ -207,10 +207,6 @@ |
| 208 | 208 | "userexists" => "Dy brûkersname wurdt al brûkt. Besykje in oarenien.", |
| 209 | 209 | "youremail" => "Jo e-postadres (*).", |
| 210 | 210 | "yournick" => "Jo alias (foar sinjaturen)", |
| 211 | | -"emailforlost" => "* In e-postadres hoecht net.<br /> |
| 212 | | -Mar it helpt, soenen jo jo wachtwurd ferjitte. |
| 213 | | -En mei in e-postadres kinne oaren fan de web siden contact mei jo krije, |
| 214 | | -sûnder dat se dat adres witte. (Dat leste kin ek wer útset by de instellings.)", |
| 215 | 211 | |
| 216 | 212 | "loginerror" => "Oanmeldflater", |
| 217 | 213 | "noname" => "Jo moatte in brûkersnamme opjaan.", |
| Index: branches/liquidthreads/languages/MessagesCa.php |
| — | — | @@ -189,7 +189,6 @@ |
| 190 | 190 | 'yourlanguage' => 'Llengua:', |
| 191 | 191 | 'yournick' => 'Malnom (nom que es mostrarà)', |
| 192 | 192 | 'email' => 'Adreça electrònica', |
| 193 | | -'emailforlost' => 'Si perdeu o oblideu la vostra contrasenya, podeu demanar que se us enviï una nova a la vostra direcció electrònica.', |
| 194 | 193 | 'loginerror' => 'Error d\'inici de sessió', |
| 195 | 194 | 'noname' => 'No heu especificat un nom vàlid d\'usuari.', |
| 196 | 195 | 'loginsuccesstitle' => 'S\'ha iniciat la sessió amb èxit', |
| Index: branches/liquidthreads/languages/MessagesSc.php |
| — | — | @@ -178,7 +178,6 @@ |
| 179 | 179 | "userexists" => "Siamo spiacenti. Lo user name che hai scelto è già usato da un altro Utente. Ti preghiamo perciò di voler scegliere uno user name diverso.", |
| 180 | 180 | "youremail" => "La tua e-mail", |
| 181 | 181 | "yournick" => "Il tuo diminutivo o soprannome (per le firme)", |
| 182 | | -"emailforlost" => "Se per caso ti dimenticassi della tua password, ne potresti ricevere una nuova di zecca presso la casella e-mail che ci hai indicato.", |
| 183 | 182 | "loginerror" => "Errore di Login", |
| 184 | 183 | "noname" => "Lo user name indicato non è valido, non è possibile creare un account a questo nome.", |
| 185 | 184 | "loginsuccesstitle" => "Login effettuato con successo!", |
| Index: branches/liquidthreads/languages/MessagesCs.php |
| — | — | @@ -308,7 +308,6 @@ |
| 309 | 309 | 'yournick' => 'Alternativní podpis', |
| 310 | 310 | 'badsig' => 'Chybný podpis, zkontrolujte syntaxi HTML.', |
| 311 | 311 | 'email' => 'E-mail', |
| 312 | | -'emailforlost' => 'Pole označená hvězdičkami (*, **) nejsou povinná. Pokud zadáte e-mailovou adresu, budou vás moci ostatní uživatelé kontaktovat, aniž by tato adresa byla zobrazena; také vám na tuto adresu může být zasláno nové heslo v případě, že své heslo zapomenete.<br /><br />Vaše skutečné jméno, pokud ho zadáte, bude použito pro označení autorství vaší práce.', |
| 313 | 312 | 'prefs-help-email-enotif' => 'Na tuto adresu vám budou zasílány informace o změně stránek, pokud o ně požádáte.', |
| 314 | 313 | 'prefs-help-realname' => '**) Skutečné jméno (volitelné): pokud ho zadáte, bude použito pro označení autorství vaší práce.<br />', |
| 315 | 314 | 'loginerror' => 'Chyba při přihlašování', |
| Index: branches/liquidthreads/languages/MessagesKo.php |
| — | — | @@ -232,7 +232,6 @@ |
| 233 | 233 | 'yourlanguage' => '언어', |
| 234 | 234 | 'yourvariant' => 'Variant', |
| 235 | 235 | 'yournick' => '별명(서명용)', |
| 236 | | -'emailforlost' => '전자우편은 선택사항입니다. 전자우편 주소를 넣으면 다른 사용자들이 전자우편 주소를 알지 못한 상태에서 전자우편을 보낼 수 있습니다. 암호를 잊었을 때, 새 암호를 전자우편으로 받을 수 있습니다.<br /><br />본명은 참여한 사람을 밝히는 데에 쓰일 수 있습니다.', |
| 237 | 236 | 'loginerror' => '로그인 오류', |
| 238 | 237 | 'noname' => '계정 이름이 올바르지 않습니다.', |
| 239 | 238 | 'loginsuccesstitle' => '로그인 성공', |
| Index: branches/liquidthreads/languages/MessagesCy.php |
| — | — | @@ -221,7 +221,6 @@ |
| 222 | 222 | "userexists" => "Mae rhywun arall wedi dewis yr enw defnyddwr. Dewiswch un arall os gwelwch yn dda.", |
| 223 | 223 | "youremail" => "Eich cyfeiriad e-bost", |
| 224 | 224 | "yournick" => "Eich llysenw (am llofnod)", |
| 225 | | -"emailforlost" => "Os anghofiwch eich allweddair, cewch cael un newydd postwyd i'ch cyfeiriad e-bost.", |
| 226 | 225 | "loginerror" => "Problem mewngofnodi", |
| 227 | 226 | "nocookiesnew" => "Mae'r accownt defnyddiwr wedi gael eu creu, ond dydwch chi ddim wedi mewngofnodi. Mae {{SITENAME}} yn defnyddio cwcis i mewngofnodi defnyddwyr. Rydych chi wedi anablo cwcis. Galluogwch nhw os welwch yn dda, felly mewngofnodwch gyda'ch enw defnyddiwr a cyfrinair newydd.", |
| 228 | 227 | "nocookieslogin" => "Mae {{SITENAME}} yn defnyddio cwcis i mewngofnodi defnyddwyr. Rydych chi wedi anablo cwcis. Galluogwch nhw os welwch yn dda, a triwch eto.", |
| Index: branches/liquidthreads/languages/MessagesSk.php |
| — | — | @@ -305,11 +305,6 @@ |
| 306 | 306 | 'yournick' => 'Vaša prezývka', |
| 307 | 307 | 'badsig' => 'Neplatný podpis v pôvodnom tvare; skontrolujte HTML tagy.', |
| 308 | 308 | 'email' => 'e-mail', |
| 309 | | -'emailforlost' => 'Polia označené horným indexom sú nepovinné. Uvedenie e-mailovej adresy umožňuje |
| 310 | | -ľuďom vás kontaktovať cez rozhranie prehliadača bez toho, aby ste týmto ľuďom museli prezradiť vašu |
| 311 | | -e-mailovú adresu. Navyše možno e-mailovú adresu použiť na zaslanie nového hesla, ak ho náhodou zabudnete. |
| 312 | | -<br /><br /> |
| 313 | | -Vaše skutočné meno, ak sa rozhodnete ho uverejniť, bude priradené k vašej práci.', |
| 314 | 309 | 'prefs-help-email-enotif'=> 'Táto adresa sa používa aj na posielanie e-mailových upozornení, ak ste túto možnosť povolili.', |
| 315 | 310 | 'prefs-help-realname' => '¹ Skutočné meno (nepovinné): ak sa rozhodnete ho poskytnúť, bude použité na označenie Vašej práce.', |
| 316 | 311 | 'loginerror' => 'Chyba pri prihlasovaní', |
| Index: branches/liquidthreads/languages/MessagesKu.php |
| — | — | @@ -123,7 +123,6 @@ |
| 124 | 124 | 'editsection' => 'biguherîne', |
| 125 | 125 | 'editold' => 'biguherîne', |
| 126 | 126 | 'editthispage' => 'Vê rûpelê biguherîne', |
| 127 | | -'emailforlost' => '* Nivîsandina navnîşana te \'\'ne mecbûrî\'\' ye. Lê eger tu navnîşana xwe binîvîsî, mirov dikare e-mailekê ji te re bişîne bêyî ku navnîşana te zanibe. Her wiha, eger tu şîfreya xwe ji bîr bikî, {{SITENAME}} dikare şîfreya te bişîne ji vê navnîşana te re.', |
| 128 | 127 | 'emailfrom' => 'Ji', |
| 129 | 128 | 'emailmessage' => 'Name', |
| 130 | 129 | 'emailpage' => 'E-name bikarhêner', |
| Index: branches/liquidthreads/languages/MessagesSq.php |
| — | — | @@ -305,7 +305,6 @@ |
| 306 | 306 | 'yournick' => 'Nënshkrimi', |
| 307 | 307 | 'badsig' => 'Sintaksa e signaturës është e pavlefshme, kontrolloni HTML-in.', |
| 308 | 308 | 'email' => 'Email', |
| 309 | | -'emailforlost' => '* Futja e email-it nuk është e detyrueshme. Por lejon përdorues të tjerë tu kontaktojnë nëpërmjet faqes pa u treguar adresën, gjithashtu kjo adresë është e dobishme n.q.s. harroni fjalëkalimin', |
| 310 | 309 | 'prefs-help-email-enotif'=> 'Kjo adresë përdoret dhe për tu dërguar njoftime nëse keni mundësuar këtë parapëlqim.', |
| 311 | 310 | 'prefs-help-realname' => '* Emri i vërtetë (opsion): Për të përmendur emrin tuaj si kontribuues në varësi nga puna juaj këtu.', |
| 312 | 311 | 'loginerror' => 'Gabim hyrje', |
| Index: branches/liquidthreads/languages/MessagesSu.php |
| — | — | @@ -336,7 +336,6 @@ |
| 337 | 337 | 'email' => 'Surélék', |
| 338 | 338 | 'emailauthenticated' => 'Alamat surélék anjeun geus dioténtikasi $1.', |
| 339 | 339 | 'emailconfirmlink' => 'Konfirmasi alamat surélék anjeun', |
| 340 | | -'emailforlost' => 'Widang nu ditandaan béntang (*) sipatna pilihan. Neundeun alamat surélék bisa dimangpaatkeun ku nu séjén pikeun nepungan anjeun ngaliwatan website tanpa kudu mikeun alamat surélék urang ka maranéhna, sarta bisa ogé dipaké pikeun nepikeun sandi anyar mun anjeun poho.<br /><br />Ngaran asli anjeun, mun anjeun milih nyadiakeun, bakal dipaké pikeun ngararangkénan anjeun ku karya-karya anjeun.', |
| 341 | 340 | 'emailfrom' => 'Ti', |
| 342 | 341 | 'emailmessage' => 'Pesen', |
| 343 | 342 | 'emailnotauthenticated' => 'Alamat surélék anjeun <strong>can dioténtikasi</strong>. Moal aya surélék nu bakal dikirim pikeun fitur-fitur di handap ieu.', |
| Index: branches/liquidthreads/languages/MessagesHe.php |
| — | — | @@ -359,7 +359,6 @@ |
| 360 | 360 | "yournick" => "כינוי (לחתימות):", |
| 361 | 361 | "badsig" => "חתימה מסוגננת שגויה; אנא בדקו את תגיות ה־HTML.", |
| 362 | 362 | "email" => 'דוא"ל', |
| 363 | | -"emailforlost" => '<div style="width: 30em;"><p>* אופציונאלי. כתובת דוא"ל מאפשרת לאחרים ליצור איתכם קשר דרך האתר מבלי שתצטרכו לגלות להם את כתובתך, ומאפשרת לנו לשלוח לכם סיסמה חדשה באם תשכחו אותה.</p><p>שמכם האמיתי ישמש כדי לייחס את עבדותך אליכם.</p></div>', |
| 364 | 363 | "prefs-help-email-enotif" => 'כתובת זו משמשת גם למשלוח עדכונים דרך הדוא"ל (אם אפשרתם זאת).', |
| 365 | 364 | "prefs-help-realname" => "* שם אמיתי (אופציונאלי): אם תבחרו לספק שם זה, הוא ישמש לייחוס עבודתכם אליכם.", |
| 366 | 365 | "loginerror" => "שגיאה בכניסה לאתר", |
| Index: branches/liquidthreads/languages/MessagesPa.php |
| — | — | @@ -239,9 +239,6 @@ |
| 240 | 240 | 'yourlanguage' => 'Interface language', |
| 241 | 241 | 'yourvariant' => 'Language variant', |
| 242 | 242 | 'yournick' => 'ਤੁਹਾਡਾ ਉਪਨਾਮ (ਦਸਤਖ਼ਤ ਲਈ)', |
| 243 | | -'emailforlost' => 'Star (*) ਨਿਸ਼ਾਨ ਲੱਗੇ ਖਾਨਿਆਂ ਵਿੱਚ ਭਰਨਾ ਲਾਜ਼ਮੀ ਨਹੀਂ ਹੈ. |
| 244 | | -ਜੇ ਤੁਸੀਂ ਈ-ਮੇਲ ਦਿੰਦੇ ਹੋ ਤਾਂ ਬਿਨਾਂ ਤੁਹਾਡੇ ਅਸਲੀ ਈ-ਮੇਲ ਨੂੰ ਜਾਣੇ, ਇਸ website ਦੁਆਰਾ ਲੋਕ ਤੁਹਾਨੂੰ ਸੰਪੰਰਕ ਕਰ ਸਕਦੇ ਹਨ |
| 245 | | -ਅਤੇ ਜੇ ਕਦੀ ਤੁਸੀਂ ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਜਾਓ, ਤਾਂ ਇਸ ਈ-ਮੇਲ ਤੇ ਤੁਹਾਨੂੰ ਨਵਾਂ ਪਾਸਵਰਡ ਭੇਜਿਆ ਜਾ ਸਕਦਾ ਹੈ. <br /><br />ਤੁਹਾਡਾ ਅਸਲੀ ਨਾਮ, ਜੇ ਤੁਸੀਂ ਇੱਥੇ ਦਿੰਦੇ ਹੋ, ਤੁਹਾਡੇ ਕੰਮ ਨੂੰ attribution ਦੇਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇਗਾ', |
| 246 | 243 | 'prefs-help-realname' => '* <strong>ਅਸਲੀ ਨਾਮ</strong> (ਗੈਰ-ਜ਼ਰੂਰੀ): ਜੇ ਤੁਸੀਂ ਭਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੰਮ ਨੂੰ attribution ਦੇਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇਗਾ<br />', |
| 247 | 244 | 'prefs-help-email' => '* <strong>ਈ-ਮੇਲ</strong> (ਗੈਰ-ਜ਼ਰੂਰੀ): ਜੇ ਭਰਦੇ ਹੋ ਤਾਂ ਬਿਨਾਂ ਤੁਹਾਡੇ ਅਸਲੀ ਈ-ਮੇਲ ਨੂੰ ਜਾਣੇ, ਇਸ website ਦੁਆਰਾ ਲੋਗ ਤੁਹਾਨੂੰ ਸੰਪੰਰਕ ਕਰ ਸਕਦੇ ਹਨ |
| 248 | 245 | ਅਤੇ ਜੇ ਕਦੀ ਤੁਸੀਂ ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਜਾਓ, ਤਾਂ ਇਸ ਈ-ਮੇਲ ਤੇ ਤੁਹਾਨੂੰ ਨਵਾਂ ਪਾਸਵਰਡ ਭੇਜਿਆ ਜਾ ਸਕਦਾ ਹੈ.', |
| Index: branches/liquidthreads/languages/MessagesPt_br.php |
| — | — | @@ -225,7 +225,6 @@ |
| 226 | 226 | "userexists" => "O nome de usuário que você digitou já existe. Por favor, escolha um nome diferente.", |
| 227 | 227 | "youremail" => "Seu e-mail*", |
| 228 | 228 | "yournick" => "Seu apelido (para assinaturas)", |
| 229 | | -/*"emailforlost" => "* Colocar o endereço de e-mail é opcional. Mas permite que as pessoas entrem em contato com você sem que você tenha que revelar seu e-mail � elas, e também é útil se você se esquecer da sua senha.",*/ |
| 230 | 229 | "loginerror" => "Erro de autenticação", |
| 231 | 230 | "noname" => "Você não colocou um nome de usuário válido.", |
| 232 | 231 | "loginsuccesstitle" => "Login bem sucedido", |
| Index: branches/liquidthreads/languages/MessagesHu.php |
| — | — | @@ -222,10 +222,6 @@ |
| 223 | 223 | "userexists" => "A név amit megadtál már létezik. Kérlek, adj meg más nevet.", |
| 224 | 224 | "youremail" => "Az emailed*", |
| 225 | 225 | "yournick" => "A beceneved (aláírásokhoz)", |
| 226 | | -"emailforlost" => "* Az email cím megadása nem kötelező, viszont lehetővé |
| 227 | | -teszi másoknak, hogy kapcsolatba lépjenek veled a weblapon keresztül |
| 228 | | -anélkül, hogy a címedet megtudnák. Segítségedre lehet akkor is, ha |
| 229 | | -elfelejted a jelszavadat.", |
| 230 | 226 | "loginerror" => "Belépési hiba.", |
| 231 | 227 | "noname" => "Nem adtál meg érvényes felhasználói nevet.", |
| 232 | 228 | "loginsuccesstitle" => "Sikeres belépés", |
| Index: branches/liquidthreads/languages/MessagesLt.php |
| — | — | @@ -314,8 +314,6 @@ |
| 315 | 315 | 'editusergroup' => 'Redaguoti naudotojo gruoes', |
| 316 | 316 | 'email' => 'El. paštas', |
| 317 | 317 | 'emailconfirmlink' => 'Patvirtinkite savo el.pašto adresą', |
| 318 | | -'emailforlost' => '<!--* Elektroninio pašto adresas nėra privalomas. Tačiau jei įvesite, kiti vartotojai galės siųsti jums laiškus nesužinodami adreso. Taip pat pašto adresas gelbsti pamiršus slaptažodį. |
| 319 | 318 | 'emailfrom' => 'Nuo', |
| 320 | 319 | 'emailmessage' => 'Tekstas', |
| 321 | 320 | 'emailnotauthenticated' => 'Jūsų el.pašto adresas <strong>nėra patvirtintas</strong>. El.laiškas |
| Index: branches/liquidthreads/languages/MessagesTr.php |
| — | — | @@ -239,7 +239,6 @@ |
| 240 | 240 | 'yournick' => 'İmzalarda gözükmesini istediğiniz isim', |
| 241 | 241 | 'yourrealname' => 'Gerçek isminiz*', |
| 242 | 242 | 'email' => 'Eposta', |
| 243 | | -'emailforlost' => 'Yıldız (*) ile belirtilmiş alanlar zorunlu değildir. E-posta adresinizi vermeniz, insanların sizinle Web sitesi aracılığı ile \'\'\'adresinizi görmeden\'\'\' haberleşmelerini sağlar, ve parolanızı unuttuğunuzda size yeni bir parola gönderilmesini de mümkün kılar.', |
| 244 | 243 | 'prefs-help-email' => '* E-posta (isteğe bağlı): Diğer kullanıcıların kullanıcı sayfanız aracılığıyla <strong>adresinizi bilmeksizin</strong> sizle iletişim kurmasını sağlar.', |
| 245 | 244 | 'loginsuccess' => '{{SITENAME}} sitesinde "$1" kullanıcı adıyla oturum açmış bulunmaktasınız.', |
| 246 | 245 | 'loginsuccesstitle' => 'Oturum açıldı', |
| Index: branches/liquidthreads/languages/MessagesAf.php |
| — | — | @@ -186,7 +186,6 @@ |
| 187 | 187 | "userexists" => "Die gebruikersnaam wat jy gebruik het, is alreeds gebruik. Kies asseblief 'n ander gebruikersnaam.", |
| 188 | 188 | "youremail" => "Jou e-pos", |
| 189 | 189 | "yournick" => "Jou bynaam (vir stempel)", |
| 190 | | -"emailforlost" => "Indien jy jou wagwoord vergeet het, kan jy 'n nuwe wagwoord na jou e-pos adres laat stuur.", |
| 191 | 190 | "loginerror" => "Intekenfout", |
| 192 | 191 | "noname" => "Ongeldige gebruikersnaam.", |
| 193 | 192 | "loginsuccesstitle" => "Suksesvolle intekening", |
| Index: branches/liquidthreads/languages/MessagesId.php |
| — | — | @@ -318,7 +318,6 @@ |
| 319 | 319 | "yournick" => "Nama samaran (untuk tanda tangan):", |
| 320 | 320 | 'badsig' => 'Tanda tangan teks murni tak tepat; periksa tag HTML.', |
| 321 | 321 | 'email' => 'Surat elektronik', |
| 322 | | -"emailforlost" => "Isian yang bertanda * tidak harus diisi. Walaupun demikian, dengan memberikan alamat surat-e Anda, orang lain dapat menghubungi Anda melalui situs web tanpa perlu memberikan alamat surat-e Anda kepada mereka, dan surat-e Anda juga dapat digunakan untuk mendapatkan kata sandi yang baru (dengan cara dikirimkan ke alamat surat-e Anda) apabila Anda lupa kata sandi Anda.<br /><br />Nama asli, jika Anda memberikannya, akan digunakan untuk memberikan pengenalan atas kerja Anda.", |
| 323 | 322 | 'prefs-help-email-enotif' => 'Alamat ini juga digunakan untuk mengirim surat-e notifikasi pada Anda jika Anda memilih pilihan tersebut.', |
| 324 | 323 | 'prefs-help-realname' => '* <strong>Nama asli</strong> (tidak wajib): jika Anda memberikannya, nama asli Anda akan digunakan untuk memberi pengenalan atas hasil kerja Anda.', |
| 325 | 324 | 'loginerror' => 'Kesalahan masuk log', |
| Index: branches/liquidthreads/languages/MessagesZh_cn.php |
| — | — | @@ -205,7 +205,6 @@ |
| 206 | 206 | "userexists" => "您所输入的用户名已有人使用。请另选一个。", |
| 207 | 207 | "youremail" => "您的电子邮件*", |
| 208 | 208 | "yournick" => "绰号（签名时用）", |
| 209 | | -"emailforlost" => "* 输入一个电邮地址并不是必须的。但是这将允许他人在您未告知的情况下通过电子邮件与您联系，如果您忘了密码的话电邮地址也会有帮助。", |
| 210 | 209 | "loginerror" => "登录错误", |
| 211 | 210 | "noname" => "你没有输入一个有效的用户名。", |
| 212 | 211 | "loginsuccesstitle" => "登录成功", |
| Index: branches/liquidthreads/languages/MessagesAr.php |
| — | — | @@ -154,7 +154,6 @@ |
| 155 | 155 | 'editold' => 'تحرير', |
| 156 | 156 | 'editthispage' => 'عدل هذه الصفحة', |
| 157 | 157 | 'emailflag' => 'عدم تلقي الرسائل من المستخدمين الآخرين', |
| 158 | | -'emailforlost' => '* إدخال عنوانك البريدي أمر إختياري، لكنه يسمح لك بإرسال رسائل للأعضاء في الموقع من دون الكشف عن عنوانك لهم، كما أنه يساعدك في حال نسيانك لكلمة السر.', |
| 159 | 158 | 'emailfrom' => 'من', |
| 160 | 159 | 'emailmessage' => 'نص الرسالة', |
| 161 | 160 | 'emailpage' => 'أرسل رسالة للمستخدم', |
| Index: branches/liquidthreads/languages/MessagesEo.php |
| — | — | @@ -225,7 +225,6 @@ |
| 226 | 226 | 'userexists' => 'Jam estas uzulo kun la nomo kiun vi elektis. Bonvolu elekti alian nomon.', |
| 227 | 227 | 'youremail' => 'Via retpoŝtadreso', |
| 228 | 228 | 'yournick' => 'Via kaŝnomo (por subskriboj)', #FIXME - ĉu kaŝnomo, plumnomo? / 'Kaŝnomo' ŝajnas bona /Bertilo |
| 229 | | -'emailforlost' => 'Se vi forgesos vian pasvorton, vi povas peti ke ni sendu novan al via retpoŝtadreso.', |
| 230 | 229 | 'loginerror' => 'Ensaluta eraro', #FIXME |
| 231 | 230 | 'noname' => 'Vi ne enmetis validan salutnomon.', |
| 232 | 231 | 'loginsuccesstitle' => 'Ensalutado sukcesis', |
| Index: branches/liquidthreads/languages/MessagesSr_el.php |
| — | — | @@ -337,7 +337,6 @@ |
| 338 | 338 | 'email' => 'E-pošta', |
| 339 | 339 | 'emailauthenticated' => 'Vaša adresa e-pošte je proverena na $1.', |
| 340 | 340 | 'emailconfirmlink' => 'Potvrdite vašu adresu e-pošte', |
| 341 | | -'emailforlost' => '* Unošenje adrese e-pošte nije obavezno. Međutim, unos će omogućiti ljudima da Vas kontatiraju kroz sajt, a da ne morate da im otkrijete svoju adresu. Takođe će Vam pomoći ukoliko zaboravite vašu lozinku.', |
| 342 | 341 | 'emailfrom' => 'Od', |
| 343 | 342 | 'emailmessage' => 'Poruka', |
| 344 | 343 | 'emailnotauthenticated' => 'Vaša adresa e-pošte <strong>još uvek nije potvrđena</strong>. E-pošta neće biti poslata ni za jednu od sledećih mogućnosti.', |
| Index: branches/liquidthreads/languages/MessagesEs.php |
| — | — | @@ -228,7 +228,6 @@ |
| 229 | 229 | "userexists" => "El nombre que entraste ya está en uso. Por favor, elige un nombre diferente.", |
| 230 | 230 | "youremail" => "Tu dirección de correo electrónico", |
| 231 | 231 | "yournick" => "Tu apodo (para firmas)", |
| 232 | | -"emailforlost" => "Ingresar una dirección electrónica es opcional, pero permite a los demás usuarios contactarse contigo a través del sitio web sin tener que revelarles tu dirección electrónica. Además, si pierdes u olvidas tu contraseña, puedes pedir que se te envíe una nueva.", |
| 233 | 232 | "loginerror" => "Error de inicio de sesión", |
| 234 | 233 | "noname" => "No has especificado un nombre de usuario válido.", |
| 235 | 234 | "loginsuccesstitle" => "Inicio de sesión exitoso", |
| Index: branches/liquidthreads/languages/MessagesMk.php |
| — | — | @@ -241,7 +241,6 @@ |
| 242 | 242 | "userexists" => "Корисничкото име што го внесовте веќе се користи. Изберете друго име.", |
| 243 | 243 | "youremail" => "Вашата е-пошта*", |
| 244 | 244 | "yournick" => "Вашиот надимак (за потпис)", |
| 245 | | -"emailforlost" => "* Внесувањето на е-поштенска адреса не е задолжително. Сепак, тоа помага на други корисници да стапат во контакт со вас преку сајтот без да им ја кажувате е-поштенската адреса, исто така помага ако ја заборавите лозинката.", |
| 246 | 245 | "loginerror" => "Грешка во најавувањето", |
| 247 | 246 | 'prefs-help-email-enotif' => 'Оваа адреса истотака се користи за испраќање на известувања по е-пошта доколку ја имате дозволено таа можност.', |
| 248 | 247 | 'prefs-help-realname' => '* Вистинско име (опција). Доколку изберете да го дадете вашето име, тоа може да се искористи за давање на заслуги за вашата работа.', |
| Index: branches/liquidthreads/languages/LanguageHe.php |
| — | — | @@ -120,11 +120,11 @@ |
| 121 | 121 | * @return string of the wanted message |
| 122 | 122 | */ |
| 123 | 123 | function getMessage( $key ) { |
| 124 | | - global $wgAllMessagesHe; |
| 125 | | - if(array_key_exists($key, $wgAllMessagesHe)) |
| 126 | | - return $wgAllMessagesHe[$key]; |
| 127 | | - else |
| 128 | | - return parent::getMessage($key); |
| | 124 | + if( isset( $this->mMessagesHe[$key] ) ) { |
| | 125 | + return $this->mMessagesHe[$key]; |
| | 126 | + } else { |
| | 127 | + return parent::getMessage( $key ); |
| | 128 | + } |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
| Index: branches/liquidthreads/languages/MessagesAz.php |
| — | — | @@ -185,7 +185,6 @@ |
| 186 | 186 | 'yournick' => 'Ləqəb:', |
| 187 | 187 | 'yourrealname' => 'Həqiqi adınız *', |
| 188 | 188 | 'email' => 'E-məktub', |
| 189 | | -'emailforlost' => '<div style="width:30em">* E-məktub ünvanı məcburi deyildir. E-məktub ünvanı digər istifadəçilərin sizə ünvanınız aşkar edilmədən e-məktub göndərməyinə və parolunuzu yaddan çıxarsanız, sizə yeni parol göndərməyimizə imkan verir.<br /><br />Your real name will be used to give you attribution for your work.</div>', |
| 190 | 189 | 'prefs-help-email' => '* E-məktub (qeyri-məcburi): Enables others to contact you through your user or user_talk page without the need of revealing your identity.', |
| 191 | 190 | 'loginsuccess' => '\'\'\'"$1" olaraq {{SITENAME}}-ya daxil oldunuz.\'\'\'', |
| 192 | 191 | 'loginsuccesstitle' => 'Daxil olundu', |
| Index: branches/liquidthreads/RELEASE-NOTES |
| — | — | @@ -524,6 +524,7 @@ |
| 525 | 525 | in StreamFile |
| 526 | 526 | * (bug 6304) Show timestamp for current revision in diff pages |
| 527 | 527 | * Vertically align current version with old version header in diff display |
| | 528 | +* (bug 6174) Remove redundant "emailforlost" message |
| 528 | 529 | |
| 529 | 530 | |
| 530 | 531 | == Compatibility == |
| Index: branches/liquidthreads/includes/LogPage.php |
| — | — | @@ -154,8 +154,6 @@ |
| 155 | 155 | } |
| 156 | 156 | break; |
| 157 | 157 | case 'rights': |
| 158 | | - if( trim( $params[0] ) == '' ) |
| 159 | | - $params[0] = wfMsg( 'rightsnone' ); |
| 160 | 158 | $text = $wgContLang->ucfirst( $title->getText() ); |
| 161 | 159 | $titleLink = $skin->makeLinkObj( Title::makeTitle( NS_USER, $text ) ); |
| 162 | 160 | break; |
| — | — | @@ -166,6 +164,17 @@ |
| 167 | 165 | } else { |
| 168 | 166 | $titleLink = $title->getPrefixedText(); |
| 169 | 167 | } |
| | 168 | + if( $key == 'rights/rights' ) { |
| | 169 | + if ($skin) { |
| | 170 | + $rightsnone = wfMsg( 'rightsnone' ); |
| | 171 | + } else { |
| | 172 | + $rightsnone = wfMsgForContent( 'rightsnone' ); |
| | 173 | + } |
| | 174 | + if( !isset( $params[0] ) || trim( $params[0] ) == '' ) |
| | 175 | + $params[0] = $rightsnone; |
| | 176 | + if( !isset( $params[1] ) || trim( $params[1] ) == '' ) |
| | 177 | + $params[1] = $rightsnone; |
| | 178 | + } |
| 170 | 179 | if( count( $params ) == 0 ) { |
| 171 | 180 | if ( $skin ) { |
| 172 | 181 | $rv = wfMsg( $wgLogActions[$key], $titleLink ); |
| Index: branches/liquidthreads/includes/Defines.php |
| — | — | @@ -164,5 +164,15 @@ |
| 165 | 165 | define( 'RC_MOVE_OVER_REDIRECT', 4); |
| 166 | 166 | /**#@-*/ |
| 167 | 167 | |
| | 168 | +/**#@+ |
| | 169 | + * Article edit flags |
| | 170 | + */ |
| | 171 | +define( 'EDIT_NEW', 1 ); |
| | 172 | +define( 'EDIT_UPDATE', 2 ); |
| | 173 | +define( 'EDIT_MINOR', 4 ); |
| | 174 | +define( 'EDIT_SUPPRESS_RC', 8 ); |
| | 175 | +define( 'EDIT_FORCE_BOT', 16 ); |
| | 176 | +define( 'EDIT_DEFER_UPDATES', 32 ); |
| | 177 | +/**#@-*/ |
| 168 | 178 | |
| 169 | 179 | ?> |
| Index: branches/liquidthreads/includes/Article.php |
| — | — | @@ -26,10 +26,8 @@ |
| 27 | 27 | var $mContent; //!< |
| 28 | 28 | var $mContentLoaded; //!< |
| 29 | 29 | var $mCounter; //!< |
| 30 | | - var $mFileCache; //!< |
| 31 | 30 | var $mForUpdate; //!< |
| 32 | 31 | var $mGoodAdjustment; //!< |
| 33 | | - var $mId; //!< |
| 34 | 32 | var $mLatest; //!< |
| 35 | 33 | var $mMinorEdit; //!< |
| 36 | 34 | var $mOldId; //!< |
| — | — | @@ -37,7 +35,6 @@ |
| 38 | 36 | var $mRedirectUrl; //!< |
| 39 | 37 | var $mRevIdFetched; //!< |
| 40 | 38 | var $mRevision; //!< |
| 41 | | - var $mTable; //!< |
| 42 | 39 | var $mTimestamp; //!< |
| 43 | 40 | var $mTitle; //!< |
| 44 | 41 | var $mTotalAdjustment; //!< |
| — | — | @@ -125,7 +122,7 @@ |
| 126 | 123 | $this->mCurID = $this->mUser = $this->mCounter = -1; # Not loaded |
| 127 | 124 | $this->mRedirectedFrom = null; # Title object if set |
| 128 | 125 | $this->mUserText = |
| 129 | | - $this->mTimestamp = $this->mComment = $this->mFileCache = ''; |
| | 126 | + $this->mTimestamp = $this->mComment = ''; |
| 130 | 127 | $this->mGoodAdjustment = $this->mTotalAdjustment = 0; |
| 131 | 128 | $this->mTouched = '19700101000000'; |
| 132 | 129 | $this->mForUpdate = false; |
| — | — | @@ -154,12 +151,11 @@ |
| 155 | 152 | $section = $wgRequest->getText( 'section' ); |
| 156 | 153 | $preload = $wgRequest->getText( 'preload' ); |
| 157 | 154 | |
| 158 | | - $fname = 'Article::getContent'; |
| 159 | | - wfProfileIn( $fname ); |
| | 155 | + wfProfileIn( __METHOD__ ); |
| 160 | 156 | |
| 161 | 157 | if ( 0 == $this->getID() ) { |
| 162 | 158 | if ( 'edit' == $action ) { |
| 163 | | - wfProfileOut( $fname ); |
| | 159 | + wfProfileOut( __METHOD__ ); |
| 164 | 160 | |
| 165 | 161 | # If requested, preload some text. |
| 166 | 162 | $text=$this->getPreloadedText($preload); |
| — | — | @@ -169,7 +165,7 @@ |
| 170 | 166 | # This is now shown above the edit box instead. |
| 171 | 167 | return $text; |
| 172 | 168 | } |
| 173 | | - wfProfileOut( $fname ); |
| | 169 | + wfProfileOut( __METHOD__ ); |
| 174 | 170 | $wgOut->setRobotpolicy( 'noindex,nofollow' ); |
| 175 | 171 | |
| 176 | 172 | if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { |
| — | — | @@ -184,7 +180,7 @@ |
| 185 | 181 | if($action=='edit') { |
| 186 | 182 | if($section!='') { |
| 187 | 183 | if($section=='new') { |
| 188 | | - wfProfileOut( $fname ); |
| | 184 | + wfProfileOut( __METHOD__ ); |
| 189 | 185 | $text=$this->getPreloadedText($preload); |
| 190 | 186 | return $text; |
| 191 | 187 | } |
| — | — | @@ -192,11 +188,11 @@ |
| 193 | 189 | # strip NOWIKI etc. to avoid confusion (true-parameter causes HTML |
| 194 | 190 | # comments to be stripped as well) |
| 195 | 191 | $rv=$this->getSection($this->mContent,$section); |
| 196 | | - wfProfileOut( $fname ); |
| | 192 | + wfProfileOut( __METHOD__ ); |
| 197 | 193 | return $rv; |
| 198 | 194 | } |
| 199 | 195 | } |
| 200 | | - wfProfileOut( $fname ); |
| | 196 | + wfProfileOut( __METHOD__ ); |
| 201 | 197 | return $this->mContent; |
| 202 | 198 | } |
| 203 | 199 | } |
| — | — | @@ -400,7 +396,6 @@ |
| 401 | 397 | } |
| 402 | 398 | |
| 403 | 399 | $dbr =& $this->getDB(); |
| 404 | | - $fname = 'Article::fetchContent'; |
| 405 | 400 | |
| 406 | 401 | # Pre-fill content with error message so that if something |
| 407 | 402 | # fails we'll have something telling us what we intended. |
| — | — | @@ -413,12 +408,12 @@ |
| 414 | 409 | if( $oldid ) { |
| 415 | 410 | $revision = Revision::newFromId( $oldid ); |
| 416 | 411 | if( is_null( $revision ) ) { |
| 417 | | - wfDebug( "$fname failed to retrieve specified revision, id $oldid\n" ); |
| | 412 | + wfDebug( __METHOD__." failed to retrieve specified revision, id $oldid\n" ); |
| 418 | 413 | return false; |
| 419 | 414 | } |
| 420 | 415 | $data = $this->pageDataFromId( $dbr, $revision->getPage() ); |
| 421 | 416 | if( !$data ) { |
| 422 | | - wfDebug( "$fname failed to get page data linked to revision id $oldid\n" ); |
| | 417 | + wfDebug( __METHOD__." failed to get page data linked to revision id $oldid\n" ); |
| 423 | 418 | return false; |
| 424 | 419 | } |
| 425 | 420 | $this->mTitle = Title::makeTitle( $data->page_namespace, $data->page_title ); |
| — | — | @@ -427,14 +422,14 @@ |
| 428 | 423 | if( !$this->mDataLoaded ) { |
| 429 | 424 | $data = $this->pageDataFromTitle( $dbr, $this->mTitle ); |
| 430 | 425 | if( !$data ) { |
| 431 | | - wfDebug( "$fname failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" ); |
| | 426 | + wfDebug( __METHOD__." failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" ); |
| 432 | 427 | return false; |
| 433 | 428 | } |
| 434 | 429 | $this->loadPageData( $data ); |
| 435 | 430 | } |
| 436 | 431 | $revision = Revision::newFromId( $this->mLatest ); |
| 437 | 432 | if( is_null( $revision ) ) { |
| 438 | | - wfDebug( "$fname failed to retrieve current page, rev_id {$data->page_latest}\n" ); |
| | 433 | + wfDebug( __METHOD__." failed to retrieve current page, rev_id {$data->page_latest}\n" ); |
| 439 | 434 | return false; |
| 440 | 435 | } |
| 441 | 436 | } |
| — | — | @@ -637,8 +632,6 @@ |
| 638 | 633 | * @param $offset Integer: default 0. |
| 639 | 634 | */ |
| 640 | 635 | function getContributors($limit = 0, $offset = 0) { |
| 641 | | - $fname = 'Article::getContributors'; |
| 642 | | - |
| 643 | 636 | # XXX: this is expensive; cache this info somewhere. |
| 644 | 637 | |
| 645 | 638 | $title = $this->mTitle; |
| — | — | @@ -661,7 +654,7 @@ |
| 662 | 655 | if ($limit > 0) { $sql .= ' LIMIT '.$limit; } |
| 663 | 656 | $sql .= ' '. $this->getSelectOptions(); |
| 664 | 657 | |
| 665 | | - $res = $dbr->query($sql, $fname); |
| | 658 | + $res = $dbr->query($sql, __METHOD__); |
| 666 | 659 | |
| 667 | 660 | while ( $line = $dbr->fetchObject( $res ) ) { |
| 668 | 661 | $contribs[] = array($line->rev_user, $line->rev_user_text, $line->user_real_name); |
| — | — | @@ -681,8 +674,7 @@ |
| 682 | 675 | global $wgUseTrackbacks, $wgNamespaceRobotPolicies; |
| 683 | 676 | $sk = $wgUser->getSkin(); |
| 684 | 677 | |
| 685 | | - $fname = 'Article::view'; |
| 686 | | - wfProfileIn( $fname ); |
| | 678 | + wfProfileIn( __METHOD__ ); |
| 687 | 679 | |
| 688 | 680 | $parserCache =& ParserCache::singleton(); |
| 689 | 681 | $ns = $this->mTitle->getNamespace(); # shortcut |
| — | — | @@ -693,7 +685,7 @@ |
| 694 | 686 | # getOldID may want us to redirect somewhere else |
| 695 | 687 | if ( $this->mRedirectUrl ) { |
| 696 | 688 | $wgOut->redirect( $this->mRedirectUrl ); |
| 697 | | - wfProfileOut( $fname ); |
| | 689 | + wfProfileOut( __METHOD__ ); |
| 698 | 690 | return; |
| 699 | 691 | } |
| 700 | 692 | |
| — | — | @@ -725,7 +717,7 @@ |
| 726 | 718 | # Run view updates for current revision only |
| 727 | 719 | $this->viewUpdates(); |
| 728 | 720 | } |
| 729 | | - wfProfileOut( $fname ); |
| | 721 | + wfProfileOut( __METHOD__ ); |
| 730 | 722 | return; |
| 731 | 723 | } |
| 732 | 724 | |
| — | — | @@ -733,13 +725,13 @@ |
| 734 | 726 | $wgOut->setETag($parserCache->getETag($this, $wgUser)); |
| 735 | 727 | |
| 736 | 728 | if( $wgOut->checkLastModified( $this->mTouched ) ){ |
| 737 | | - wfProfileOut( $fname ); |
| | 729 | + wfProfileOut( __METHOD__ ); |
| 738 | 730 | return; |
| 739 | 731 | } else if ( $this->tryFileCache() ) { |
| 740 | 732 | # tell wgOut that output is taken care of |
| 741 | 733 | $wgOut->disable(); |
| 742 | 734 | $this->viewUpdates(); |
| 743 | | - wfProfileOut( $fname ); |
| | 735 | + wfProfileOut( __METHOD__ ); |
| 744 | 736 | return; |
| 745 | 737 | } |
| 746 | 738 | } |
| — | — | @@ -904,7 +896,7 @@ |
| 905 | 897 | $this->addTrackbacks(); |
| 906 | 898 | |
| 907 | 899 | $this->viewUpdates(); |
| 908 | | - wfProfileOut( $fname ); |
| | 900 | + wfProfileOut( __METHOD__ ); |
| 909 | 901 | } |
| 910 | 902 | |
| 911 | 903 | function addTrackbacks() { |
| — | — | @@ -1027,8 +1019,7 @@ |
| 1028 | 1020 | * @private |
| 1029 | 1021 | */ |
| 1030 | 1022 | function insertOn( &$dbw, $restrictions = '' ) { |
| 1031 | | - $fname = 'Article::insertOn'; |
| 1032 | | - wfProfileIn( $fname ); |
| | 1023 | + wfProfileIn( __METHOD__ ); |
| 1033 | 1024 | |
| 1034 | 1025 | $page_id = $dbw->nextSequenceValue( 'page_page_id_seq' ); |
| 1035 | 1026 | $dbw->insert( 'page', array( |
| — | — | @@ -1043,12 +1034,12 @@ |
| 1044 | 1035 | 'page_touched' => $dbw->timestamp(), |
| 1045 | 1036 | 'page_latest' => 0, # Fill this in shortly... |
| 1046 | 1037 | 'page_len' => 0, # Fill this in shortly... |
| 1047 | | - ), $fname ); |
| | 1038 | + ), __METHOD__ ); |
| 1048 | 1039 | $newid = $dbw->insertId(); |
| 1049 | 1040 | |
| 1050 | 1041 | $this->mTitle->resetArticleId( $newid ); |
| 1051 | 1042 | |
| 1052 | | - wfProfileOut( $fname ); |
| | 1043 | + wfProfileOut( __METHOD__ ); |
| 1053 | 1044 | return $newid; |
| 1054 | 1045 | } |
| 1055 | 1046 | |
| — | — | @@ -1066,8 +1057,7 @@ |
| 1067 | 1058 | * @private |
| 1068 | 1059 | */ |
| 1069 | 1060 | function updateRevisionOn( &$dbw, $revision, $lastRevision = null ) { |
| 1070 | | - $fname = 'Article::updateToRevision'; |
| 1071 | | - wfProfileIn( $fname ); |
| | 1061 | + wfProfileIn( __METHOD__ ); |
| 1072 | 1062 | |
| 1073 | 1063 | $conditions = array( 'page_id' => $this->getId() ); |
| 1074 | 1064 | if( !is_null( $lastRevision ) ) { |
| — | — | @@ -1085,9 +1075,9 @@ |
| 1086 | 1076 | 'page_len' => strlen( $text ), |
| 1087 | 1077 | ), |
| 1088 | 1078 | $conditions, |
| 1089 | | - $fname ); |
| | 1079 | + __METHOD__ ); |
| 1090 | 1080 | |
| 1091 | | - wfProfileOut( $fname ); |
| | 1081 | + wfProfileOut( __METHOD__ ); |
| 1092 | 1082 | return ( $dbw->affectedRows() != 0 ); |
| 1093 | 1083 | } |
| 1094 | 1084 | |
| — | — | @@ -1099,8 +1089,7 @@ |
| 1100 | 1090 | * @param Revision $revision |
| 1101 | 1091 | */ |
| 1102 | 1092 | function updateIfNewerOn( &$dbw, $revision ) { |
| 1103 | | - $fname = 'Article::updateIfNewerOn'; |
| 1104 | | - wfProfileIn( $fname ); |
| | 1093 | + wfProfileIn( __METHOD__ ); |
| 1105 | 1094 | |
| 1106 | 1095 | $row = $dbw->selectRow( |
| 1107 | 1096 | array( 'revision', 'page' ), |
| — | — | @@ -1108,10 +1097,10 @@ |
| 1109 | 1098 | array( |
| 1110 | 1099 | 'page_id' => $this->getId(), |
| 1111 | 1100 | 'page_latest=rev_id' ), |
| 1112 | | - $fname ); |
| | 1101 | + __METHOD__ ); |
| 1113 | 1102 | if( $row ) { |
| 1114 | 1103 | if( wfTimestamp(TS_MW, $row->rev_timestamp) >= $revision->getTimestamp() ) { |
| 1115 | | - wfProfileOut( $fname ); |
| | 1104 | + wfProfileOut( __METHOD__ ); |
| 1116 | 1105 | return false; |
| 1117 | 1106 | } |
| 1118 | 1107 | $prev = $row->rev_id; |
| — | — | @@ -1121,115 +1110,15 @@ |
| 1122 | 1111 | } |
| 1123 | 1112 | |
| 1124 | 1113 | $ret = $this->updateRevisionOn( $dbw, $revision, $prev ); |
| 1125 | | - wfProfileOut( $fname ); |
| | 1114 | + wfProfileOut( __METHOD__ ); |
| 1126 | 1115 | return $ret; |
| 1127 | 1116 | } |
| 1128 | 1117 | |
| 1129 | 1118 | /** |
| 1130 | | - * Insert a new article into the database |
| 1131 | | - * @private |
| 1132 | | - */ |
| 1133 | | - function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) { |
| 1134 | | - global $wgUser; |
| 1135 | | - |
| 1136 | | - $fname = 'Article::insertNewArticle'; |
| 1137 | | - wfProfileIn( $fname ); |
| 1138 | | - |
| 1139 | | - if( !wfRunHooks( 'ArticleSave', array( &$this, &$wgUser, &$text, |
| 1140 | | - &$summary, &$isminor, &$watchthis, NULL ) ) ) { |
| 1141 | | - wfDebug( "$fname: ArticleSave hook aborted save!\n" ); |
| 1142 | | - wfProfileOut( $fname ); |
| 1143 | | - return false; |
| 1144 | | - } |
| 1145 | | - |
| 1146 | | - $ns = $this->mTitle->getNamespace(); |
| 1147 | | - $ttl = $this->mTitle->getDBkey(); |
| 1148 | | - |
| 1149 | | - # If this is a comment, add the summary as headline |
| 1150 | | - if($comment && $summary!="") { |
| 1151 | | - $text="== {$summary} ==\n\n".$text; |
| 1152 | | - } |
| 1153 | | - $text = $this->preSaveTransform( $text ); |
| 1154 | | - |
| 1155 | | - |
| 1156 | | - # Set statistics members |
| 1157 | | - # We work out if it's countable after PST to avoid counter drift |
| 1158 | | - # when articles are created with {{subst:}} |
| 1159 | | - $this->mGoodAdjustment = (int)$this->isCountable( $text ); |
| 1160 | | - $this->mTotalAdjustment = 1; |
| 1161 | | - |
| 1162 | | - /* Silently ignore minoredit if not allowed */ |
| 1163 | | - $isminor = $isminor && $wgUser->isAllowed('minoredit'); |
| 1164 | | - $now = wfTimestampNow(); |
| 1165 | | - |
| 1166 | | - $dbw =& wfGetDB( DB_MASTER ); |
| 1167 | | - |
| 1168 | | - # Add the page record; stake our claim on this title! |
| 1169 | | - $newid = $this->insertOn( $dbw ); |
| 1170 | | - |
| 1171 | | - # Save the revision text... |
| 1172 | | - $revision = new Revision( array( |
| 1173 | | - 'page' => $newid, |
| 1174 | | - 'comment' => $summary, |
| 1175 | | - 'minor_edit' => $isminor, |
| 1176 | | - 'text' => $text |
| 1177 | | - ) ); |
| 1178 | | - $revisionId = $revision->insertOn( $dbw ); |
| 1179 | | - |
| 1180 | | - $this->mTitle->resetArticleID( $newid ); |
| 1181 | | - |
| 1182 | | - # Update the page record with revision data |
| 1183 | | - $this->updateRevisionOn( $dbw, $revision, 0 ); |
| 1184 | | - |
| 1185 | | - if(!$suppressRC) { |
| 1186 | | - $rcid = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, 'default', |
| 1187 | | - '', strlen( $text ), $revisionId ); |
| 1188 | | - # Mark as patrolled if the user can and has the option set |
| 1189 | | - if( $wgUser->isAllowed( 'patrol' ) && $wgUser->getOption( 'autopatrol' ) ) { |
| 1190 | | - RecentChange::markPatrolled( $rcid ); |
| 1191 | | - } |
| 1192 | | - } |
| 1193 | | - |
| 1194 | | - if ($watchthis) { |
| 1195 | | - if(!$this->mTitle->userIsWatching()) $this->doWatch(); |
| 1196 | | - } else { |
| 1197 | | - if ( $this->mTitle->userIsWatching() ) { |
| 1198 | | - $this->doUnwatch(); |
| 1199 | | - } |
| 1200 | | - } |
| 1201 | | - |
| 1202 | | - # The talk page isn't in the regular link tables, so we need to update manually: |
| 1203 | | - $talkns = $ns ^ 1; # talk -> normal; normal -> talk |
| 1204 | | - $dbw->update( 'page', |
| 1205 | | - array( 'page_touched' => $dbw->timestamp($now) ), |
| 1206 | | - array( 'page_namespace' => $talkns, |
| 1207 | | - 'page_title' => $ttl ), |
| 1208 | | - $fname ); |
| 1209 | | - |
| 1210 | | - # Update links, etc. |
| 1211 | | - $this->editUpdates( $text, $summary, $isminor, $now, $revisionId ); |
| 1212 | | - |
| 1213 | | - # Clear caches |
| 1214 | | - Article::onArticleCreate( $this->mTitle ); |
| 1215 | | - |
| 1216 | | - # Output a redirect back to the article |
| 1217 | | - $this->doRedirect( $this->isRedirect( $text ) ); |
| 1218 | | - |
| 1219 | | - wfRunHooks( 'ArticleInsertComplete', array( &$this, &$wgUser, $text, |
| 1220 | | - $summary, $isminor, |
| 1221 | | - $watchthis, NULL ) ); |
| 1222 | | - wfRunHooks( 'ArticleSaveComplete', array( &$this, &$wgUser, $text, |
| 1223 | | - $summary, $isminor, |
| 1224 | | - $watchthis, NULL ) ); |
| 1225 | | - wfProfileOut( $fname ); |
| 1226 | | - } |
| 1227 | | - |
| 1228 | | - /** |
| 1229 | 1119 | * @return string Complete article text, or null if error |
| 1230 | 1120 | */ |
| 1231 | 1121 | function replaceSection($section, $text, $summary = '', $edittime = NULL) { |
| 1232 | | - $fname = 'Article::replaceSection'; |
| 1233 | | - wfProfileIn( $fname ); |
| | 1122 | + wfProfileIn( __METHOD__ ); |
| 1234 | 1123 | |
| 1235 | 1124 | if( $section == '' ) { |
| 1236 | 1125 | // Whole-page edit; let the text through unmolested. |
| — | — | @@ -1256,132 +1145,277 @@ |
| 1257 | 1146 | } |
| 1258 | 1147 | } |
| 1259 | 1148 | |
| 1260 | | - wfProfileOut( $fname ); |
| | 1149 | + wfProfileOut( __METHOD__ ); |
| 1261 | 1150 | return $text; |
| 1262 | 1151 | } |
| 1263 | 1152 | |
| 1264 | 1153 | /** |
| 1265 | | - * Change an existing article. Puts the previous version back into the old table, updates RC |
| 1266 | | - * and all necessary caches, mostly via the deferred update array. |
| 1267 | | - * |
| 1268 | | - * It is possible to call this function from a command-line script, but note that you should |
| 1269 | | - * first set $wgUser, and clean up $wgDeferredUpdates after each edit. |
| | 1154 | + * @deprecated use Article::doEdit() |
| 1270 | 1155 | */ |
| | 1156 | + function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) { |
| | 1157 | + $flags = EDIT_NEW | EDIT_DEFER_UPDATES | |
| | 1158 | + ( $isminor ? EDIT_MINOR : 0 ) | |
| | 1159 | + ( $suppressRC ? EDIT_SUPPRESS_RC : 0 ); |
| | 1160 | + |
| | 1161 | + # If this is a comment, add the summary as headline |
| | 1162 | + if ( $comment && $summary != "" ) { |
| | 1163 | + $text = "== {$summary} ==\n\n".$text; |
| | 1164 | + } |
| | 1165 | + |
| | 1166 | + $this->doEdit( $text, $summary, $flags ); |
| | 1167 | + |
| | 1168 | + $dbw =& wfGetDB( DB_MASTER ); |
| | 1169 | + if ($watchthis) { |
| | 1170 | + if (!$this->mTitle->userIsWatching()) { |
| | 1171 | + $dbw->begin(); |
| | 1172 | + $this->doWatch(); |
| | 1173 | + $dbw->commit(); |
| | 1174 | + } |
| | 1175 | + } else { |
| | 1176 | + if ( $this->mTitle->userIsWatching() ) { |
| | 1177 | + $dbw->begin(); |
| | 1178 | + $this->doUnwatch(); |
| | 1179 | + $dbw->commit(); |
| | 1180 | + } |
| | 1181 | + } |
| | 1182 | + $this->doRedirect( $this->isRedirect( $text ) ); |
| | 1183 | + } |
| | 1184 | + |
| | 1185 | + /** |
| | 1186 | + * @deprecated use Article::doEdit() |
| | 1187 | + */ |
| 1271 | 1188 | function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) { |
| 1272 | | - global $wgUser, $wgDBtransactions, $wgUseSquid; |
| 1273 | | - global $wgPostCommitUpdateList, $wgUseFileCache; |
| | 1189 | + $flags = EDIT_UPDATE | EDIT_DEFER_UPDATES | |
| | 1190 | + ( $minor ? EDIT_MINOR : 0 ) | |
| | 1191 | + ( $forceBot ? EDIT_FORCE_BOT : 0 ); |
| 1274 | 1192 | |
| 1275 | | - $fname = 'Article::updateArticle'; |
| 1276 | | - wfProfileIn( $fname ); |
| | 1193 | + $good = $this->doEdit( $text, $summary, $flags ); |
| | 1194 | + if ( $good ) { |
| | 1195 | + $dbw =& wfGetDB( DB_MASTER ); |
| | 1196 | + if ($watchthis) { |
| | 1197 | + if (!$this->mTitle->userIsWatching()) { |
| | 1198 | + $dbw->begin(); |
| | 1199 | + $this->doWatch(); |
| | 1200 | + $dbw->commit(); |
| | 1201 | + } |
| | 1202 | + } else { |
| | 1203 | + if ( $this->mTitle->userIsWatching() ) { |
| | 1204 | + $dbw->begin(); |
| | 1205 | + $this->doUnwatch(); |
| | 1206 | + $dbw->commit(); |
| | 1207 | + } |
| | 1208 | + } |
| | 1209 | + |
| | 1210 | + $this->doRedirect( $this->isRedirect( $text ), $sectionanchor ); |
| | 1211 | + } |
| | 1212 | + return $good; |
| | 1213 | + } |
| | 1214 | + |
| | 1215 | + /** |
| | 1216 | + * Article::doEdit() |
| | 1217 | + * |
| | 1218 | + * Change an existing article or create a new article. Updates RC and all necessary caches, |
| | 1219 | + * optionally via the deferred update array. |
| | 1220 | + * |
| | 1221 | + * $wgUser must be set before calling this function. |
| | 1222 | + * |
| | 1223 | + * @param string $text New text |
| | 1224 | + * @param string $summary Edit summary |
| | 1225 | + * @param integer $flags bitfield: |
| | 1226 | + * EDIT_NEW |
| | 1227 | + * Article is known or assumed to be non-existent, create a new one |
| | 1228 | + * EDIT_UPDATE |
| | 1229 | + * Article is known or assumed to be pre-existing, update it |
| | 1230 | + * EDIT_MINOR |
| | 1231 | + * Mark this edit minor, if the user is allowed to do so |
| | 1232 | + * EDIT_SUPPRESS_RC |
| | 1233 | + * Do not log the change in recentchanges |
| | 1234 | + * EDIT_FORCE_BOT |
| | 1235 | + * Mark the edit a "bot" edit regardless of user rights |
| | 1236 | + * EDIT_DEFER_UPDATES |
| | 1237 | + * Defer some of the updates until the end of index.php |
| | 1238 | + * |
| | 1239 | + * If neither EDIT_NEW nor EDIT_UPDATE is specified, the status of the article will be detected. |
| | 1240 | + * If EDIT_UPDATE is specified and the article doesn't exist, the function will return false. If |
| | 1241 | + * EDIT_NEW is specified and the article does exist, a duplicate key error will cause an exception |
| | 1242 | + * to be thrown from the Database. These two conditions are also possible with auto-detection due |
| | 1243 | + * to MediaWiki's performance-optimised locking strategy. |
| | 1244 | + * |
| | 1245 | + * @return bool success |
| | 1246 | + */ |
| | 1247 | + function doEdit( $text, $summary, $flags = 0 ) { |
| | 1248 | + global $wgUser, $wgDBtransactions; |
| | 1249 | + |
| | 1250 | + wfProfileIn( __METHOD__ ); |
| 1277 | 1251 | $good = true; |
| 1278 | 1252 | |
| | 1253 | + if ( !($flags & EDIT_NEW) && !($flags & EDIT_UPDATE) ) { |
| | 1254 | + $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE ); |
| | 1255 | + if ( $aid ) { |
| | 1256 | + $flags |= EDIT_UPDATE; |
| | 1257 | + } else { |
| | 1258 | + $flags |= EDIT_NEW; |
| | 1259 | + } |
| | 1260 | + } |
| | 1261 | + |
| 1279 | 1262 | if( !wfRunHooks( 'ArticleSave', array( &$this, &$wgUser, &$text, |
| 1280 | | - &$summary, &$minor, |
| 1281 | | - &$watchthis, &$sectionanchor ) ) ) { |
| 1282 | | - wfDebug( "$fname: ArticleSave hook aborted save!\n" ); |
| 1283 | | - wfProfileOut( $fname ); |
| | 1263 | + &$summary, $flags & EDIT_MINOR, |
| | 1264 | + null, null, &$flags ) ) ) |
| | 1265 | + { |
| | 1266 | + wfDebug( __METHOD__ . ": ArticleSave hook aborted save!\n" ); |
| | 1267 | + wfProfileOut( __METHOD__ ); |
| 1284 | 1268 | return false; |
| 1285 | 1269 | } |
| 1286 | 1270 | |
| 1287 | | - $isminor = $minor && $wgUser->isAllowed('minoredit'); |
| | 1271 | + # Silently ignore EDIT_MINOR if not allowed |
| | 1272 | + $isminor = ( $flags & EDIT_MINOR ) && $wgUser->isAllowed('minoredit'); |
| | 1273 | + $bot = $wgUser->isBot() || ( $flags & EDIT_FORCE_BOT ); |
| 1288 | 1274 | |
| 1289 | 1275 | $text = $this->preSaveTransform( $text ); |
| | 1276 | + |
| 1290 | 1277 | $dbw =& wfGetDB( DB_MASTER ); |
| 1291 | 1278 | $now = wfTimestampNow(); |
| | 1279 | + |
| | 1280 | + if ( $flags & EDIT_UPDATE ) { |
| | 1281 | + # Update article, but only if changed. |
| 1292 | 1282 | |
| 1293 | | - # Update article, but only if changed. |
| | 1283 | + # Make sure the revision is either completely inserted or not inserted at all |
| | 1284 | + if( !$wgDBtransactions ) { |
| | 1285 | + $userAbort = ignore_user_abort( true ); |
| | 1286 | + } |
| 1294 | 1287 | |
| 1295 | | - # It's important that we either rollback or complete, otherwise an attacker could |
| 1296 | | - # overwrite cur entries by sending precisely timed user aborts. Random bored users |
| 1297 | | - # could conceivably have the same effect, especially if cur is locked for long periods. |
| 1298 | | - if( !$wgDBtransactions ) { |
| 1299 | | - $userAbort = ignore_user_abort( true ); |
| 1300 | | - } |
| | 1288 | + $oldtext = $this->getContent(); |
| | 1289 | + $oldsize = strlen( $oldtext ); |
| | 1290 | + $newsize = strlen( $text ); |
| | 1291 | + $lastRevision = 0; |
| | 1292 | + $revisionId = 0; |
| 1301 | 1293 | |
| 1302 | | - $oldtext = $this->getContent(); |
| 1303 | | - $oldsize = strlen( $oldtext ); |
| 1304 | | - $newsize = strlen( $text ); |
| 1305 | | - $lastRevision = 0; |
| 1306 | | - $revisionId = 0; |
| | 1294 | + if ( 0 != strcmp( $text, $oldtext ) ) { |
| | 1295 | + $this->mGoodAdjustment = (int)$this->isCountable( $text ) |
| | 1296 | + - (int)$this->isCountable( $oldtext ); |
| | 1297 | + $this->mTotalAdjustment = 0; |
| 1307 | 1298 | |
| 1308 | | - if ( 0 != strcmp( $text, $oldtext ) ) { |
| 1309 | | - $this->mGoodAdjustment = (int)$this->isCountable( $text ) |
| 1310 | | - - (int)$this->isCountable( $oldtext ); |
| 1311 | | - $this->mTotalAdjustment = 0; |
| 1312 | | - $now = wfTimestampNow(); |
| | 1299 | + $lastRevision = $dbw->selectField( |
| | 1300 | + 'page', 'page_latest', array( 'page_id' => $this->getId() ) ); |
| 1313 | 1301 | |
| 1314 | | - $lastRevision = $dbw->selectField( |
| 1315 | | - 'page', 'page_latest', array( 'page_id' => $this->getId() ) ); |
| | 1302 | + if ( !$lastRevision ) { |
| | 1303 | + # Article gone missing |
| | 1304 | + wfDebug( __METHOD__.": EDIT_UPDATE specified but article doesn't exist\n" ); |
| | 1305 | + wfProfileOut( __METHOD__ ); |
| | 1306 | + return false; |
| | 1307 | + } |
| | 1308 | + |
| | 1309 | + $revision = new Revision( array( |
| | 1310 | + 'page' => $this->getId(), |
| | 1311 | + 'comment' => $summary, |
| | 1312 | + 'minor_edit' => $isminor, |
| | 1313 | + 'text' => $text |
| | 1314 | + ) ); |
| 1316 | 1315 | |
| | 1316 | + $dbw->begin(); |
| | 1317 | + $revisionId = $revision->insertOn( $dbw ); |
| | 1318 | + |
| | 1319 | + # Update page |
| | 1320 | + $ok = $this->updateRevisionOn( $dbw, $revision, $lastRevision ); |
| | 1321 | + |
| | 1322 | + if( !$ok ) { |
| | 1323 | + /* Belated edit conflict! Run away!! */ |
| | 1324 | + $good = false; |
| | 1325 | + $dbw->rollback(); |
| | 1326 | + } else { |
| | 1327 | + # Update recentchanges |
| | 1328 | + if( !( $flags & EDIT_SUPPRESS_RC ) ) { |
| | 1329 | + $rcid = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary, |
| | 1330 | + $lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize, |
| | 1331 | + $revisionId ); |
| | 1332 | + |
| | 1333 | + # Mark as patrolled if the user can do so and has it set in their options |
| | 1334 | + if( $wgUser->isAllowed( 'patrol' ) && $wgUser->getOption( 'autopatrol' ) ) { |
| | 1335 | + RecentChange::markPatrolled( $rcid ); |
| | 1336 | + } |
| | 1337 | + } |
| | 1338 | + $dbw->commit(); |
| | 1339 | + } |
| | 1340 | + } else { |
| | 1341 | + // Keep the same revision ID, but do some updates on it |
| | 1342 | + $revisionId = $this->getRevIdFetched(); |
| | 1343 | + // Update page_touched, this is usually implicit in the page update |
| | 1344 | + // Other cache updates are done in onArticleEdit() |
| | 1345 | + $this->mTitle->invalidateCache(); |
| | 1346 | + } |
| | 1347 | + |
| | 1348 | + if( !$wgDBtransactions ) { |
| | 1349 | + ignore_user_abort( $userAbort ); |
| | 1350 | + } |
| | 1351 | + |
| | 1352 | + if ( $good ) { |
| | 1353 | + # Invalidate cache of this article and all pages using this article |
| | 1354 | + # as a template. Partly deferred. |
| | 1355 | + Article::onArticleEdit( $this->mTitle ); |
| | 1356 | + |
| | 1357 | + # Update links tables, site stats, etc. |
| | 1358 | + $this->editUpdates( $text, $summary, $isminor, $now, $revisionId ); |
| | 1359 | + } |
| | 1360 | + } else { |
| | 1361 | + # Create new article |
| | 1362 | + |
| | 1363 | + # Set statistics members |
| | 1364 | + # We work out if it's countable after PST to avoid counter drift |
| | 1365 | + # when articles are created with {{subst:}} |
| | 1366 | + $this->mGoodAdjustment = (int)$this->isCountable( $text ); |
| | 1367 | + $this->mTotalAdjustment = 1; |
| | 1368 | + |
| | 1369 | + $dbw->begin(); |
| | 1370 | + |
| | 1371 | + # Add the page record; stake our claim on this title! |
| | 1372 | + # This will fail with a database query exception if the article already exists |
| | 1373 | + $newid = $this->insertOn( $dbw ); |
| | 1374 | + |
| | 1375 | + # Save the revision text... |
| 1317 | 1376 | $revision = new Revision( array( |
| 1318 | | - 'page' => $this->getId(), |
| | 1377 | + 'page' => $newid, |
| 1319 | 1378 | 'comment' => $summary, |
| 1320 | 1379 | 'minor_edit' => $isminor, |
| 1321 | 1380 | 'text' => $text |
| 1322 | 1381 | ) ); |
| 1323 | | - |
| 1324 | | - $dbw->begin(); |
| 1325 | 1382 | $revisionId = $revision->insertOn( $dbw ); |
| 1326 | 1383 | |
| 1327 | | - # Update page |
| 1328 | | - $ok = $this->updateRevisionOn( $dbw, $revision, $lastRevision ); |
| | 1384 | + $this->mTitle->resetArticleID( $newid ); |
| 1329 | 1385 | |
| 1330 | | - if( !$ok ) { |
| 1331 | | - /* Belated edit conflict! Run away!! */ |
| 1332 | | - $good = false; |
| 1333 | | - $dbw->rollback(); |
| 1334 | | - } else { |
| 1335 | | - # Update recentchanges |
| 1336 | | - $bot = (int)($wgUser->isBot() || $forceBot); |
| 1337 | | - $rcid = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary, |
| 1338 | | - $lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize, |
| 1339 | | - $revisionId ); |
| 1340 | | - |
| 1341 | | - # Mark as patrolled if the user can do so and has it set in their options |
| | 1386 | + # Update the page record with revision data |
| | 1387 | + $this->updateRevisionOn( $dbw, $revision, 0 ); |
| | 1388 | + |
| | 1389 | + if( !( $flags & EDIT_SUPPRESS_RC ) ) { |
| | 1390 | + $rcid = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, $bot, |
| | 1391 | + '', strlen( $text ), $revisionId ); |
| | 1392 | + # Mark as patrolled if the user can and has the option set |
| 1342 | 1393 | if( $wgUser->isAllowed( 'patrol' ) && $wgUser->getOption( 'autopatrol' ) ) { |
| 1343 | 1394 | RecentChange::markPatrolled( $rcid ); |
| 1344 | 1395 | } |
| 1345 | | - |
| 1346 | | - $dbw->commit(); |
| 1347 | 1396 | } |
| 1348 | | - } else { |
| 1349 | | - // Keep the same revision ID, but do some updates on it |
| 1350 | | - $revisionId = $this->getRevIdFetched(); |
| | 1397 | + $dbw->commit(); |
| | 1398 | + |
| | 1399 | + # Update links, etc. |
| | 1400 | + $this->editUpdates( $text, $summary, $isminor, $now, $revisionId ); |
| | 1401 | + |
| | 1402 | + # Clear caches |
| | 1403 | + Article::onArticleCreate( $this->mTitle ); |
| | 1404 | + |
| | 1405 | + wfRunHooks( 'ArticleInsertComplete', array( &$this, &$wgUser, $text, |
| | 1406 | + $summary, $flags & EDIT_MINOR, |
| | 1407 | + null, null, &$flags ) ); |
| 1351 | 1408 | } |
| 1352 | 1409 | |
| 1353 | | - if( !$wgDBtransactions ) { |
| 1354 | | - ignore_user_abort( $userAbort ); |
| | 1410 | + if ( $good && !( $flags & EDIT_DEFER_UPDATES ) ) { |
| | 1411 | + wfDoUpdates(); |
| 1355 | 1412 | } |
| 1356 | 1413 | |
| 1357 | | - if ( $good ) { |
| 1358 | | - # Invalidate cache of this article and all pages using this article |
| 1359 | | - # as a template. Partly deferred. |
| 1360 | | - Article::onArticleEdit( $this->mTitle ); |
| 1361 | | - |
| 1362 | | - if ($watchthis) { |
| 1363 | | - if (!$this->mTitle->userIsWatching()) { |
| 1364 | | - $dbw->begin(); |
| 1365 | | - $this->doWatch(); |
| 1366 | | - $dbw->commit(); |
| 1367 | | - } |
| 1368 | | - } else { |
| 1369 | | - if ( $this->mTitle->userIsWatching() ) { |
| 1370 | | - $dbw->begin(); |
| 1371 | | - $this->doUnwatch(); |
| 1372 | | - $dbw->commit(); |
| 1373 | | - } |
| 1374 | | - } |
| 1375 | | - # Update links tables, site stats, etc. |
| 1376 | | - $this->editUpdates( $text, $summary, $minor, $now, $revisionId ); |
| 1377 | | - |
| 1378 | | - # Output a redirect back to the article |
| 1379 | | - $this->doRedirect( $this->isRedirect( $text ), $sectionanchor ); |
| 1380 | | - } |
| 1381 | 1414 | wfRunHooks( 'ArticleSaveComplete', |
| 1382 | 1415 | array( &$this, &$wgUser, $text, |
| 1383 | | - $summary, $minor, |
| 1384 | | - $watchthis, $sectionanchor ) ); |
| 1385 | | - wfProfileOut( $fname ); |
| | 1416 | + $summary, $flags & EDIT_MINOR, |
| | 1417 | + null, null, &$flags ) ); |
| | 1418 | + |
| | 1419 | + wfProfileOut( __METHOD__ ); |
| 1386 | 1420 | return $good; |
| 1387 | 1421 | } |
| 1388 | 1422 | |
| — | — | @@ -1651,7 +1685,6 @@ |
| 1652 | 1686 | */ |
| 1653 | 1687 | function delete() { |
| 1654 | 1688 | global $wgUser, $wgOut, $wgRequest; |
| 1655 | | - $fname = 'Article::delete'; |
| 1656 | 1689 | $confirm = $wgRequest->wasPosted() && |
| 1657 | 1690 | $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ); |
| 1658 | 1691 | $reason = $wgRequest->getText( 'wpReason' ); |
| — | — | @@ -1679,7 +1712,7 @@ |
| 1680 | 1713 | # Better double-check that it hasn't been deleted yet! |
| 1681 | 1714 | $dbw =& wfGetDB( DB_MASTER ); |
| 1682 | 1715 | $conds = $this->mTitle->pageCond(); |
| 1683 | | - $latest = $dbw->selectField( 'page', 'page_latest', $conds, $fname ); |
| | 1716 | + $latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ ); |
| 1684 | 1717 | if ( $latest === false ) { |
| 1685 | 1718 | $wgOut->showFatalError( wfMsg( 'cannotdelete' ) ); |
| 1686 | 1719 | return; |
| — | — | @@ -1769,8 +1802,7 @@ |
| 1770 | 1803 | * @return array Array of authors, duplicates not removed |
| 1771 | 1804 | */ |
| 1772 | 1805 | function getLastNAuthors( $num, $revLatest = 0 ) { |
| 1773 | | - $fname = 'Article::getLastNAuthors'; |
| 1774 | | - wfProfileIn( $fname ); |
| | 1806 | + wfProfileIn( __METHOD__ ); |
| 1775 | 1807 | |
| 1776 | 1808 | // First try the slave |
| 1777 | 1809 | // If that doesn't have the latest revision, try the master |
| — | — | @@ -1783,13 +1815,13 @@ |
| 1784 | 1816 | 'page_namespace' => $this->mTitle->getNamespace(), |
| 1785 | 1817 | 'page_title' => $this->mTitle->getDBkey(), |
| 1786 | 1818 | 'rev_page = page_id' |
| 1787 | | - ), $fname, $this->getSelectOptions( array( |
| | 1819 | + ), __METHOD__, $this->getSelectOptions( array( |
| 1788 | 1820 | 'ORDER BY' => 'rev_timestamp DESC', |
| 1789 | 1821 | 'LIMIT' => $num |
| 1790 | 1822 | ) ) |
| 1791 | 1823 | ); |
| 1792 | 1824 | if ( !$res ) { |
| 1793 | | - wfProfileOut( $fname ); |
| | 1825 | + wfProfileOut( __METHOD__ ); |
| 1794 | 1826 | return array(); |
| 1795 | 1827 | } |
| 1796 | 1828 | $row = $db->fetchObject( $res ); |
| — | — | @@ -1805,7 +1837,7 @@ |
| 1806 | 1838 | while ( $row = $db->fetchObject( $res ) ) { |
| 1807 | 1839 | $authors[] = $row->rev_user_text; |
| 1808 | 1840 | } |
| 1809 | | - wfProfileOut( $fname ); |
| | 1841 | + wfProfileOut( __METHOD__ ); |
| 1810 | 1842 | return $authors; |
| 1811 | 1843 | } |
| 1812 | 1844 | |
| — | — | @@ -1858,8 +1890,7 @@ |
| 1859 | 1891 | */ |
| 1860 | 1892 | function doDelete( $reason ) { |
| 1861 | 1893 | global $wgOut, $wgUser; |
| 1862 | | - $fname = 'Article::doDelete'; |
| 1863 | | - wfDebug( $fname."\n" ); |
| | 1894 | + wfDebug( __METHOD__."\n" ); |
| 1864 | 1895 | |
| 1865 | 1896 | if (wfRunHooks('ArticleDelete', array(&$this, &$wgUser, &$reason))) { |
| 1866 | 1897 | if ( $this->doDeleteArticle( $reason ) ) { |
| — | — | @@ -1889,8 +1920,7 @@ |
| 1890 | 1921 | global $wgUseSquid, $wgDeferredUpdateList; |
| 1891 | 1922 | global $wgPostCommitUpdateList, $wgUseTrackbacks; |
| 1892 | 1923 | |
| 1893 | | - $fname = 'Article::doDeleteArticle'; |
| 1894 | | - wfDebug( $fname."\n" ); |
| | 1924 | + wfDebug( __METHOD__."\n" ); |
| 1895 | 1925 | |
| 1896 | 1926 | $dbw =& wfGetDB( DB_MASTER ); |
| 1897 | 1927 | $ns = $this->mTitle->getNamespace(); |
| — | — | @@ -1928,18 +1958,18 @@ |
| 1929 | 1959 | ), array( |
| 1930 | 1960 | 'page_id' => $id, |
| 1931 | 1961 | 'page_id = rev_page' |
| 1932 | | - ), $fname |
| | 1962 | + ), __METHOD__ |
| 1933 | 1963 | ); |
| 1934 | 1964 | |
| 1935 | 1965 | # Now that it's safely backed up, delete it |
| 1936 | | - $dbw->delete( 'revision', array( 'rev_page' => $id ), $fname ); |
| 1937 | | - $dbw->delete( 'page', array( 'page_id' => $id ), $fname); |
| | 1966 | + $dbw->delete( 'revision', array( 'rev_page' => $id ), __METHOD__ ); |
| | 1967 | + $dbw->delete( 'page', array( 'page_id' => $id ), __METHOD__); |
| 1938 | 1968 | |
| 1939 | 1969 | if ($wgUseTrackbacks) |
| 1940 | | - $dbw->delete( 'trackbacks', array( 'tb_page' => $id ), $fname ); |
| | 1970 | + $dbw->delete( 'trackbacks', array( 'tb_page' => $id ), __METHOD__ ); |
| 1941 | 1971 | |
| 1942 | 1972 | # Clean up recentchanges entries... |
| 1943 | | - $dbw->delete( 'recentchanges', array( 'rc_namespace' => $ns, 'rc_title' => $t ), $fname ); |
| | 1973 | + $dbw->delete( 'recentchanges', array( 'rc_namespace' => $ns, 'rc_title' => $t ), __METHOD__ ); |
| 1944 | 1974 | |
| 1945 | 1975 | # Finally, clean up the link tables |
| 1946 | 1976 | $t = $this->mTitle->getPrefixedDBkey(); |
| — | — | @@ -1970,7 +2000,6 @@ |
| 1971 | 2001 | */ |
| 1972 | 2002 | function rollback() { |
| 1973 | 2003 | global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol; |
| 1974 | | - $fname = 'Article::rollback'; |
| 1975 | 2004 | |
| 1976 | 2005 | if( $wgUser->isAllowed( 'rollback' ) ) { |
| 1977 | 2006 | if( $wgUser->isBlocked() ) { |
| — | — | @@ -2033,7 +2062,7 @@ |
| 2034 | 2063 | array( |
| 2035 | 2064 | 'rev_page' => $current->getPage(), |
| 2036 | 2065 | "rev_user <> {$user} OR rev_user_text <> {$user_text}" |
| 2037 | | - ), $fname, |
| | 2066 | + ), __METHOD__, |
| 2038 | 2067 | array( |
| 2039 | 2068 | 'USE INDEX' => 'page_timestamp', |
| 2040 | 2069 | 'ORDER BY' => 'rev_timestamp DESC' ) |
| — | — | @@ -2061,7 +2090,7 @@ |
| 2062 | 2091 | 'rc_cur_id' => $current->getPage(), |
| 2063 | 2092 | 'rc_user_text' => $current->getUserText(), |
| 2064 | 2093 | "rc_timestamp > '{$s->rev_timestamp}'", |
| 2065 | | - ), $fname |
| | 2094 | + ), __METHOD__ |
| 2066 | 2095 | ); |
| 2067 | 2096 | } |
| 2068 | 2097 | |
| — | — | @@ -2113,8 +2142,7 @@ |
| 2114 | 2143 | function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid) { |
| 2115 | 2144 | global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgParser; |
| 2116 | 2145 | |
| 2117 | | - $fname = 'Article::editUpdates'; |
| 2118 | | - wfProfileIn( $fname ); |
| | 2146 | + wfProfileIn( __METHOD__ ); |
| 2119 | 2147 | |
| 2120 | 2148 | # Parse the text |
| 2121 | 2149 | $options = new ParserOptions; |
| — | — | @@ -2148,7 +2176,7 @@ |
| 2149 | 2177 | $shortTitle = $this->mTitle->getDBkey(); |
| 2150 | 2178 | |
| 2151 | 2179 | if ( 0 == $id ) { |
| 2152 | | - wfProfileOut( $fname ); |
| | 2180 | + wfProfileOut( __METHOD__ ); |
| 2153 | 2181 | return; |
| 2154 | 2182 | } |
| 2155 | 2183 | |
| — | — | @@ -2177,7 +2205,7 @@ |
| 2178 | 2206 | $wgMessageCache->replace( $shortTitle, $text ); |
| 2179 | 2207 | } |
| 2180 | 2208 | |
| 2181 | | - wfProfileOut( $fname ); |
| | 2209 | + wfProfileOut( __METHOD__ ); |
| 2182 | 2210 | } |
| 2183 | 2211 | |
| 2184 | 2212 | /** |
| — | — | @@ -2277,7 +2305,6 @@ |
| 2278 | 2306 | * |
| 2279 | 2307 | */ |
| 2280 | 2308 | function checkTouched() { |
| 2281 | | - $fname = 'Article::checkTouched'; |
| 2282 | 2309 | if( !$this->mDataLoaded ) { |
| 2283 | 2310 | $this->loadPageData(); |
| 2284 | 2311 | } |
| — | — | @@ -2315,8 +2342,7 @@ |
| 2316 | 2343 | * @param bool $minor whereas it's a minor modification |
| 2317 | 2344 | */ |
| 2318 | 2345 | function quickEdit( $text, $comment = '', $minor = 0 ) { |
| 2319 | | - $fname = 'Article::quickEdit'; |
| 2320 | | - wfProfileIn( $fname ); |
| | 2346 | + wfProfileIn( __METHOD__ ); |
| 2321 | 2347 | |
| 2322 | 2348 | $dbw =& wfGetDB( DB_MASTER ); |
| 2323 | 2349 | $dbw->begin(); |
| — | — | @@ -2331,7 +2357,7 @@ |
| 2332 | 2358 | $this->updateRevisionOn( $dbw, $revision ); |
| 2333 | 2359 | $dbw->commit(); |
| 2334 | 2360 | |
| 2335 | | - wfProfileOut( $fname ); |
| | 2361 | + wfProfileOut( __METHOD__ ); |
| 2336 | 2362 | } |
| 2337 | 2363 | |
| 2338 | 2364 | /** |
| — | — | @@ -2405,6 +2431,15 @@ |
| 2406 | 2432 | */ |
| 2407 | 2433 | |
| 2408 | 2434 | static function onArticleCreate($title) { |
| | 2435 | + # The talk page isn't in the regular link tables, so we need to update manually: |
| | 2436 | + if ( $title->isTalkPage() ) { |
| | 2437 | + $other = $title->getSubjectPage(); |
| | 2438 | + } else { |
| | 2439 | + $other = $title->getTalkPage(); |
| | 2440 | + } |
| | 2441 | + $other->invalidateCache(); |
| | 2442 | + $other->purgeSquid(); |
| | 2443 | + |
| 2409 | 2444 | $title->touchLinks(); |
| 2410 | 2445 | $title->purgeSquid(); |
| 2411 | 2446 | } |
| — | — | @@ -2458,7 +2493,6 @@ |
| 2459 | 2494 | */ |
| 2460 | 2495 | function info() { |
| 2461 | 2496 | global $wgLang, $wgOut, $wgAllowPageInfo, $wgUser; |
| 2462 | | - $fname = 'Article::info'; |
| 2463 | 2497 | |
| 2464 | 2498 | if ( !$wgAllowPageInfo ) { |
| 2465 | 2499 | $wgOut->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); |
| — | — | @@ -2487,7 +2521,7 @@ |
| 2488 | 2522 | 'watchlist', |
| 2489 | 2523 | 'COUNT(*)', |
| 2490 | 2524 | $wl_clause, |
| 2491 | | - $fname, |
| | 2525 | + __METHOD__, |
| 2492 | 2526 | $this->getSelectOptions() ); |
| 2493 | 2527 | |
| 2494 | 2528 | $pageInfo = $this->pageCountInfo( $page ); |
| — | — | @@ -2524,20 +2558,19 @@ |
| 2525 | 2559 | $dbr =& wfGetDB( DB_SLAVE ); |
| 2526 | 2560 | |
| 2527 | 2561 | $rev_clause = array( 'rev_page' => $id ); |
| 2528 | | - $fname = 'Article::pageCountInfo'; |
| 2529 | 2562 | |
| 2530 | 2563 | $edits = $dbr->selectField( |
| 2531 | 2564 | 'revision', |
| 2532 | 2565 | 'COUNT(rev_page)', |
| 2533 | 2566 | $rev_clause, |
| 2534 | | - $fname, |
| | 2567 | + __METHOD__, |
| 2535 | 2568 | $this->getSelectOptions() ); |
| 2536 | 2569 | |
| 2537 | 2570 | $authors = $dbr->selectField( |
| 2538 | 2571 | 'revision', |
| 2539 | 2572 | 'COUNT(DISTINCT rev_user_text)', |
| 2540 | 2573 | $rev_clause, |
| 2541 | | - $fname, |
| | 2574 | + __METHOD__, |
| 2542 | 2575 | $this->getSelectOptions() ); |
| 2543 | 2576 | |
| 2544 | 2577 | return array( 'edits' => $edits, 'authors' => $authors ); |
| Index: branches/liquidthreads/includes/RecentChange.php |
| — | — | @@ -200,7 +200,7 @@ |
| 201 | 201 | $oldId, $lastTimestamp, $bot = "default", $ip = '', $oldSize = 0, $newSize = 0, |
| 202 | 202 | $newId = 0) |
| 203 | 203 | { |
| 204 | | - if ( $bot == 'default ' ) { |
| | 204 | + if ( $bot == 'default' ) { |
| 205 | 205 | $bot = $user->isBot(); |
| 206 | 206 | } |
| 207 | 207 | |
| Index: branches/liquidthreads/includes/templates/Userlogin.php |
| — | — | @@ -186,9 +186,18 @@ |
| 187 | 187 | </table> |
| 188 | 188 | <?php |
| 189 | 189 | |
| 190 | | - if( $this->data['useemail'] ) { |
| 191 | | - echo '<div id="login-emailforlost">'; |
| 192 | | - $this->msgHtml( 'emailforlost' ); |
| | 190 | + if ($this->data['userealname'] || $this->data['useemail']) { |
| | 191 | + echo '<div id="login-sectiontip">'; |
| | 192 | + if ( $this->data['useemail'] ) { |
| | 193 | + echo '<div>'; |
| | 194 | + $this->msg('prefs-help-email'); |
| | 195 | + echo '</div>'; |
| | 196 | + } |
| | 197 | + if ( $this->data['userealname'] ) { |
| | 198 | + echo '<div>'; |
| | 199 | + $this->msg('prefs-help-realname'); |
| | 200 | + echo '</div>'; |
| | 201 | + } |
| 193 | 202 | echo '</div>'; |
| 194 | 203 | } |
| 195 | 204 | |
| Index: branches/liquidthreads/includes/DefaultSettings.php |
| — | — | @@ -1811,13 +1811,7 @@ |
| 1812 | 1812 | 'block/unblock' => 'unblocklogentry', |
| 1813 | 1813 | 'protect/protect' => 'protectedarticle', |
| 1814 | 1814 | 'protect/unprotect' => 'unprotectedarticle', |
| 1815 | | - |
| 1816 | | - // TODO: This whole section should be moved to extensions/Makesysop/SpecialMakesysop.php |
| 1817 | 1815 | 'rights/rights' => 'rightslogentry', |
| 1818 | | - 'rights/addgroup' => 'addgrouplogentry', |
| 1819 | | - 'rights/rngroup' => 'renamegrouplogentry', |
| 1820 | | - 'rights/chgroup' => 'changegrouplogentry', |
| 1821 | | - |
| 1822 | 1816 | 'delete/delete' => 'deletedarticle', |
| 1823 | 1817 | 'delete/restore' => 'undeletedarticle', |
| 1824 | 1818 | 'delete/revision' => 'revdelete-logentry', |