Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/language/lang_russian/email admin_activate.tpl,1.2,1.3 admin_send_email.tpl,1.1,1.2 admin_welcome_activated.tpl,1.2,1.3 admin_welcome_inactive.tpl,1.2,1.3 coppa_welcome_inactive.tpl,1.2,1.3 group_added.tpl,1.2,1.3 group_approved.tpl,1.2,1.3 group_request.tpl,1.2,1.3 privmsg_notify.tpl,1.2,1.3 profile_send_email.tpl,1.2,1.3 topic_notify.tpl,1.2,1.3 user_activate.tpl,1.2,1.3 user_activate_passwd.tpl,1.2,1.3 user_welcome.tpl,1.2,1.3 user_welcome_inactive.tpl,1.2,1.3
Update of /cvsroot/phpbb/phpBB2/language/lang_russian/email
In directory usw-pr-cvs1:/tmp/cvs-serv23080/language/lang_russian/email
Modified Files:
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
Ok, this includes fixes for bugs numbered 526000, 524591, 520370, and 520872. Manily, a few typos were fixed, along with a problem in the jumpbox (fixed using a quick Javascript check, there really isn't another way without modifying some large portions of code), and a problem in the rank control panel. In other words, everything assigned to me (as of this morning) has been fixed. I also ran the lovely fix_files.sh, so CVS might be a little wacky and try to update everything. I hope not...
That's it for now!
dougk_ff7
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_activate.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- admin_activate.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,9 ****
! Subject: Íîâûé ïîëüçîâàòåëü
!
! Çäðàâñòâóéòå,
!
! Ó÷¸òíàÿ çàïèñü "{USERNAME}" áûëà îòêëþ÷åíà èëè òîëüêî ÷òî ñîçäàíà, âû äîëæíû ïðîâåðèòü èíôîðìàöèþ î ïîëüçîâàòåëå è àêòèâèçèðîâàòü å¸ ïåðåéäÿ ïî ýòîé ññûëêå:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,9 ----
! Subject: Íîâûé ïîëüçîâàòåëü
!
! Çäðàâñòâóéòå,
!
! Ó÷¸òíàÿ çàïèñü "{USERNAME}" áûëà îòêëþ÷åíà èëè òîëüêî ÷òî ñîçäàíà, âû äîëæíû ïðîâåðèòü èíôîðìàöèþ î ïîëüçîâàòåëå è àêòèâèçèðîâàòü å¸ ïåðåéäÿ ïî ýòîé ññûëêå:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** admin_send_email.tpl 8 Jan 2002 14:31:32 -0000 1.1
--- admin_send_email.tpl 10 Mar 2002 03:23:56 -0000 1.2
***************
*** 1,10 ****
! Ýòî e-mail ñîîáùåíèå ïîñëàíî âàì àäìèíèñòðàòîðîì ñàéòà "{SITENAME}". Åñëè ýòî ñîîáùåíèå ÿâëÿåòñÿ ñïàìîì, ñîäåðæèò îñêîðáëåíèÿ èëè ïðî÷èå íåïðèÿòíûå âàì êîììåíòàðèè, ïîæàëóéñòà ñâÿæèòåñü ñ âåáìàñòåðîì ïî àäðåñó:
!
! {BOARD_EMAIL}
!
! Âêëþ÷èòå äàííîå ñîîáùåíèå öåëèêîì (îñîáåííî çàãîëîâêè).
!
! Ïîñëàííîå âàì ñîîáùåíèå:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
--- 1,10 ----
! Ýòî e-mail ñîîáùåíèå ïîñëàíî âàì àäìèíèñòðàòîðîì ñàéòà "{SITENAME}". Åñëè ýòî ñîîáùåíèå ÿâëÿåòñÿ ñïàìîì, ñîäåðæèò îñêîðáëåíèÿ èëè ïðî÷èå íåïðèÿòíûå âàì êîììåíòàðèè, ïîæàëóéñòà ñâÿæèòåñü ñ âåáìàñòåðîì ïî àäðåñó:
!
! {BOARD_EMAIL}
!
! Âêëþ÷èòå äàííîå ñîîáùåíèå öåëèêîì (îñîáåííî çàãîëîâêè).
!
! Ïîñëàííîå âàì ñîîáùåíèå:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- admin_welcome_activated.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,7 ****
! Subject: Ó÷¸òíàÿ çàïèñü àêòèâèçèðîâàíà
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàøà ó÷¸òíàÿ çàïèñü íà ñàéòå "{SITENAME}" áûëà àêòèâèçèðîâàíà, òåïåðü âû ìîæåòå âõîäèòü â ñèñòåìó èñïîëüçóÿ èìÿ è ïàðîëü, ïðèñëàííûå âàì â ïðåäûäóùåì ïèñüìå.
!
{EMAIL_SIG}
--- 1,7 ----
! Subject: Ó÷¸òíàÿ çàïèñü àêòèâèçèðîâàíà
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàøà ó÷¸òíàÿ çàïèñü íà ñàéòå "{SITENAME}" áûëà àêòèâèçèðîâàíà, òåïåðü âû ìîæåòå âõîäèòü â ñèñòåìó èñïîëüçóÿ èìÿ è ïàðîëü, ïðèñëàííûå âàì â ïðåäûäóùåì ïèñüìå.
!
{EMAIL_SIG}
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- admin_welcome_inactive.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,18 ****
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Âàøà ó÷¸òíàÿ çàïèñü ïîêà íå àêòèâíà, å¸ äîëæåí àêòèâèçèðîâàòü àäìèíèñòðàòîð ôîðóìîâ. Êàê òîëüêî ýòî ïðîèçîéä¸ò, âàì áóäåò ïðèñëàíî ïèñüìî.
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
--- 1,18 ----
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Âàøà ó÷¸òíàÿ çàïèñü ïîêà íå àêòèâíà, å¸ äîëæåí àêòèâèçèðîâàòü àäìèíèñòðàòîð ôîðóìîâ. Êàê òîëüêî ýòî ïðîèçîéä¸ò, âàì áóäåò ïðèñëàíî ïèñüìî.
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- coppa_welcome_inactive.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,52 ****
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
!  ñîîòâåòñòâèè ñ çàêîíîì 'COPPA' âàøà ó÷¸òíàÿ çàïèñü íå áûëà àêòèâèçèðîâàíà.
!
! Ïîæàëóéñòà ðàñïå÷àòàéòå ýòî ñîîáùåíèå è ïîïðîñèòå âàøåãî ðîäèòåëÿ èëè îïåêóíà ïîäïèñàòü åãî è ïîñòàâèòü äàòó. Çàòåì îòïðàâüòå åãî ïî ôàêñó:
!
! {FAX_INFO}
!
! Èëè ïî ïî÷òå:
!
! {MAIL_INFO}
!
! ------------------------------ CUT HERE ------------------------------
! Permission to Participate at {SITENAME}
!
! Username: {USERNAME}
! Password: {PASSWORD}
! Email: {EMAIL_ADDRESS}
!
! ICQ Number: {ICQ}
! AIM Address: {AIM}
! MSN Messenger: {MSN}
! Yahoo Messenger: {YIM}
! Web Site: {WEB_SITE}
! From: {FROM}
! Occupation: {OCC}
! Interests: {INTERESTS}
!
! I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION.
! I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD.
! I UNDERSTAND THAT MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME.
!
!
! Parent or Guardian
! (print your name here): _____________________
!
! (sign here): __________________
!
! Date: _______________
!
! ------------------------------ CUT HERE ------------------------------
!
!
! Êàê òîëüêî àäìèíèñòðàòîð ïîëó÷èò ýòó ôîðìó ïî ôàêñó èëè ïî ïî÷òå, âàøà ó÷¸òíàÿ çàïèñü áóäåò àêòèâèçèðîâàíà.
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
--- 1,52 ----
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
!  ñîîòâåòñòâèè ñ çàêîíîì 'COPPA' âàøà ó÷¸òíàÿ çàïèñü íå áûëà àêòèâèçèðîâàíà.
!
! Ïîæàëóéñòà ðàñïå÷àòàéòå ýòî ñîîáùåíèå è ïîïðîñèòå âàøåãî ðîäèòåëÿ èëè îïåêóíà ïîäïèñàòü åãî è ïîñòàâèòü äàòó. Çàòåì îòïðàâüòå åãî ïî ôàêñó:
!
! {FAX_INFO}
!
! Èëè ïî ïî÷òå:
!
! {MAIL_INFO}
!
! ------------------------------ CUT HERE ------------------------------
! Permission to Participate at {SITENAME}
!
! Username: {USERNAME}
! Password: {PASSWORD}
! Email: {EMAIL_ADDRESS}
!
! ICQ Number: {ICQ}
! AIM Address: {AIM}
! MSN Messenger: {MSN}
! Yahoo Messenger: {YIM}
! Web Site: {WEB_SITE}
! From: {FROM}
! Occupation: {OCC}
! Interests: {INTERESTS}
!
! I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION.
! I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD.
! I UNDERSTAND THAT MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME.
!
!
! Parent or Guardian
! (print your name here): _____________________
!
! (sign here): __________________
!
! Date: _______________
!
! ------------------------------ CUT HERE ------------------------------
!
!
! Êàê òîëüêî àäìèíèñòðàòîð ïîëó÷èò ýòó ôîðìó ïî ôàêñó èëè ïî ïî÷òå, âàøà ó÷¸òíàÿ çàïèñü áóäåò àêòèâèçèðîâàíà.
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** group_added.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- group_added.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,11 ****
! Subject: Âû áûëè âêëþ÷åíû â ãðóïïó
!
! Ïîçäðàâëÿåì!
!
! Âû áûëè ïðèíÿòû â ãðóïïó "{GROUP_NAME}" íà ñàéòå {SITENAME}.
! Ýòî áûëî ïðîäåëàíî ìîäåðàòîðîì ãðóïïû èëè àäìèíèñòðàòîðîì ñàéòà, îáðàòèòåñü ê íèì çà äîïîëíèòåëüíîé èíôîðìàöèåé.
!
! Ïåðåéäèòå ïî ññûëêå, ÷òîáû óâèäåòü èíôîðìàöèþ î âàøåì ÷ëåíñòâå â ãðóïïàõ:
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Subject: Âû áûëè âêëþ÷åíû â ãðóïïó
!
! Ïîçäðàâëÿåì!
!
! Âû áûëè ïðèíÿòû â ãðóïïó "{GROUP_NAME}" íà ñàéòå {SITENAME}.
! Ýòî áûëî ïðîäåëàíî ìîäåðàòîðîì ãðóïïû èëè àäìèíèñòðàòîðîì ñàéòà, îáðàòèòåñü ê íèì çà äîïîëíèòåëüíîé èíôîðìàöèåé.
!
! Ïåðåéäèòå ïî ññûëêå, ÷òîáû óâèäåòü èíôîðìàöèþ î âàøåì ÷ëåíñòâå â ãðóïïàõ:
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** group_approved.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- group_approved.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,10 ****
! Subject: Âàøà ïðîñüáà áûëà óäîâëåòâîðåíà.
!
! Ïîçäðàâëÿåì!
!
! Âàøà ïðîñüáà î âñòóïëåíèè â ãðóïïó "{GROUP_NAME}" íà ñàéòå {SITENAME} áûëà óäîâëåòâîðåíà.
! Ïåðåéäèòå ïî ññûëêå, ÷òîáû óâèäåòü èíôîðìàöèþ î âàøåì ÷ëåíñòâå â ãðóïïàõ:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,10 ----
! Subject: Âàøà ïðîñüáà áûëà óäîâëåòâîðåíà.
!
! Ïîçäðàâëÿåì!
!
! Âàøà ïðîñüáà î âñòóïëåíèè â ãðóïïó "{GROUP_NAME}" íà ñàéòå {SITENAME} áûëà óäîâëåòâîðåíà.
! Ïåðåéäèòå ïî ññûëêå, ÷òîáû óâèäåòü èíôîðìàöèþ î âàøåì ÷ëåíñòâå â ãðóïïàõ:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** group_request.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- group_request.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,10 ****
! Subject: Áûëî ïîäàíà ïðîñüáà î âñòóïëåíèè â ãðóïïó.
!
! Óâàæàåìûé(àÿ) {GROUP_MODERATOR}!
!
! Ïîëüçîâàòåëü ïîïðîñèë î âñòóïëåíèè â ãðóïïó (íà ñàéòå {SITENAME}), ìîäåðàòîðîì êîòîðîé âû ÿâëÿåòåñü.
! ×òîáû óäîâëåòâîðèòü èëè îòêëîíèòü ýòó ïðîñüáó ïåðåéäèòå ïî ñëåäóþùåé ññûëêå:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,10 ----
! Subject: Áûëî ïîäàíà ïðîñüáà î âñòóïëåíèè â ãðóïïó.
!
! Óâàæàåìûé(àÿ) {GROUP_MODERATOR}!
!
! Ïîëüçîâàòåëü ïîïðîñèë î âñòóïëåíèè â ãðóïïó (íà ñàéòå {SITENAME}), ìîäåðàòîðîì êîòîðîé âû ÿâëÿåòåñü.
! ×òîáû óäîâëåòâîðèòü èëè îòêëîíèòü ýòó ïðîñüáó ïåðåéäèòå ïî ñëåäóþùåé ññûëêå:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** privmsg_notify.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- privmsg_notify.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,11 ****
! Subject: Âàì ïðèøëî íîâîå ëè÷íîå ñîîáùåíèå
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàì áûëî íàïðàâëåíî ëè÷íîå ñîîáùåíèå íà ñàéòå {SITENAME}, à âû ïðîñèëè óâåäîìëÿòü âàñ îá ýòîì. Âû ìîæåòå ïîñìîòðåòü ýòî ñîîáùåíèå ïåðåéäÿ ïî ñëåäóþùåé ññûëêå:
!
! {U_INBOX}
!
! Ïîìíèòå, âû ìîæåòå îòêàçàòüñÿ îò ïîëó÷åíèÿ ïîäîáíûõ óâåäîìëåíèé, åñëè èçìåíèòå íàñòðîéêè â ñâî¸ì ïðîôèëå.
!
{EMAIL_SIG}
--- 1,11 ----
! Subject: Âàì ïðèøëî íîâîå ëè÷íîå ñîîáùåíèå
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàì áûëî íàïðàâëåíî ëè÷íîå ñîîáùåíèå íà ñàéòå {SITENAME}, à âû ïðîñèëè óâåäîìëÿòü âàñ îá ýòîì. Âû ìîæåòå ïîñìîòðåòü ýòî ñîîáùåíèå ïåðåéäÿ ïî ñëåäóþùåé ññûëêå:
!
! {U_INBOX}
!
! Ïîìíèòå, âû ìîæåòå îòêàçàòüñÿ îò ïîëó÷åíèÿ ïîäîáíûõ óâåäîìëåíèé, åñëè èçìåíèòå íàñòðîéêè â ñâî¸ì ïðîôèëå.
!
{EMAIL_SIG}
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/profile_send_email.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** profile_send_email.tpl 3 Feb 2002 18:39:35 -0000 1.2
--- profile_send_email.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,12 ****
! Çäðàâñòâóéòå, {TO_USERNAME}!
!
! Íèæå ñëåäóåò e-mail, ïîñëàííûé âàì ïîëüçîâàòåëåì {FROM_USERNAME} ÷åðåç âàøó ðåãèñòðàöèþ íà ñàéòå {SITENAME}. Åñëè ýòî ñîîáùåíèå ÿâëÿåòñÿ ñïàìîì, ñîäåðæèò îñêîðáëåíèÿ èëè ïðî÷èå íåïðèÿòíûå âàì êîììåíòàðèè, ïîæàëóéñòà ñâÿæèòåñü ñ âåáìàñòåðîì ïî àäðåñó:
!
! {BOARD_EMAIL}
!
! Âêëþ÷èòå äàííîå ñîîáùåíèå öåëèêîì (îñîáåííî çàãîëîâêè). Ïîæàëóéñòà ó÷òèòå, ÷òî àäðåñ îòâåòà â ýòîì ñîîáùåíèè ÿâëÿåòñÿ àäðåñîì {FROM_USERNAME}.
!
! Ïîñëàííîå âàì ñîîáùåíèå:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
{MESSAGE}
--- 1,12 ----
! Çäðàâñòâóéòå, {TO_USERNAME}!
!
! Íèæå ñëåäóåò e-mail, ïîñëàííûé âàì ïîëüçîâàòåëåì {FROM_USERNAME} ÷åðåç âàøó ðåãèñòðàöèþ íà ñàéòå {SITENAME}. Åñëè ýòî ñîîáùåíèå ÿâëÿåòñÿ ñïàìîì, ñîäåðæèò îñêîðáëåíèÿ èëè ïðî÷èå íåïðèÿòíûå âàì êîììåíòàðèè, ïîæàëóéñòà ñâÿæèòåñü ñ âåáìàñòåðîì ïî àäðåñó:
!
! {BOARD_EMAIL}
!
! Âêëþ÷èòå äàííîå ñîîáùåíèå öåëèêîì (îñîáåííî çàãîëîâêè). Ïîæàëóéñòà ó÷òèòå, ÷òî àäðåñ îòâåòà â ýòîì ñîîáùåíèè ÿâëÿåòñÿ àäðåñîì {FROM_USERNAME}.
!
! Ïîñëàííîå âàì ñîîáùåíèå:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
{MESSAGE}
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** topic_notify.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- topic_notify.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,13 ****
! Subject: Óâåäîìëåíèå îá îòâåòå â òåìå - {TOPIC_TITLE}
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âû ïîëó÷èëè ýòî ñîîáùåíèå ïîòîìó, ÷òî ñëåäèòå çà òåìîé "{TOPIC_TITLE}" íà ñàéòå {SITENAME}.  ýòîé òåìå ñî âðåìåíè âàøåãî ïîñëåäíåãî âèçèòà ïîÿâèëîñü íîâîå ñîîáùåíèå. Âû ìîæåòå ïåðåéòè ïî ññûëêå ÷òîáû ïîñìîòðåòü ïîñòóïèâøèå îòâåòû, íîâûå óâåäîìëåíèÿ íå áóäóò ïðèõîäèòü ïîêà âû íå ïðîñìîòðèòå òåìó.
!
! {U_TOPIC}
!
! Åñëè âû áîëüøå íå õîòèòå ñëåäèòü çà òåìîé, òî ëèáî ù¸ëêíèòå ïî ññûëêå "ïåðåñòàòü ñëåäèòü çà òåìîé" âíèçó ñòðàíèöû ñ ýòîé òåìîé, ëèáî ïåðåéäèòå ïî ñëåäóþùåé ññûëêå:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
--- 1,13 ----
! Subject: Óâåäîìëåíèå îá îòâåòå â òåìå - {TOPIC_TITLE}
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âû ïîëó÷èëè ýòî ñîîáùåíèå ïîòîìó, ÷òî ñëåäèòå çà òåìîé "{TOPIC_TITLE}" íà ñàéòå {SITENAME}.  ýòîé òåìå ñî âðåìåíè âàøåãî ïîñëåäíåãî âèçèòà ïîÿâèëîñü íîâîå ñîîáùåíèå. Âû ìîæåòå ïåðåéòè ïî ññûëêå ÷òîáû ïîñìîòðåòü ïîñòóïèâøèå îòâåòû, íîâûå óâåäîìëåíèÿ íå áóäóò ïðèõîäèòü ïîêà âû íå ïðîñìîòðèòå òåìó.
!
! {U_TOPIC}
!
! Åñëè âû áîëüøå íå õîòèòå ñëåäèòü çà òåìîé, òî ëèáî ù¸ëêíèòå ïî ññûëêå "ïåðåñòàòü ñëåäèòü çà òåìîé" âíèçó ñòðàíèöû ñ ýòîé òåìîé, ëèáî ïåðåéäèòå ïî ñëåäóþùåé ññûëêå:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_activate.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_activate.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,9 ****
! Subject: Âíîâü àêòèâèçèðîâàòü ó÷¸òíóþ çàïèñü
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàøà ó÷¸òíàÿ çàïèñü íà {SITENAME} áûëà îòêëþ÷åíà, ñêîðåå âñåãî èç-çà âíåñ¸ííûõ â âàø ïðîôèëü èçìåíåíèé. ×òîáû âíîâü å¸ àêòèâèçèðîâàòü, ù¸ëêíèòå ïî ýòîé ññûëêå:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,9 ----
! Subject: Âíîâü àêòèâèçèðîâàòü ó÷¸òíóþ çàïèñü
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàøà ó÷¸òíàÿ çàïèñü íà {SITENAME} áûëà îòêëþ÷åíà, ñêîðåå âñåãî èç-çà âíåñ¸ííûõ â âàø ïðîôèëü èçìåíåíèé. ×òîáû âíîâü å¸ àêòèâèçèðîâàòü, ù¸ëêíèòå ïî ýòîé ññûëêå:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_activate_passwd.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_activate_passwd.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,17 ****
! Subject: Àêòèâèçàöèÿ íîâîãî ïàðîëÿ
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âû ïîëó÷èëè ýòî ïèñüìî ïîòîìó, ÷òî âû (ëèáî êòî-òî, âûäàþùèé ñåáÿ çà âàñ) ïîïðîñèëè âûñëàòü íîâûé ïàðîëü ê âàøåé ó÷¸òíîé çàïèñè íà ñàéòå {SITENAME}. Åñëè âû íå ïðîñèëè âûñëàòü ïàðîëü, íå îáðàùàéòå âíèìàíèÿ íà ýòî ïèñüìî, åñëè æå ïîäîáíûå ïèñüìà áóäóò ïðîäîëæàòü ïðèõîäèòü, îáðàòèòåñü ê àäìèíèñòðàòîðó ôîðóìîâ.
!
! Äëÿ òîãî, ÷òîáû èñïîëüçîâàòü íîâûé ïàðîëü âû äîëæíû åãî àêòèâèçèðîâàòü. Äëÿ ýòîãî ïåðåéäèòå ïî ññûëêå:
!
! {U_ACTIVATE}
!
!  ñëó÷àå óñïåøíîé àêòèâèçàöèè âû ñìîæåòå âõîäèòü â ñèñòåìó, èñïîëüçóÿ ñëåäóþùèé ïàðîëü:
!
! Ïàðîëü: {PASSWORD}
!
! Âû ñìîæåòå ñìåíèòü ýòîò ïàðîëü íà ñòðàíèöå ðåäàêòèðîâàíèÿ ïðîôèëÿ. Åñëè ó âàñ âîçíèêíóò êàêèå-òî òðóäíîñòè, îáðàòèòåñü ê àäìèíèñòðàòîðó ôîðóìîâ.
!
{EMAIL_SIG}
--- 1,17 ----
! Subject: Àêòèâèçàöèÿ íîâîãî ïàðîëÿ
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âû ïîëó÷èëè ýòî ïèñüìî ïîòîìó, ÷òî âû (ëèáî êòî-òî, âûäàþùèé ñåáÿ çà âàñ) ïîïðîñèëè âûñëàòü íîâûé ïàðîëü ê âàøåé ó÷¸òíîé çàïèñè íà ñàéòå {SITENAME}. Åñëè âû íå ïðîñèëè âûñëàòü ïàðîëü, íå îáðàùàéòå âíèìàíèÿ íà ýòî ïèñüìî, åñëè æå ïîäîáíûå ïèñüìà áóäóò ïðîäîëæàòü ïðèõîäèòü, îáðàòèòåñü ê àäìèíèñòðàòîðó ôîðóìîâ.
!
! Äëÿ òîãî, ÷òîáû èñïîëüçîâàòü íîâûé ïàðîëü âû äîëæíû åãî àêòèâèçèðîâàòü. Äëÿ ýòîãî ïåðåéäèòå ïî ññûëêå:
!
! {U_ACTIVATE}
!
!  ñëó÷àå óñïåøíîé àêòèâèçàöèè âû ñìîæåòå âõîäèòü â ñèñòåìó, èñïîëüçóÿ ñëåäóþùèé ïàðîëü:
!
! Ïàðîëü: {PASSWORD}
!
! Âû ñìîæåòå ñìåíèòü ýòîò ïàðîëü íà ñòðàíèöå ðåäàêòèðîâàíèÿ ïðîôèëÿ. Åñëè ó âàñ âîçíèêíóò êàêèå-òî òðóäíîñòè, îáðàòèòåñü ê àäìèíèñòðàòîðó ôîðóìîâ.
!
{EMAIL_SIG}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_welcome.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_welcome.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,16 ****
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
--- 1,16 ----
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_welcome_inactive.tpl 10 Mar 2002 03:23:56 -0000 1.3
***************
*** 1,20 ****
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Âàøà ó÷¸òíàÿ çàïèñü ïîêà íå àêòèâíà. Âû íå ñìîæåòå èì ïîëüçîâàòüñÿ, ïîêà íå ïåðåéä¸òå ïî ñëåäóþùåé ññûëêå:
!
! {U_ACTIVATE}
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
--- 1,20 ----
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Âàøà ó÷¸òíàÿ çàïèñü ïîêà íå àêòèâíà. Âû íå ñìîæåòå èì ïîëüçîâàòüñÿ, ïîêà íå ïåðåéä¸òå ïî ñëåäóþùåé ññûëêå:
!
! {U_ACTIVATE}
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
|
