You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
Update of /cvsroot/phpbb/phpBB2/language/lang_japanese/email
In directory usw-pr-cvs1:/tmp/cvs-serv8128/language/lang_japanese/email
Modified Files:
Tag: phpBB-2_0_0
coppa_welcome_inactive.tpl group_added.tpl group_request.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
Various updates
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** coppa_welcome_inactive.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
--- coppa_welcome_inactive.tpl 19 May 2002 17:37:34 -0000 1.2.2.2
***************
*** 33,36 ****
--- 33,38 ----
ͱÌîñªpX[hðüÍ·é±ÆÅ¢ÂÅàÏXªÂ\Èð³mµÄ¢Ü·B
+
+
¼eÍÛìÒ
(¼Oð±ÌÉLü): _____________________
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/group_added.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** group_added.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
--- group_added.tpl 19 May 2002 17:37:34 -0000 1.2.2.2
***************
*** 6,9 ****
--- 6,10 ----
È½Í {SITENAME}ÌO[vÅ é"{GROUP_NAME}"Ìo[ÉÇÁ³êܵ½B±ÌìÆÍO[vÌf[^[AܽÍÇlÉæÁÄsíêܵ½BÚ×É¢ÄÍÞçÉâ¢í¹Ä¾³¢B
+
O[vîñͱ¿çũ鱯ªÅ«Ü·F
{U_GROUPCP}
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/group_request.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** group_request.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
--- group_request.tpl 19 May 2002 17:37:34 -0000 1.2.2.2
***************
*** 4,8 ****
{GROUP_MODERATOR}³ñÖ
! [U[ª{SITENAME}ÌO[vÌQÁð\µñŢܷBQÁ̳øEÛ·éêÍAºLÌNðNbNµÄ¾³¢F
{U_GROUPCP}
--- 4,9 ----
{GROUP_MODERATOR}³ñÖ
! [U[ª{SITENAME}ÌO[vÌQÁð\µñŢܷB
! QÁ̳øEÛ·éêÍAºLÌNðNbNµÄ¾³¢F
{U_GROUPCP}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/user_welcome.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** user_welcome.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
--- user_welcome.tpl 19 May 2002 17:37:34 -0000 1.2.2.2
***************
*** 4,8 ****
{WELCOME_MSG}
-
±Ì[ÍåØÉÛǵľ³¢B ȽÌAJEgîñÍȺÌÊèÅ·F
--- 4,7 ----
***************
*** 11,15 ****
pX[h: {PASSWORD}
----------------------------
-
AJEgÌpX[hÍf[^x[XàÅû³êÄ¢é½ßApX[hðYêĵÜÁ½êÉA»ÌpX[hð©Â¯o·±ÆÍūȢÌÅӵľ³¢Bµ©µAªêpX[hðYêĵÜÁ½êÍAVµ¢pX[hðs·é±ÆªÅ«Ü·B
--- 10,13 ----
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/user_welcome_inactive.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** user_welcome_inactive.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
--- user_welcome_inactive.tpl 19 May 2002 17:37:34 -0000 1.2.2.2
***************
*** 6,10 ****
±Ì[ÍåØÉÛǵľ³¢B ȽÌAJEgîñÍȺÌÊèÅ·F
-
----------------------------
¼O: {USERNAME}
--- 6,9 ----
|
|
From: Paul S. O. <ps...@us...> - 2002-05-19 17:37:37
|
Update of /cvsroot/phpbb/phpBB2/language/lang_japanese
In directory usw-pr-cvs1:/tmp/cvs-serv8128/language/lang_japanese
Modified Files:
Tag: phpBB-2_0_0
lang_admin.php lang_main.php
Log Message:
Various updates
Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/lang_admin.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** lang_admin.php 25 Feb 2002 15:00:30 -0000 1.1
--- lang_admin.php 19 May 2002 17:37:34 -0000 1.1.2.1
***************
*** 1,705 ****
! <?php
!
! /***************************************************************************
! * lang_admin.php [japanese]
! * -------------------
! * begin : Sat Dec 16 2000
! * copyright : (C) 2001 The phpBB Group
! * email : su...@ph...
! *
! * $Id$
[...1398 lines suppressed...]
! $lang['Transfer_config'] = "]Jn";
! $lang['NoFTP_config'] = "FTPÉæé©®]͸sµÜµ½Bt@Cð_E[hµÄè®Å]µÄ¾³¢B";
!
! $lang['Install'] = "VKCXg[";
! $lang['Upgrade'] = "AbvO[h";
!
!
! $lang['Install_Method'] = "CXg[û@ðIðµÄ¾³¢";
!
! $lang['Install_No_Ext'] = "T[o[ÌPHPÝèͨIÑÌf[^x[XÌíÞðT|[gµÄ¢È¢";
!
! $lang['Install_No_PCRE'] = "phpBB2 Requires the Perl-Compatible Regular Expressions Module for php which your php configuration doesn't appear to support!";
!
! //
! // That's all Folks!
! // -------------------------------------------------
! // Translation by:
! // Yoichi Iwaki :: yoi...@rr...
! // For questions and comments use: yoi...@rr...
?>
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/lang_main.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** lang_main.php 6 Mar 2002 00:36:23 -0000 1.3
--- lang_main.php 19 May 2002 17:37:34 -0000 1.3.2.1
***************
*** 1,972 ****
! <?php
! /***************************************************************************
! * lang_main.php [japanese]
! * -------------------
! * begin : Sat Dec 16 2000
! * copyright : (C) 2001 The phpBB Group
! * email : su...@ph...
! *
! * $Id$
! *
[...1936 lines suppressed...]
! $lang['datetime']['Nov'] = "11";
! $lang['datetime']['Dec'] = "12";
!
! //
! // Errors (not related to a
! // specific failure on a page)
! //
! $lang['Information'] = "îñ";
! $lang['Critical_Information'] = "dvÈîñ";
!
! $lang['General_Error'] = "êÊG[";
! $lang['Critical_Error'] = "dåG[";
! $lang['An_error_occured'] = "G[ª¶µÜµ½";
! $lang['A_critical_error'] = "dåG[ª¶µÜµ½";
!
! //
! // That's all Folks!
! // -------------------------------------------------
!
?>
|
|
From: Paul S. O. <ps...@us...> - 2002-05-19 17:32:55
|
Update of /cvsroot/phpbb/phpBB2/language/lang_swedish
In directory usw-pr-cvs1:/tmp/cvs-serv7136/language/lang_swedish
Modified Files:
Tag: phpBB-2_0_0
lang_admin.php lang_bbcode.php lang_faq.php lang_main.php
Log Message:
Updates for 2.0.1
Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/lang_admin.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** lang_admin.php 1 Mar 2002 15:02:57 -0000 1.1
--- lang_admin.php 19 May 2002 17:32:51 -0000 1.1.2.1
***************
*** 21,36 ****
***************************************************************************/
! //
// Swedish Translation by:
//
// Marcus Svensson
! // xsv...@ho...
! //
// Janåke Rönnblom
// jan...@sk...
! //
// Bruce
// br...@we...
! //
//
--- 21,45 ----
***************************************************************************/
! // *************************************
// Swedish Translation by:
//
// Marcus Svensson
! // ad...@wo...
! // http://www.world-of-war.com
! // -------------------------------------
// Janåke Rönnblom
// jan...@sk...
! // -------------------------------------
// Bruce
// br...@we...
! // *************************************
!
! // *************************************
! // Maintained and kept up-to-date by:
! //
! // Marcus Svensson
! // ad...@wo...
! // http://www.world-of-war.com
! // *************************************
//
***************
*** 216,220 ****
$lang['Ban_username'] = "Bannlys en eller flera användare";
- $lang['Ban_username_explain'] = "Du kan bannlysa flera användare samtidigt genom att använda den ändamålsenliga kombinationen av mus och tangenbord för din dator och webläsare.";
$lang['Ban_IP'] = "Bannlys en eller flera IP adresser eller värdnamn";
--- 225,228 ----
***************
*** 453,456 ****
--- 461,465 ----
// Group Management
//
+ $lang['No_group_action'] = 'Inget alternativ angavs';
$lang['Group_administration'] = "Grupp administration";
$lang['Group_admin_explain'] = "Via denna panel kan du administrera alla dina användaregrupper, du kan; radera, skapa nya och redigera existerande grupper. Du kan välja moderatorer, ändra öppen/stängd status och sätta gruppnamn och beskrivning";
Index: lang_bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/lang_bbcode.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** lang_bbcode.php 1 Mar 2002 15:02:57 -0000 1.1
--- lang_bbcode.php 19 May 2002 17:32:51 -0000 1.1.2.1
***************
*** 21,37 ****
***************************************************************************/
! //
// Swedish Translation by:
//
// Marcus Svensson
! // xsv...@ho...
! //
// Janåke Rönnblom
// jan...@sk...
! //
// Bruce
// br...@we...
! //
!
//
// To add an entry to your BBCode guide simply add a line to this file in this format:
--- 21,46 ----
***************************************************************************/
! // *************************************
// Swedish Translation by:
//
// Marcus Svensson
! // ad...@wo...
! // http://www.world-of-war.com
! // -------------------------------------
// Janåke Rönnblom
// jan...@sk...
! // -------------------------------------
// Bruce
// br...@we...
! // *************************************
!
! // *************************************
! // Maintained and kept up-to-date by:
! //
! // Marcus Svensson
! // ad...@wo...
! // http://www.world-of-war.com
! // *************************************
!
//
// To add an entry to your BBCode guide simply add a line to this file in this format:
Index: lang_faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/lang_faq.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** lang_faq.php 1 Mar 2002 15:02:57 -0000 1.1
--- lang_faq.php 19 May 2002 17:32:51 -0000 1.1.2.1
***************
*** 21,36 ****
***************************************************************************/
! //
// Swedish Translation by:
//
// Marcus Svensson
! // xsv...@ho...
! //
// Janåke Rönnblom
// jan...@sk...
! //
// Bruce
// br...@we...
! //
//
--- 21,45 ----
***************************************************************************/
! // *************************************
// Swedish Translation by:
//
// Marcus Svensson
! // ad...@wo...
! // http://www.world-of-war.com
! // -------------------------------------
// Janåke Rönnblom
// jan...@sk...
! // -------------------------------------
// Bruce
// br...@we...
! // *************************************
!
! // *************************************
! // Maintained and kept up-to-date by:
! //
! // Marcus Svensson
! // ad...@wo...
! // http://www.world-of-war.com
! // *************************************
//
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/lang_main.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** lang_main.php 6 Mar 2002 00:36:24 -0000 1.3
--- lang_main.php 19 May 2002 17:32:52 -0000 1.3.2.1
***************
*** 20,35 ****
***************************************************************************/
! //
// Swedish Translation by:
//
// Marcus Svensson
! // xsv...@ho...
! //
// Janåke Rönnblom
// jan...@sk...
! //
// Bruce
// br...@we...
! //
//setlocale(LC_ALL, "se");
--- 20,44 ----
***************************************************************************/
! // *************************************
// Swedish Translation by:
//
// Marcus Svensson
! // ad...@wo...
! // http://www.world-of-war.com
! // -------------------------------------
// Janåke Rönnblom
// jan...@sk...
! // -------------------------------------
// Bruce
// br...@we...
! // *************************************
!
! // *************************************
! // Maintained and kept up-to-date by:
! //
! // Marcus Svensson
! // ad...@wo...
! // http://www.world-of-war.com
! // *************************************
//setlocale(LC_ALL, "se");
***************
*** 300,303 ****
--- 309,316 ----
// Posting/Replying (Not private messaging!)
//
+
+ $lang['Already_voted'] = 'Du har redan deltagit i den här omröstningen';
+ $lang['No_vote_option'] = 'Du måste markera ett alternativ när du röstar';
+
$lang['Message_body'] = "Meddelande";
$lang['Topic_review'] = "Ämnes historia";
***************
*** 417,420 ****
--- 430,444 ----
// Private Messaging
//
+
+ $lang['Read_pm'] = 'Läs meddelande';
+ $lang['Post_new_pm'] = 'Skicka meddelande';
+ $lang['Post_reply_pm'] = 'Svara på meddelande';
+ $lang['Post_quote_pm'] = 'Citera meddelande';
+ $lang['Edit_pm'] = 'Ändra meddelande';
+
+ $lang['Unread_message'] = 'Oläst meddelande';
+ $lang['Read_message'] = 'Läst meddelande';
+
+
$lang['Private_Messaging'] = "Privata Meddelanden";
***************
*** 497,500 ****
--- 521,526 ----
// Profiles/Registration
//
+ $lang['Already_activated'] = "Ditt konto har redan aktiverats";
+
$lang['Viewing_user_profile'] = "Visar Profil :: %s"; // %s is username
$lang['About_user'] = "Allt om %s"; // %s is username
***************
*** 873,890 ****
$lang['-12'] = "GMT - 12 Timmar";
$lang['-11'] = "GMT - 11 Timmar";
! $lang['-10'] = "HST (Hawaii)";
$lang['-9'] = "GMT - 9 Timmar";
! $lang['-8'] = "PST (U.S./Canada)";
! $lang['-7'] = "MST (U.S./Canada)";
! $lang['-6'] = "CST (U.S./Canada)";
! $lang['-5'] = "EST (U.S./Canada)";
$lang['-4'] = "GMT - 4 Timmar";
$lang['-3.5'] = "GMT - 3.5 Timmar";
$lang['-3'] = "GMT - 3 Timmar";
! $lang['-2'] = "Mid-Atlantic";
$lang['-1'] = "GMT - 1 Timme";
$lang['0'] = "GMT";
! $lang['1'] = "CET (Europa)";
! $lang['2'] = "EET (Europa)";
$lang['3'] = "GMT + 3 Timmar";
$lang['3.5'] = "GMT + 3.5 Timmar";
--- 899,916 ----
$lang['-12'] = "GMT - 12 Timmar";
$lang['-11'] = "GMT - 11 Timmar";
! $lang['-10'] = "GMT - 10 Timmar";
$lang['-9'] = "GMT - 9 Timmar";
! $lang['-8'] = "GMT - 8 Timmar";
! $lang['-7'] = "GMT - 7 Timmar";
! $lang['-6'] = "GMT - 6 Timmar";
! $lang['-5'] = "GMT - 5 Timmar";
$lang['-4'] = "GMT - 4 Timmar";
$lang['-3.5'] = "GMT - 3.5 Timmar";
$lang['-3'] = "GMT - 3 Timmar";
! $lang['-2'] = "GMT - 2 Timmar";
$lang['-1'] = "GMT - 1 Timme";
$lang['0'] = "GMT";
! $lang['1'] = "GMT + 1 Timme";
! $lang['2'] = "GMT + 2 Timmar";
$lang['3'] = "GMT + 3 Timmar";
$lang['3.5'] = "GMT + 3.5 Timmar";
***************
*** 895,937 ****
$lang['6'] = "GMT + 6 Timmar";
$lang['7'] = "GMT + 7 Timmar";
! $lang['8'] = "WST (Australien)";
$lang['9'] = "GMT + 9 Timmar";
! $lang['9.5'] = "CST (Australien)";
! $lang['10'] = "EST (Australien)";
$lang['11'] = "GMT + 11 Timmar";
$lang['12'] = "GMT + 12 Timmar";
// These are displayed in the timezone select box
! $lang['tz']['-12'] = "(GMT -12:00 timmar) Eniwetok, Kwajalein";
! $lang['tz']['-11'] = "(GMT -11:00 timmar) Midway Island, Samoa";
! $lang['tz']['-10'] = "(GMT -10:00 timmar) Hawaii";
! $lang['tz']['-9'] = "(GMT -9:00 timmar) Alaska";
! $lang['tz']['-8'] = "(GMT -8:00 timmar) Pacific Time (US & Canada), Tijuana";
! $lang['tz']['-7'] = "(GMT -7:00 timmar) Mountain Time (US & Canada), Arizona";
! $lang['tz']['-6'] = "(GMT -6:00 timmar) Central Time (US & Canada), Mexico City";
! $lang['tz']['-5'] = "(GMT -5:00 timmar) Eastern Time (US & Canada), Bogota, Lima, Quito";
! $lang['tz']['-4'] = "(GMT -4:00 timmar) Atlantic Time (Canada), Caracas, La Paz";
! $lang['tz']['-3.5'] = "(GMT -3:30 timmar) Newfoundland";
! $lang['tz']['-3'] = "(GMT -3:00 timmar) Brassila, Buenos Aires, Georgetown, Falkland Is";
! $lang['tz']['-2'] = "(GMT -2:00 timmar) Mid-Atlantic, Ascension Is., St. Helena";
! $lang['tz']['-1'] = "(GMT -1:00 timme) Azores, Cape Verde Islands";
! $lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
! $lang['tz']['1'] = "(GMT +1:00 timme) Stockholm, Berlin, Brussels, Madrid, Paris, Rome";
! $lang['tz']['2'] = "(GMT +2:00 timmar) Cairo, Helsingfors, Kaliningrad, South Africa";
! $lang['tz']['3'] = "(GMT +3:00 timmar) Baghdad, Riyadh, Moscow, Nairobi";
! $lang['tz']['3.5'] = "(GMT +3:30 timmar) Tehran";
! $lang['tz']['4'] = "(GMT +4:00 timmar) Abu Dhabi, Baku, Muscat, Tbilisi";
! $lang['tz']['4.5'] = "(GMT +4:30 timmar) Kabul";
! $lang['tz']['5'] = "(GMT +5:00 timmar) Ekaterinburg, Islamabad, Karachi, Tashkent";
! $lang['tz']['5.5'] = "(GMT +5:30 timmar) Bombay, Calcutta, Madras, New Delhi";
! $lang['tz']['6'] = "(GMT +6:00 timmar) Almaty, Colombo, Dhaka, Novosibirsk";
! $lang['tz']['6.5'] = "(GMT +6:30 timmar) Rangoon";
! $lang['tz']['7'] = "(GMT +7:00 timmar) Bangkok, Hanoi, Jakarta";
! $lang['tz']['8'] = "(GMT +8:00 timmar) Beijing, Hong Kong, Perth, Singapore, Taipei";
! $lang['tz']['9'] = "(GMT +9:00 timmar) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
! $lang['tz']['9.5'] = "(GMT +9:30 timmar) Adelaide, Darwin";
! $lang['tz']['10'] = "(GMT +10:00 timmar) Canberra, Guam, Melbourne, Sydney, Vladivostok";
! $lang['tz']['11'] = "(GMT +11:00 timmar) Magadan, New Caledonia, Solomon Islands";
! $lang['tz']['12'] = "(GMT +12:00 timmar) Auckland, Wellington, Fiji, Marshall Island";
$lang['datetime']['Sunday'] = "Söndag";
--- 921,962 ----
$lang['6'] = "GMT + 6 Timmar";
$lang['7'] = "GMT + 7 Timmar";
! $lang['8'] = "GMT + 8 Timmar";
$lang['9'] = "GMT + 9 Timmar";
! $lang['9.5'] = "GMT + 9.5 Timmar";
! $lang['10'] = "GMT + 10 Timmar";
$lang['11'] = "GMT + 11 Timmar";
$lang['12'] = "GMT + 12 Timmar";
// These are displayed in the timezone select box
! $lang['tz']['-12'] = "GMT - 12 Timmar";
! $lang['tz']['-11'] = "GMT - 11 Timmar";
! $lang['tz']['-10'] = "GMT - 10 Timmar";
! $lang['tz']['-9'] = "GMT - 9 Timmar";
! $lang['tz']['-8'] = "GMT - 8 Timmar";
! $lang['tz']['-7'] = "GMT - 7 Timmar";
! $lang['tz']['-6'] = "GMT - 6 Timmar";
! $lang['tz']['-5'] = "GMT - 5 Timmar";
! $lang['tz']['-4'] = "GMT - 4 Timmar";
! $lang['tz']['-3.5'] = "GMT - 3.5 Timmar";
! $lang['tz']['-3'] = "GMT - 3 Timmar";
! $lang['tz']['-2'] = "GMT - 2 Timmar";
! $lang['tz']['-1'] = "GMT - 1 Timme";
! $lang['tz']['0'] = "GMT";
! $lang['tz']['1'] = "GMT + 1 Timme";
! $lang['tz']['2'] = "GMT + 2 Timmar";
! $lang['tz']['3'] = "GMT + 3 Timmar";
! $lang['tz']['3.5'] = "GMT + 3.5 Timmar";
! $lang['tz']['4'] = "GMT + 4 Timmar";
! $lang['tz']['4.5'] = "GMT + 4.5 Timmar";
! $lang['tz']['5'] = "GMT + 5 Timmar";
! $lang['tz']['5.5'] = "GMT + 5.5 Timmar";
! $lang['tz']['6'] = "GMT + 6 Timmar";
! $lang['tz']['7'] = "GMT + 7 Timmar";
! $lang['tz']['8'] = "GMT + 8 Timmar";
! $lang['tz']['9'] = "GMT + 9 Timmar";
! $lang['tz']['9.5'] = "GMT + 9.5 Timmar";
! $lang['tz']['10'] = "GMT + 10 Timmar";
! $lang['tz']['11'] = "GMT + 11 Timmar";
! $lang['tz']['12'] = "GMT + 12 Timmar";
$lang['datetime']['Sunday'] = "Söndag";
|
|
From: Paul S. O. <ps...@us...> - 2002-05-19 16:44:01
|
Update of /cvsroot/phpbb/phpBB2/language/lang_finnish
In directory usw-pr-cvs1:/tmp/cvs-serv28876/language/lang_finnish
Modified Files:
Tag: phpBB-2_0_0
lang_main.php
Log Message:
Various updates
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/lang_main.php,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -r1.9.2.2 -r1.9.2.3
*** lang_main.php 17 May 2002 13:57:52 -0000 1.9.2.2
--- lang_main.php 19 May 2002 16:43:57 -0000 1.9.2.3
***************
*** 34,38 ****
// along with our copyright message indicating you are the translator
// please add it here.
! $lang['TRANSLATION_INFO'] = 'Käännös Jorma Aaltonen, <a href="mailto:jorma@pitro.com">jorma@pitro.com</a>';
//
--- 34,38 ----
// along with our copyright message indicating you are the translator
// please add it here.
! // $lang['TRANSLATION_INFO'] = 'Käännös Jorma Aaltonen, <a href="mailto:jorma@pitro.com">jorma@pitro.com</a>';
//
|
|
From: Paul S. O. <ps...@us...> - 2002-05-19 15:11:20
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv6293
Modified Files:
Tag: phpBB-2_0_0
memberlist.php posting.php
Log Message:
More fixes
Index: memberlist.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/memberlist.php,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -C2 -r1.36 -r1.36.2.1
*** memberlist.php 31 Mar 2002 00:06:33 -0000 1.36
--- memberlist.php 19 May 2002 15:11:17 -0000 1.36.2.1
***************
*** 34,38 ****
//
! $start = ( isset($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0;
if(isset($HTTP_POST_VARS['order']))
--- 34,38 ----
//
! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
if(isset($HTTP_POST_VARS['order']))
***************
*** 59,63 ****
{
$selected = ( $mode == $mode_types[$i] ) ? ' selected="selected"' : '';
! $select_sort_mode .= "<option value=\"" . $mode_types[$i] . "\"$selected>" . $mode_types_text[$i] . "</option>";
}
$select_sort_mode .= '</select>';
--- 59,63 ----
{
$selected = ( $mode == $mode_types[$i] ) ? ' selected="selected"' : '';
! $select_sort_mode .= '<option value="' . $mode_types[$i] . '"' . $selected . '>' . $mode_types_text[$i] . '</option>';
}
$select_sort_mode .= '</select>';
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.159.2.5
retrieving revision 1.159.2.6
diff -C2 -r1.159.2.5 -r1.159.2.6
*** posting.php 19 May 2002 15:02:08 -0000 1.159.2.5
--- posting.php 19 May 2002 15:11:17 -0000 1.159.2.6
***************
*** 57,62 ****
}
-
-
$refresh = $preview || $poll_add || $poll_edit || $poll_delete;
--- 57,60 ----
***************
*** 64,68 ****
// Set topic type
//
! $topic_type = ( !empty($HTTP_POST_VARS['topictype']) ) ? $HTTP_POST_VARS['topictype'] : POST_NORMAL;
//
--- 62,66 ----
// Set topic type
//
! $topic_type = ( !empty($HTTP_POST_VARS['topictype']) ) ? intval($HTTP_POST_VARS['topictype']) : POST_NORMAL;
//
***************
*** 359,363 ****
// Set toggles for various options
//
! if( !$board_config['allow_html'] )
{
$html_on = 0;
--- 357,361 ----
// Set toggles for various options
//
! if ( !$board_config['allow_html'] )
{
$html_on = 0;
***************
*** 368,372 ****
}
! if( !$board_config['allow_bbcode'] )
{
$bbcode_on = 0;
--- 366,370 ----
}
! if ( !$board_config['allow_bbcode'] )
{
$bbcode_on = 0;
***************
*** 377,381 ****
}
! if( !$board_config['allow_smilies'] )
{
$smilies_on = 0;
--- 375,379 ----
}
! if ( !$board_config['allow_smilies'] )
{
$smilies_on = 0;
|
|
From: Paul S. O. <ps...@us...> - 2002-05-19 15:02:12
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv4429
Modified Files:
Tag: phpBB-2_0_0
modcp.php posting.php
Log Message:
Various updates
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.71.2.4
retrieving revision 1.71.2.5
diff -C2 -r1.71.2.4 -r1.71.2.5
*** modcp.php 13 May 2002 13:18:17 -0000 1.71.2.4
--- modcp.php 19 May 2002 15:02:08 -0000 1.71.2.5
***************
*** 72,76 ****
// Continue var definitions
//
! $start = ( isset($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0;
$delete = ( isset($HTTP_POST_VARS['delete']) ) ? TRUE : FALSE;
--- 72,76 ----
// Continue var definitions
//
! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
$delete = ( isset($HTTP_POST_VARS['delete']) ) ? TRUE : FALSE;
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.159.2.4
retrieving revision 1.159.2.5
diff -C2 -r1.159.2.4 -r1.159.2.5
*** posting.php 12 May 2002 15:57:46 -0000 1.159.2.4
--- posting.php 19 May 2002 15:02:08 -0000 1.159.2.5
***************
*** 31,36 ****
// Check and set various parameters
//
! $params = array('submit' => 'post', 'confirm' => 'confirm', 'preview' => 'preview', 'delete' => 'delete', 'poll_delete' => 'poll_delete', 'poll_add' => 'add_poll_option', 'poll_edit' => 'edit_poll_option', 'mode' => 'mode', 'forum_id' => POST_FORUM_URL, 'topic_id' => POST_TOPIC_URL, 'post_id' => POST_POST_URL);
!
while( list($var, $param) = @each($params) )
{
--- 31,35 ----
// Check and set various parameters
//
! $params = array('submit' => 'post', 'confirm' => 'confirm', 'preview' => 'preview', 'delete' => 'delete', 'poll_delete' => 'poll_delete', 'poll_add' => 'add_poll_option', 'poll_edit' => 'edit_poll_option', 'mode' => 'mode');
while( list($var, $param) = @each($params) )
{
***************
*** 45,48 ****
--- 44,62 ----
}
+ $params = array('forum_id' => POST_FORUM_URL, 'topic_id' => POST_TOPIC_URL, 'post_id' => POST_POST_URL);
+ while( list($var, $param) = @each($params) )
+ {
+ if ( !empty($HTTP_POST_VARS[$param]) || !empty($HTTP_GET_VARS[$param]) )
+ {
+ $$var = ( !empty($HTTP_POST_VARS[$param]) ) ? intval($HTTP_POST_VARS[$param]) : intval($HTTP_GET_VARS[$param]);
+ }
+ else
+ {
+ $$var = '';
+ }
+ }
+
+
+
$refresh = $preview || $poll_add || $poll_edit || $poll_delete;
***************
*** 535,539 ****
submit_post($mode, $post_data, $return_message, $return_meta, $forum_id, $topic_id, $post_id, $poll_id, $topic_type, $bbcode_on, $html_on, $smilies_on, $attach_sig, $bbcode_uid, str_replace("\'", "''", $username), str_replace("\'", "''", $subject), str_replace("\'", "''", $message), str_replace("\'", "''", $poll_title), $poll_options, $poll_length);
if ( $error_msg == '' )
! user_notification($mode, $post_data, $forum_id, $topic_id, $post_id, $notify_user);
}
break;
--- 549,555 ----
submit_post($mode, $post_data, $return_message, $return_meta, $forum_id, $topic_id, $post_id, $poll_id, $topic_type, $bbcode_on, $html_on, $smilies_on, $attach_sig, $bbcode_uid, str_replace("\'", "''", $username), str_replace("\'", "''", $subject), str_replace("\'", "''", $message), str_replace("\'", "''", $poll_title), $poll_options, $poll_length);
if ( $error_msg == '' )
! {
! user_notification($mode, $post_data, $forum_id, $topic_id, $post_id, $notify_user);
! }
}
break;
***************
*** 570,574 ****
$template->assign_vars(array(
! "META" => $return_meta)
);
message_die(GENERAL_MESSAGE, $return_message);
--- 586,590 ----
$template->assign_vars(array(
! 'META' => $return_meta)
);
message_die(GENERAL_MESSAGE, $return_message);
|
|
From: Paul S. O. <ps...@us...> - 2002-05-19 14:03:55
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24614/admin
Modified Files:
Tag: phpBB-2_0_0
admin_groups.php
Log Message:
Fix lack of existing user check when promoting/demoting users to/from group moderator
Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -C2 -r1.25.2.2 -r1.25.2.3
*** admin_groups.php 12 May 2002 15:57:44 -0000 1.25.2.2
--- admin_groups.php 19 May 2002 14:03:51 -0000 1.25.2.3
***************
*** 23,27 ****
define('IN_PHPBB', 1);
! if( !empty($setmodules) )
{
$filename = basename(__FILE__);
--- 23,27 ----
define('IN_PHPBB', 1);
! if ( !empty($setmodules) )
{
$filename = basename(__FILE__);
***************
*** 34,42 ****
// Load default header
//
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
require('./pagestart.' . $phpEx);
! if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
{
$group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]);
--- 34,42 ----
// Load default header
//
! $phpbb_root_path = './../';
require($phpbb_root_path . 'extension.inc');
require('./pagestart.' . $phpEx);
! if ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
{
$group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]);
***************
*** 44,54 ****
else
{
! $group_id = "";
}
! //
! // Mode setting
! //
! if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
{
$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
--- 44,51 ----
else
{
! $group_id = '';
}
! if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
{
$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
***************
*** 56,63 ****
else
{
! $mode = "";
}
! if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
{
//
--- 53,60 ----
else
{
! $mode = '';
}
! if ( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
{
//
***************
*** 65,69 ****
//
$template->set_filenames(array(
! "body" => "admin/group_edit_body.tpl")
);
--- 62,66 ----
//
$template->set_filenames(array(
! 'body' => 'admin/group_edit_body.tpl')
);
***************
*** 77,108 ****
WHERE group_single_user <> " . TRUE . "
AND group_id = $group_id";
! if(!$result = $db->sql_query($sql))
{
! message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
}
! if( !$db->sql_numrows($result) )
{
message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
}
! $group_info = $db->sql_fetchrow($result);
!
! $mode = "editgroup";
! $template->assign_block_vars("group_edit", array());
}
! else if( isset($HTTP_POST_VARS['new']) )
{
$group_info = array (
! "group_name" => "",
! "group_description" => "",
! "group_moderator" => "",
! "group_type" => GROUP_OPEN);
! $group_open = "checked=\"checked\"";
! $mode = "newgroup";
}
//
// Ok, now we know everything about them, let's show the page.
--- 74,104 ----
WHERE group_single_user <> " . TRUE . "
AND group_id = $group_id";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql);
}
! if ( !($group_info = $db->sql_fetchrow($result)) )
{
message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
}
! $mode = 'editgroup';
! $template->assign_block_vars('group_edit', array());
}
! else if ( isset($HTTP_POST_VARS['new']) )
{
$group_info = array (
! 'group_name' => '',
! 'group_description' => '',
! 'group_moderator' => '',
! 'group_type' => GROUP_OPEN);
! $group_open = ' checked="checked"';
! $mode = 'newgroup';
}
+
//
// Ok, now we know everything about them, let's show the page.
***************
*** 112,170 ****
WHERE user_id <> " . ANONYMOUS . "
ORDER BY username";
! $u_result = $db->sql_query($sql);
! if( !$u_result )
{
! message_die(GENERAL_ERROR, "Couldn't obtain user info for moderator list", "", __LINE__, __FILE__, $sql);
}
! $user_list = $db->sql_fetchrowset($u_result);
!
! for($i = 0; $i < count($user_list); $i++)
{
! if( $user_list[$i]['user_id'] == $group_info['group_moderator'] )
{
! $group_moderator = $user_list[$i]['username'];
}
}
! $group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? "checked=\"checked\"" : "";
! $group_closed = ( $group_info['group_type'] == GROUP_CLOSED ) ? "checked=\"checked\"" : "";
! $group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
$template->assign_vars(array(
! "GROUP_NAME" => $group_info['group_name'],
! "GROUP_DESCRIPTION" => $group_info['group_description'],
! "GROUP_MODERATOR" => $group_moderator,
!
! "L_GROUP_TITLE" => $lang['Group_administration'],
! "L_GROUP_EDIT_DELETE" => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'],
! "L_GROUP_NAME" => $lang['group_name'],
! "L_GROUP_DESCRIPTION" => $lang['group_description'],
! "L_GROUP_MODERATOR" => $lang['group_moderator'],
! "L_FIND_USERNAME" => $lang['Find_username'],
! "L_GROUP_STATUS" => $lang['group_status'],
! "L_GROUP_OPEN" => $lang['group_open'],
! "L_GROUP_CLOSED" => $lang['group_closed'],
! "L_GROUP_HIDDEN" => $lang['group_hidden'],
! "L_GROUP_DELETE" => $lang['group_delete'],
! "L_GROUP_DELETE_CHECK" => $lang['group_delete_check'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
! "L_DELETE_MODERATOR" => $lang['delete_group_moderator'],
! "L_DELETE_MODERATOR_EXPLAIN" => $lang['delete_moderator_explain'],
! "L_YES" => $lang['Yes'],
!
! "U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"),
!
! "S_GROUP_OPEN_TYPE" => GROUP_OPEN,
! "S_GROUP_CLOSED_TYPE" => GROUP_CLOSED,
! "S_GROUP_HIDDEN_TYPE" => GROUP_HIDDEN,
! "S_GROUP_OPEN_CHECKED" => $group_open,
! "S_GROUP_CLOSED_CHECKED" => $group_closed,
! "S_GROUP_HIDDEN_CHECKED" => $group_hidden,
! "S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
! "S_HIDDEN_FIELDS" => $s_hidden_fields)
);
--- 108,163 ----
WHERE user_id <> " . ANONYMOUS . "
ORDER BY username";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain user info for moderator list', '', __LINE__, __FILE__, $sql);
}
! while ( $row = $db->sql_fetchrow($result) )
{
! if ( $row['user_id'] == $group_info['group_moderator'] )
{
! $group_moderator = $row['username'];
}
}
! $group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? ' checked="checked"' : '';
! $group_closed = ( $group_info['group_type'] == GROUP_CLOSED ) ? ' checked="checked"' : '';
! $group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? ' checked="checked"' : '';
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
$template->assign_vars(array(
! 'GROUP_NAME' => $group_info['group_name'],
! 'GROUP_DESCRIPTION' => $group_info['group_description'],
! 'GROUP_MODERATOR' => $group_moderator,
!
! 'L_GROUP_TITLE' => $lang['Group_administration'],
! 'L_GROUP_EDIT_DELETE' => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'],
! 'L_GROUP_NAME' => $lang['group_name'],
! 'L_GROUP_DESCRIPTION' => $lang['group_description'],
! 'L_GROUP_MODERATOR' => $lang['group_moderator'],
! 'L_FIND_USERNAME' => $lang['Find_username'],
! 'L_GROUP_STATUS' => $lang['group_status'],
! 'L_GROUP_OPEN' => $lang['group_open'],
! 'L_GROUP_CLOSED' => $lang['group_closed'],
! 'L_GROUP_HIDDEN' => $lang['group_hidden'],
! 'L_GROUP_DELETE' => $lang['group_delete'],
! 'L_GROUP_DELETE_CHECK' => $lang['group_delete_check'],
! 'L_SUBMIT' => $lang['Submit'],
! 'L_RESET' => $lang['Reset'],
! 'L_DELETE_MODERATOR' => $lang['delete_group_moderator'],
! 'L_DELETE_MODERATOR_EXPLAIN' => $lang['delete_moderator_explain'],
! 'L_YES' => $lang['Yes'],
!
! 'U_SEARCH_USER' => append_sid("../search.$phpEx?mode=searchuser"),
!
! 'S_GROUP_OPEN_TYPE' => GROUP_OPEN,
! 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED,
! 'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN,
! 'S_GROUP_OPEN_CHECKED' => $group_open,
! 'S_GROUP_CLOSED_CHECKED' => $group_closed,
! 'S_GROUP_HIDDEN_CHECKED' => $group_hidden,
! 'S_GROUP_ACTION' => append_sid("admin_groups.$phpEx"),
! 'S_HIDDEN_FIELDS' => $s_hidden_fields)
);
***************
*** 172,204 ****
}
! else if( isset($HTTP_POST_VARS['group_update']) )
{
//
// Ok, they are submitting a group, let's save the data based on if it's new or editing
//
! if( isset($HTTP_POST_VARS['group_delete']) )
{
$sql = "DELETE FROM " . GROUPS_TABLE . "
WHERE group_id = " . $group_id;
! if ( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
}
$sql = "DELETE FROM " . USER_GROUP_TABLE . "
WHERE group_id = " . $group_id;
! if ( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't update user_group", "", __LINE__, __FILE__, $sql);
}
$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
WHERE group_id = " . $group_id;
! if ( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't update auth_access", "", __LINE__, __FILE__, $sql);
}
! $message = $lang['Deleted_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
message_die(GENERAL_MESSAGE, $message);
--- 165,197 ----
}
! else if ( isset($HTTP_POST_VARS['group_update']) )
{
//
// Ok, they are submitting a group, let's save the data based on if it's new or editing
//
! if ( isset($HTTP_POST_VARS['group_delete']) )
{
$sql = "DELETE FROM " . GROUPS_TABLE . "
WHERE group_id = " . $group_id;
! if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql);
}
$sql = "DELETE FROM " . USER_GROUP_TABLE . "
WHERE group_id = " . $group_id;
! if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, 'Could not update user_group', '', __LINE__, __FILE__, $sql);
}
$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
WHERE group_id = " . $group_id;
! if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, 'Could not update auth_access', '', __LINE__, __FILE__, $sql);
}
! $message = $lang['Deleted_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . append_sid("admin_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
message_die(GENERAL_MESSAGE, $message);
***************
*** 207,220 ****
{
$group_type = isset($HTTP_POST_VARS['group_type']) ? intval($HTTP_POST_VARS['group_type']) : GROUP_OPEN;
! $group_name = isset($HTTP_POST_VARS['group_name']) ? trim($HTTP_POST_VARS['group_name']) : "";
! $group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : "";
! $group_moderator = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : "";
! $delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? intval($HTTP_POST_VARS['delete_old_moderator']) : "";
! if( $group_name == "" )
{
message_die(GENERAL_MESSAGE, $lang['No_group_name']);
}
! else if( $group_moderator == "" )
{
message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
--- 200,213 ----
{
$group_type = isset($HTTP_POST_VARS['group_type']) ? intval($HTTP_POST_VARS['group_type']) : GROUP_OPEN;
! $group_name = isset($HTTP_POST_VARS['group_name']) ? trim($HTTP_POST_VARS['group_name']) : '';
! $group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : '';
! $group_moderator = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : '';
! $delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? true : false;
! if ( $group_name == '' )
{
message_die(GENERAL_MESSAGE, $lang['No_group_name']);
}
! else if ( $group_moderator == '' )
{
message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
***************
*** 224,228 ****
$group_moderator = $this_userdata['user_id'];
! if( !$group_moderator )
{
message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
--- 217,221 ----
$group_moderator = $this_userdata['user_id'];
! if ( !$group_moderator )
{
message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
***************
*** 235,286 ****
WHERE group_single_user <> " . TRUE . "
AND group_id = " . $group_id;
! if(!$result = $db->sql_query($sql))
{
! message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
}
! if( !$db->sql_numrows($result) )
{
message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
}
- $group_info = $db->sql_fetchrow($result);
if ( $group_info['group_moderator'] != $group_moderator )
{
! if ( $delete_old_moderator != "" )
{
$sql = "DELETE FROM " . USER_GROUP_TABLE . "
WHERE user_id = " . $group_info['group_moderator'] . "
AND group_id = " . $group_id;
! if ( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't update group moderator", "", __LINE__, __FILE__, $sql);
}
}
! $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
! VALUES (" . $group_id . ", " . $group_moderator . ", 0)";
! if ( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't update group moderator", "", __LINE__, __FILE__, $sql);
}
}
$sql = "UPDATE " . GROUPS_TABLE . "
SET group_type = $group_type, group_name = '" . str_replace("\'", "''", $group_name) . "', group_description = '" . str_replace("\'", "''", $group_description) . "', group_moderator = $group_moderator
WHERE group_id = $group_id";
! if ( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
}
! $message = $lang['Updated_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
message_die(GENERAL_MESSAGE, $message);
}
! else if( $mode == "newgroup" )
{
$sql = "SELECT MAX(group_id) AS new_group_id
FROM " . GROUPS_TABLE;
! if ( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
}
$row = $db->sql_fetchrow($result);
--- 228,293 ----
WHERE group_single_user <> " . TRUE . "
AND group_id = " . $group_id;
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql);
}
!
! if( !($group_info = $db->sql_fetchrow($result)) )
{
message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
}
if ( $group_info['group_moderator'] != $group_moderator )
{
! if ( $delete_old_moderator )
{
$sql = "DELETE FROM " . USER_GROUP_TABLE . "
WHERE user_id = " . $group_info['group_moderator'] . "
AND group_id = " . $group_id;
! if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, 'Could not update group moderator', '', __LINE__, __FILE__, $sql);
}
}
!
! $sql = "SELECT user_id
! FROM " . USER_GROUP_TABLE . "
! WHERE user_id = $group_moderator
! AND group_id = $group_id";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Failed to obtain current group moderator info', '', __LINE__, __FILE__, $sql);
! }
!
! if ( !($row = $db->sql_fetchrow($result)) )
! {
! $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
! VALUES (" . $group_id . ", " . $group_moderator . ", 0)";
! if ( !$db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, 'Could not update group moderator', '', __LINE__, __FILE__, $sql);
! }
}
}
+
$sql = "UPDATE " . GROUPS_TABLE . "
SET group_type = $group_type, group_name = '" . str_replace("\'", "''", $group_name) . "', group_description = '" . str_replace("\'", "''", $group_description) . "', group_moderator = $group_moderator
WHERE group_id = $group_id";
! if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql);
}
! $message = $lang['Updated_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . append_sid("admin_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');;
message_die(GENERAL_MESSAGE, $message);
}
! else if( $mode == 'newgroup' )
{
$sql = "SELECT MAX(group_id) AS new_group_id
FROM " . GROUPS_TABLE;
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not insert new group', '', __LINE__, __FILE__, $sql);
}
$row = $db->sql_fetchrow($result);
***************
*** 290,306 ****
$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user)
VALUES ($new_group_id, $group_type, '" . str_replace("\'", "''", $group_name) . "', '" . str_replace("\'", "''", $group_description) . "', $group_moderator, '0')";
! if ( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
}
$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
VALUES ($new_group_id, $group_moderator, 0)";
! if ( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't insert new user-group info", "", __LINE__, __FILE__, $sql);
}
! $message = $lang['Added_new_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
message_die(GENERAL_MESSAGE, $message);
--- 297,313 ----
$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user)
VALUES ($new_group_id, $group_type, '" . str_replace("\'", "''", $group_name) . "', '" . str_replace("\'", "''", $group_description) . "', $group_moderator, '0')";
! if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, 'Could not insert new group', '', __LINE__, __FILE__, $sql);
}
$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
VALUES ($new_group_id, $group_moderator, 0)";
! if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, 'Could not insert new user-group info', '', __LINE__, __FILE__, $sql);
}
! $message = $lang['Added_new_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . append_sid("admin_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');;
message_die(GENERAL_MESSAGE, $message);
***************
*** 319,353 ****
WHERE group_single_user <> " . TRUE . "
ORDER BY group_name";
! $g_result = $db->sql_query($sql);
! $group_list = $db->sql_fetchrowset($g_result);
! $select_list = "<select name=\"" . POST_GROUPS_URL . "\">";
! for($i = 0; $i < count($group_list); $i++)
{
! $select_list .= "<option value=\"" . $group_list[$i]['group_id'] . "\">" . $group_list[$i]['group_name'] . "</option>";
}
- $select_list .= "</select>";
$template->set_filenames(array(
! "body" => "admin/group_select_body.tpl")
);
$template->assign_vars(array(
! "L_GROUP_TITLE" => $lang['Group_administration'],
! "L_GROUP_EXPLAIN" => $lang['Group_admin_explain'],
! "L_GROUP_SELECT" => $lang['Select_group'],
! "L_LOOK_UP" => $lang['Look_up_group'],
! "L_CREATE_NEW_GROUP" => $lang['New_group'],
! "S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
! "S_GROUP_SELECT" => $select_list)
);
! //
! // Faking the IF... ELSE statements again...
! //
! if( count($group_list) > 0 )
{
! $template->assign_block_vars("select_box", array());
}
--- 326,364 ----
WHERE group_single_user <> " . TRUE . "
ORDER BY group_name";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, 'Could not obtain group list', '', __LINE__, __FILE__, $sql);
! }
! $select_list = '';
! if ( $row = $db->sql_fetchrow($result) )
{
! $select_list .= '<select name="' . POST_GROUPS_URL . '">';
! do
! {
! $select_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
! }
! while ( $row = $db->sql_fetchrow($result) );
! $select_list .= '</select>';
}
$template->set_filenames(array(
! 'body' => 'admin/group_select_body.tpl')
);
$template->assign_vars(array(
! 'L_GROUP_TITLE' => $lang['Group_administration'],
! 'L_GROUP_EXPLAIN' => $lang['Group_admin_explain'],
! 'L_GROUP_SELECT' => $lang['Select_group'],
! 'L_LOOK_UP' => $lang['Look_up_group'],
! 'L_CREATE_NEW_GROUP' => $lang['New_group'],
! 'S_GROUP_ACTION' => append_sid("admin_groups.$phpEx"),
! 'S_GROUP_SELECT' => $select_list)
);
! if ( $select_list != '' )
{
! $template->assign_block_vars('select_box', array());
}
***************
*** 357,359 ****
include('./page_footer_admin.'.$phpEx);
! ?>
--- 368,370 ----
include('./page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2002-05-19 13:20:22
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv13094/includes
Modified Files:
Tag: phpBB-2_0_0
usercp_register.php usercp_sendpasswd.php
Log Message:
Minor changes
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.20.2.9
retrieving revision 1.20.2.10
diff -C2 -r1.20.2.9 -r1.20.2.10
*** usercp_register.php 12 May 2002 17:57:34 -0000 1.20.2.9
--- usercp_register.php 19 May 2002 13:20:16 -0000 1.20.2.10
***************
*** 544,548 ****
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$emailer->use_template($email_template, stripslashes($user_lang));
--- 544,548 ----
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = "From: " . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$emailer->use_template($email_template, stripslashes($user_lang));
Index: usercp_sendpasswd.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_sendpasswd.php,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** usercp_sendpasswd.php 14 May 2002 15:19:20 -0000 1.6.2.2
--- usercp_sendpasswd.php 19 May 2002 13:20:17 -0000 1.6.2.3
***************
*** 66,70 ****
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$emailer->use_template('user_activate_passwd', $row['user_lang']);
--- 66,70 ----
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$emailer->use_template('user_activate_passwd', $row['user_lang']);
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_japanese
In directory usw-pr-cvs1:/tmp/cvs-serv13733
Added Files:
Tag: phpBB-2_0_0
icon_aim.gif icon_edit.gif icon_email.gif icon_icq.gif
icon_ip.gif icon_msnm.gif icon_pm.gif icon_profile.gif
icon_quote.gif icon_search.gif icon_www.gif icon_yim.gif
msg_newpost.gif post.gif reply-locked.gif reply.gif Thumbs.db
Log Message:
Initial version
--- NEW FILE ---
GIF89a;
$//¦w( $%ÀÁÂÂäÅ* #!
,ø8Á 9(
¨Txg
«$ÈH >yZÐmC7àÁô1@Ã
dø1 j µäDôC ñ
/ZPjn]»íâÐê»PpÁð`JaÀ=a
--- NEW FILE ---
GIF89a;
Ot#àî|à
ÅBàÛ¸B´@D
Øx #Ã@á>&`À\44xÐ
`NÌâµIòÂoxD`
{pßöðe$pge @{&
--- NEW FILE ---
GIF89a;
(ò
zäaµê»°
ñ`d8Ð`ä¸
--- NEW FILE ---
GIF89a;
£ÄÕFõFÿÿÿÿÿ±R¸ééé½½»=
©îîîlÉÄÉ
#&2!/j +
<#
-
¥¦'¨©'¬h
4%4#`8±
(PÈ á
|T¤ò¼Ú¯ç¾
>§øýÙ
4´VγùÞçÔÃÿö ¦ 8lHpÀ¾½{÷0ÚÃO¿¾ýûøëë0ÏGÿÿ
--- NEW FILE ---
GIF89a
--- NEW FILE ---
GIF89aC
JDÓ¬Z¯Ø¬võ,Ëa
P£²5TͰcÓÍÀÕQ;tÈ@·TÖ®®M¼¸$¾$-ºyiÒÐOKN½ºõëØ è ³÷ïàÁ{
--- NEW FILE ---
GIF89a;
:7"
?
¹3
Â(ƬÉÊ
x/}~~9©
--- NEW FILE ---
GIF89a;
·¡rÉl:Ð`£«é8ɨvËýi68La³tÏè:V© *É ®Ûïø¼^?Z$q$
%-?~"p" ¡%¤¥%¨0omm
Û P À(TTªQ©
´¸°`XM
'XnÀ ȾêÐe-<X¸ð`Ar¿v,èàxèÔxàлû'°Éw«ßîÝÍëÿ{¡JX@À&¨à6è`
--- NEW FILE ---
GIF89a;
Õ5$ eË# B
aP
ªC1FÃ̲ÞvÚ8jòë×!l=©
àÁ+O¾|yèÓ«_Ͼ½úÜ
ÐO¿¾}!A
--- NEW FILE ---
GIF89a;
iøøøÿÿÿôôôððð²ÍÛ¾ØäVk²éééU¸¼½½q·¹ÐíííÇÇÇ}®ÇÃhq¤½âÿÿÓýÌyÉþÔÔÕÕÅþÿ×ÿÿ±Å¹ÉÈÕܼ×üüüÿ1«ºåêñôÿÿ×ßæ4}¢«Ô]ÑÁËÙ·ÐM¡···x¤ÅڡެܢưÀÇâþud¬¸½¥±áìòÿ÷Öh¨
± ¶2±ÑÑ»½¼
ÚÛ¿=-8).y+ë/%õõØÛÚ
--- NEW FILE ---
GIF89a;
1/-
F4Q@
& +$
^{
@\pìb/pðÃQ
x
ì@` (N °Aå.(\PÐ /\ÀÁ¡h
°vÈ-$8Q÷¿ að¢FxøpƯ°yl
--- NEW FILE ---
GIF89a;
d
¤º»½½&q*¡)V8$$ $ ¡# #Ã#Ù#-¾å1q£ 5{47Ð!7¡#ûF0 áC/
Ð!Cÿ=»ÐãåNÞ`4A¦0^6:uÁ$hB'0¾@¡ÄãÈAhà"B'ì0âÀ,ØË×ÆÕ Ntè
(¡8`*àÀvè
--- NEW FILE ---
GIF89aR
XcàåÎ% y.
_x÷P!`&%Âø
Ä26|@ÆW 0@ "P0@QT @O<°>ða
U\`
qVw$"¥`ÀÂp
+Ì U/°Â7ô
@ ÐA
OØñÄ
(ðÄ ÀAtÁE+´Á
I$1"
Bð¶&pBV (A
H ÈÀ& 'HÁ
ZP JÂH°
WÈB6AQÀ!
--- NEW FILE ---
GIF89aR
6X¦ À#)U¡ f*\±@kÀcÐL@ð1@hÓÁaì$9-ï̬
LĸC÷=ÖÄEÆ1´
´ÃzIJ
¤ÃDÀÛ<´Â y`+ìðm
0iÄШ
A¡'ÄpkòXCZp
I<Áz
--- NEW FILE ---
GIF89aR
t3A
N©°¼A£0"²sóºx¶Ø0Ä
¬EÖ}ûvç~nHX!ÅS;² ($È×G
,ÐeJ[Î>öãçÁ2BÌ#e×] >Ù
-^ v» o DtÉSdÏ&2IâÜí~%ÑIuÖ=@Àd )X A äy1FæöU:/øto ÕGEmÂfäðVpqLWuÆØÀ%d'wA
¤MY4ãGs¾Æ
:Æ
EÅvLyA
$0F1B
<Ô¨¢.zÀ·òÁNðùX°
H$ä`X°²\$@ÅfÐ 8à æ¬6P«·
ÁÛëYu5'Ú1·R-pôÀÂ,T!hd°ppkÝx×ÁÞ|÷ÃßnÂànøáC¼C
l
--- NEW FILE ---
GIF89aR
Wh°¦*R!«!ê¡lrPQêÌÿÊ0£á®xù²ÀóÜp@¸°>7Çæ4˸ì@Lt@RªÂ=&d°$.p´
a)
50ac^ÑB
ä©À
8å
Ú
/d )ne1QÅ|&DEРç *«
¼
묱êç-
FôL
E|2x¥¼2ËÂç* Ûr«óÕc°@
61@, þ4øäo¾ø.¤¯þúì·ïþûJÌÀW
`dI
--- NEW FILE ---
ÐÏࡱá
ÉoºêJ°ç¶A®ë@ñ:¶oypÑ[ÜÑÏ ¹*1G=Få8=Æ
¨YʶÅmã
©i³5ͪ1ǹ<èÊÅ¡?Jçn,åÙà0uM.wº´F8ó,@ÑCøW1
¬Ói±Æ?µô{.ìÎ
Ä%Ø©SÜs=ð¢¢k»CÄj/a5ki"y×?+JÎÈp¯4
I:pxÊä÷êmxöðªI6ic}¨[º´rNQpF2¡¹=úZþ&øùáGK.ÚÆûP¶7YÐ*.ÆT7'©ê|ÿ
O¡Ý.ô¹"¨RxüEz'À
y§ðåïn[.s=B1<~óWª^´
{4RÒÒÑLeµ1 ÑO%Aü(ªÒÏN©$¬zyª\ÚÁ*Ç,±#·ÝV ôªsÝØÛLM<Êßq'·ðù¢"éæcîç
Å·ÚHüìp±ô ÝYý¨[aûFÜ÷
ØúQP±¿ÍÏÙàýÖÎ*±]6Q¿00BÙ
Â19çß8?\U#8æÙ
¬¥ËËsÏ]À{EBu+x/È#nT`qÓ#ÿ
Ç¿Âx
ê}*Ú^Mðïâ·"²Xj%éÚb +ü'
|R;Q^ûPÊrÎkèÝdEu «+éh¤YcY+:E?v)û±RnÅÖqk8Å5bÃÔôǸ¹ûDL£Ü¬£Ú¹msAîü^Û²»3Á¾6@HùʶxàõÄxÂßê˩ٺHï-¯Æ ULå\r;â4Ð]·Ç|c¯¥YB먦Úïæ4[nÞ¾
\¢ˬóíO5 )Õ¶lvzcc>ôTO¥í´»MþcÎÀr\*'ü½;QJfíÕ*
/i=ÿ
IÈÈóÑðÄim<?¬yo¥:hÝ!]ñ18BNF@,zæø'Çò«[xwYXK1mï²B19,zæê|c¡]ø?Vÿ
:è¼qÓñ×ñ>áHø»KÝg}ipÎÐÊÍ ò
H¿z'O¨ýFGCKâ¿éÞ0ðýÆ©!0Ë/ÞÇFSê?QÐÕø_Nñî4}I \~ôN:2QúøßÅþÔ<â'PC9`¸Y£ìëõýE|oâÿ
j
ñ
ƨ!ÊÅ0\,Ñöuúþ"¾7ñ
5øãIÔåb.hû:ýCEv¾½Ô~"ipx6ö@ÖIçògácëËõ#+°ðµî¡ãý.?
]`Een!ɸácô<¿R
ø³Lñfö:º°ù¡ï~ñ¦ã=!/´éîÂÜ<MèÃú÷¢µæ
gãqpAtº· )"lÆ·o-"¾´Ö`LR¡F
øoâÿ
3nàúÇ>µé~ñͯ¥]3UkM.áî"1X4±w
èIÆO¯4Tú§5__ÉâÜ>Ù¥
:+ÇÐþañ[áL5¶:v%À$ántV=¡ü<Ãâ·Â<klu=0$:ìKIÂÜ(è¬{Cø:òæ©¥j£%¥i5¥ÜGæEÁéï_.jV¡¡ê2XêVZ]Ä~hä\è~õòæ©¥j£%¥i5¥ÜGæEÁéïEz~.ßi½ãP²'
OcËqÉ®çÃ?.ìí¤°ñ\_ZyJ±<jj9cËdrx®ËBøpSiþ!iï-Lh±K!J®æ<¸ÆG'+±Ñ¼/'ü+ªjQ<Q]ëw?mä&^Ù<Ì"äcæaÁ~µÖéoxkR¾ÇúÌÿ
pp§p¢(¢(¢(¢¹ßx'Dñ®m5kPÎî®cÀ#êýGµs¾.ðNã]4ÚjÖ¡Ý\Ç,GÕ[újç|]àÆºi´ÕC8º¹Xª·ô9ÔWÌ^8øEâ/K$Éj:Xä]Û¡;GûkÕ~¼~Õó>xÁÒÉ2BÚ9vèNÑþÚõ_¯#ßµ|Åã^"ðt²L¶£¥Eݺ´¶½WëÈ÷íEcé?üQ¢iÖú}¥åÚÛ1ÆbFH9#$ÆÒþ øFÓ Óìu
[`h²Ç8þÝOO^Õ?þ#hþZê
æö¦ÊÜÈ;øWµõPU9ç>cñ5íñ +Ï9ûKãÿ
l®+r¹#nI }pEhézI§¤·bXçVMÄlÅ#Ô÷§è^ãIçQK.®dááÞTÆFuR=B°Ü*O¢ÿ
ïÞ
CĦòömJþÍżol"ã>b[nâyÆx¿?×7àýbïÅ:ê±Ï}hL^4Ý;\ïïî|Q¡Z½NÌPyúw;+Áé/ô!«[j:õN³=ÆîC~¢»½"úkÍ2)¥BÒÊ̽FJï4-JâûHyã/.çFt
+^º
쨯ÿÙ
3´c>Ò¹vÐ.}:ÃíÅæ¶)W=p;Ù®»*+ÿÙ
è4«°´eÃÜLæYÜséì
Yº×'Ò#ÐůÙ
ÚÍË9.É¿·EP¼äç§zÚv4ëu[»hôè£Å仲ÀîÏà
ýécÎ~_öò=rGzçõë;»{ø5Í:q,1nïÏr6çêr@=w0î(®{TÐmõë{aª\Øß*íØ«mÎpê
¶zu=
`j:5§î~ݧj×WÊ'{v(Ûs® «Ó©+êÃMñ\ÿ
ÞÒ¬ÂÑWW¸C,Σú{
¾?Ñ×e^EQEÿÙ
l§9g)6äÔ+¡ÒôOIn±M+<=ÄlÅ#Ô÷¥Ð¼#ÆÎ¢]\É-ÃB¯FuR=B°Ü*O¢ÿ
â¯ô¿
+ñÜZÓp_RHIÿ
+¸°Ò
Delåª2ÄàÆ»/CzzBó¶íÎä@ÅPnbØÐgïÖ»ÂÃOÒR ®ÛÌi%
£âS$øQv3ßïE[ÖÞYâH"yüÈ _¡íWî,m'ºâkX$#û¹0Y>ò+ZóJÓ¯5KËYî 'ÉXU> ùXÂÂÖ¢ëö]q*ã9þ!ßñ®[ÄD|U¥ÄbCϦÑFã\-mÛân`Ã{» ÛpÀ:7ã+¤®Î½:ÿÙ
³Çßåb29ô¢°5¸bm~ÁhRlT¨Ãö½å¼KGÅZ\F$1Üñ:mg£âükÏüqmø
Ûcò/¾[¸¶·
â´{è®üy ñ.xÎöÑÛ[ËrT0Ò,jKpW`(®ÎîëN¾c¸·½eV¸´HaлMB÷GÕ Ho-57Hä&4û¤*áPסk·õëXõ?_8eG³GÔ"dp#Þ¯Z,,
Y^psipGÍÃê{µNÞ
Û01iº
˱»aó1ÁR2GSÔúÖm¯ì}]
µgw¤iñ<vÖº¢Èå´û§fcÌò-+SðÞo,ú,Ò¥i4}BWÈ
ßØË©Yx+Ã6öpüá-¡Ì$/ ¯>ø+_JÐ.mÝXÛù¹MÑ©
ØïN=:õº
ÃÚv£§¼º5Ê2n,+ã¸8î:õ»/ø[Bñ×4x&I,Ål»$ü@Ç9ÉåMJçOµ³½¼-¦Á-¬&=Ç~ÖÉ7çY×zv§ê}
Ò{f{|ªÑ$.>nNy"±oôÍFñ¼gðnu£XIj$E<E\í]¿?'',1Û4TâËKóÒ#¦D\´Ï ÎúÕhXhFæ(°³%ìÀ઻§·JÓ];ÁÍ}kl<¦æ}Vm7q
>S³oû¼·§½5¥ÞZ ,1ס#úU½;Bе+¹5´aË.61^¿
ièð¹£Ç|¾Óa4·ìèHÚìqþÎh¬ÝVÒ/$Óí/Ymà;cVElg ãµëÞÕ§ÒtíE£³¶!bFj2ÀàsÀÀ¯'ñÄ/ø#ÅWÞе§K±(¶Ð¼Kå©Em¡Km<
+/âÝö¥ià7D;KϵıÆÅ\*åB·}ÄÏW¼y}=´ÞGwkËÔñÂìlL¦×CmÏ0ÁkÓnuHtxÃ#³½µÈGew8µy £÷eu}»¾_qEUø'©ÝÀú½ó]\Å FV1K$»d#vçëáµíq¨@..¯£)m<Ïüm%sà÷Íméz§4Vg´ãPâQ$Ý<^æ4m¹äààõ¢¹¿Ý\_xãP¶êæíÊ#FPl[gdr@ëï̺
Ú¥:a
¥Çc-£`êgq<æ´4#A¼S¾k;ÙH'
à%q4o¹É<ÙïEzÿ
p*vìxéVSÄf¿ÙÆÏSÛ÷KömêXöZ8Ê1ÐûQZ&=Ó\ÉgzÒ±RÇìm½26àãÜTwáë«ç¼OÔÚg(ÏþvÊýÝË·iÇlü_ßê²jW:F¿%̯Ëÿ
\ßj:¤>n¢·`c8
+
öÛKµB|Fοs=s
rÚ:ÒѬ§;1¨'ý^î¹Ç
Çÿ
õûÊݱEjéÇØc
o
èx#û*ÔÛ1]|?ð>ÒÇÒÕ?Âæo<A«iiö¬¶ð±«"±®2A8®Xñ^½áÝV}'NÔ;;b$hÊ©
äþÝËgâɬî.nîa[vw·uf
Á\6Ü¿xƨèqÁ§kÐO(u0¿È°É3!ãGR3â÷«º®¥ë:~°Ö,kkIn\,a»oÆy¢½·û^Ûþy^ÿ
å5
A¿ê\k´òpmÁ
Npc=NOëì+ε¿ø?Yº¿¸ÿ
èH±¸ðî«]x^ËÄ:ƳhW7ò¤lò2+lRÊ~c»
ã|ÿ
²|)¡àì«oÁ_?¼$Aði
²
ÍßxVÒ/$°´¼d·íEdVÀÆq ÅpÏõïêÓé:v¢ÑÙÛ±#DµHe'<z
ñ|BñwüQ{á½Z
.Ä¢[C$JcRÛC:Ú7`x
oþ"½Kþ/ùá©à²ãÿ
0
N1qý)5}CÔuFð¯¬ÎÚKÜ3ìRÛOÊIÆ3Î3ߥ.§ø[/iP^i¨n¯lYPÄGÀ
üíÚMG¦I£x[/hVwB*ã¬Á(bGÌ£ËàÎþví5¦øSĺÜ1xsÂZMîæøÙ
7RwAÎÉÏ)á
ôC¤Þ[I¨Ø©¨Z*è"XøvüÁÀs2sÄøNÕ44»«í«!uoìæó"ñ¶=0E$ÄFNJîµ9luK3m*_¨Ü+g0éÿ
ïëÕëèz+ðÏ
<9£Ê÷pÑêУMgDºQFG
ªª t
xrÿ
ùþ¹½_ÄÓ¬ç¹¶Ñæ»$Üdù1û|Òä}ÐÕFúßÃpYKwkáqH]¦xD1?Ú|ÿ
]Þ8>LÉ4q
ÉíØ*vsM
¾ ;-÷ÁÆA¬ø-tYnm£@±ÊH꡼7²m#¸Ü¤géÅcYAá;û%ð%pÜF¢i³Nex¶0%wÆË¸w# g´ôÌÇb¶Ï
4<È*ØÛ1]qøá,ȵ¥ûuO𢹻ïjÚEì¶ð±«"¶3OøW ¬ø¯^ðîq¤éÚGglBÄ>Õ eð;Õâþ/ø
âïø¦÷Ãzµ$]E¶H"ƬÛC:´nÀà
à
àSy,h®%Ób¼Q[ÞG&×VÛc(¸Iù99jÅ>o¨è,õ¥Û"¾Í.à 7²±-û¼ãêj{{¯YkW³Óu«kÉ(@¼7èìÏûxLdêþY^ÿ
oþ"6±cõÓû2ãÿ
Âÿ
êøª·Ótí$[oì5hgâÎS
.Ç»ÈÊÊâÍbmä]>+Hõ téÒÞXIÌT¡ìn
@U¶ãì´·GðüéÚ¹½ýl%Ö"v¸ëvÐ.
ïëÕëèz+δ/OÔ>$øöÊöÆÚæÑ>Ŷ ¡W|ÈüÉ0¤`nuWoV
¨ `
ùþªªØ
1õ
>1k{omÈ(qïÔG¡ª;h3jÚE¼v:¥¸¹SíxÎÜr9Óf¨ð½Ç®üGá«]+[Óì~ÞÚ!¶îc, ð7)ätÚÃ#EoÀRk+[Èn[$ò˵yþ]¹VU<¾½t6e¨Ûß$úl^Cy62Ì|7+ª0}{k¦Ó
?LÐtjËVóB·û#ýIê)ÇåïXãa´7b:"¯%XOeaox×y$ðH¡¶Y
ÍÌ»ßuÎ5µ¨i¾ó<[âéÚpkkè#gÜZZ ìÜ˽øùG\às[Zá3ž ñ~§¶¾9¦x
Àµ¥¨
ÍÌ»ßuÎ4Wmà¸&µð/î"âÓ-HäR¬"PAAãÛx. |áë{¤x´Ëd9«#AäxÅvÞk_øzÞâ)!-2Ù$E*ÈÂ%y1EnVånQ_0xËþNÛþºoþ
|Áã/ù:oû
é¿ú5ó¿äèm¿ì+¦ÿ
F<BÞa
<±äõü¤³ÐmüYcñkd
M¼qóHPIcÉûØúõ£OðÄ2×X{íÐÙÃÏ`Å]°[ï=ëÔÿÙ
¿áE!ðþ}1øSO
4<ýl?í¦·Ãÿ
ñ|Cño<U}áÍZ{}.Ä¢[ÂðE/¥¶u'h,@à
óõdGIÖ4&-]|DÆÊw#o§Þ²ËåâM§1²ò #ÆH¢¢×L)EüÑ·&ÊosÆÌÀäÒÃD¶·º±'6îm6ãå\<¼Àù$ãUÓ´o
ØYjξ'íf÷Ðï?v(ämfGÎÀ±Ç&m¥kvnöûÔ5ç÷SÚ§éz% nÁÖ$o4JªÚ\¸hâ.¹ÉÈÇ_Î-ÃþÑu§ÔÕ¼O<h¢Iáû/8·É9äc¯ÔµN£håïþ
oþ"ÚÅ_#R?÷¸ÿ
ª¡ÚH\ã9Á
iqÊAÁÀg$a¹
?ROØ_Ëj
¼û`ª
ýiº
×ÃÛô©Ï
tç¶¾±k×[& ]
7X«(÷U»
/L¾²YM'9W`pA5¥¥hÚ«¦¥Ïö%¼ÅHhØ
|ßðï¼â-+õðlî^9`{dßÅYOAÄ¿×õm"ö[KÖ[xNØÕ[hÆq ÀÍr:Ïõïê÷N¨´vvÄ,HÑ#íRÆXy_þ!ø»Á*¾ðæ
=¾bQ-áx"ËRÛC:´ ð
P
¹ç+ÕÎ<gáÒ89?5ô¢»jë«£¢(¢(¢(¢(¢(¢¿ÿÙ
µÇýsy¾øH̵¥ãþ½Sü(¬ÄÓô§ÒÅòéÑ2lÛöög?bǧø~] 5DÑmYaPë/ãñ®Z-7ÁsøBÃá=)áå-Â,H~õÀ;õ;¿J*»C¥-Çý
î®Û¾æÿ
´òA\á9WZÝ_j·~9û@µ¸;-a1¯ÆJnÆÐØþ¦¼ZÆÿ
ã~'ÛÁ'Ä=P¼1±ÌG, óä ¯ J\*ï<nÇ4WCð
B]kª Û
Û½×SH½{çý,Ñ\* B®ÐH(ÅNÜTÅtÚ¿mü=«É¤¥ñk$KI%·¼Hà"U¢rP%X*Úi±x(ïI6ªä¬ió`Æ´£Ñàñ¥¼Z3Y,köt<8
§=xõ=«zÙüR³·×]ßKHcûVÑb@¨KdåaÚÿÙ
é¿ú4WÓõôý}?EÿÙ
5ÄÖÞk 6¶ÀnoÖ»mFÃÂPÞxË^ñFa$6º1µÕÅM¨QÂÆçès_?×®ø. |áë{¤x´Ëd9«#AäxÅz/à×À¾·¸HgL¶I#J²0AAW[à¸&µð/î"âÓ-HäR¬"PAAãWÏ2ÿ
é¿ú4WÓõôý}?EÿÙ
Ñîgf¨Ï~zùþ Õï&Ó®bÂsD$.äGàQñ.¡q£ßArmíe·YÁÂIäê
Öê-WðËjgGY$ãQÜKãFAIÊÐM:Åéͪ¢ù)
ÍiÎ,îYÎrÉþÉÇÕã
oUðÝÎ}ogÎ
Ô«¥¶-V,ãÿ
w/OMÍùZ»¨øN±s¤_x~ÓQ!ógÚw) ©è»ÿ
Êò1<ù`2I8vóóýEw©Ý[~ÊÆÕY x£?(pÌl¯Z¥ªk7Ml¶lQâ&H 8A vF#Û)×õ¬?øRÑîlcѤ:L2ÛÖÐâ12Ë$nWÁ1ðp20qEY¾Ô-í.
£[Ͼ4°]4&EQ¸úõ«·m§]=¬îL¨-{k×Ì07q߯¡£¬øÆËA¾mô»ÇOl^êÏT{Sq.õU<ã¾r9Á(«ivþ!¶éA´5òR$ùïøÕû}×Åö_®l#
>Ïüà*õ8ÏSZ°ø§Úë#v
¼bÒHÇ9cÛüh¯ÿÙ
Ĩò´ÍIÉv9<úUM
ÛÅÖq_n-0aHÞV° ls¸òÇè0;U» Ù|KÓíõ¦îÁ!Sk/;Ý>ÕbÙid;åÏ^µÿÙ
Ì×ã·ÄWíHöÑGk+CpPL±ð§Àl¾Ø¨õß.â§Å9
¡K,xÚØ"²o_ÁpúÓL¶»!R=ªT³9cÀPóÛ
ÛW¢²±;&HÏ%
«ÆÜ¶2xf^3vsÿ
Ën'ó[¾´w\(t¸ºyî$¡¶(d%*
ô9Ǹª¯yáæºDÓS챬³;¡N0wcä~tSÛì9¡éR·ö:c"ÌeCzñ«¾näÒWr,)*ßtýj)±þì ®ýËOûå}3JaðÐëÿ
!7*&1¨ vÛò¦ÿ
ê{ø1ObÒ/°(x¢iÞ«¢G2ÂrCÂRêö_ë¾áCDa%º8ý*ô»M[Å_
/Qd·xº7FÂ#
üÀ`VçÅÍÌø]F8ÒÍ9ãÖdZ6Þüz}=(¨ô _XÔåaËì'ò¨<)ºok¸ÃH°±ú¬ÿ
rÞ[_ô«¦ø[hõ²Cgqe#ëÛüâµ'ðß<XöÖ>*MIEhì·n¹+ÐôÓЪðÁ|5é4ù#YA|®1ëÚ¨ÚÚêĺÄEÄQL Ç2å$èqÓ¬]?O×eøâɼ9Ì
hn#ÝÊS¡Ç#àz)·:v¦Êï<),תþS|¨ \g íM¾ðþ·$SËpÜ^_:Ç!H{ã=nÔǼUqg¨\Ý4ú¾±$p\IÚ`xÎ åW·AÞ(5ëhþɶ.1b
¥\ÃÅvßÙ¶òYIl2±Ü9!Ñ}1íøÖ§þ"hºwö¥Ë§RÉà ¡CÛÝh®?âv"ðîlb.YôÉÚiu
=/K°´C¼fw<nb95ÖøkÃx[L±Ó s!@í$¬9Î cþzQY«á]ihvI!v±mÙÔÆìN}^!dc_³ù£nÞÙã?
jï<ÆO±¿,`ÚG¯¯éE<ðžáíK¶ù³71Û]_N[H¬-ÔîÚêNÜr«-ì[XÆÄÄQQËà¿^Z&q:6¸üÀAQÓ¶ãCY÷:6ªä6s ¸Gl½;b°ï
寷ÚëRE!%ÜHÆ8ñÇ Íè¾Ó Ñô4¸ðOV$äïk"Ü;Hé0"@rr1_?xòóV×®ï¯Ô̯ó¡lÇpz`qEkíÇÖµ-à%ÀU%»
Aî¶IùOp1¥ÿÙ
ÊÊåSÁÏzN2i±Ë}ánÞÕöÜiW;Õm
3m`ASAÎA]
µÄwvÑ\Dss]Ü7öPÝÀId¹8=ìk¿Ó5}_K¶Ô-.#&áìGb:Ø+}.-bÓY³g£,+ò.Óøpkû.-fÛ_´ÓÜ´lØåvOà6欴¸µñeÁ"Iõۨųò]§9÷¢¹ëYHÒÀÅ-µQBT;\çæW£/bZÌÐZF$væ)mìⲡÚào?0ÈÚ½}j
¬Í¤iG`NbÞÎ(¡*®Æóó«ÑÖÔÒà)â
B
-nNòI$«Fst:}
jipñ¡ÌÖ·'y$U£9È?º@>µ4¸
xP
ÃfkK[¼I*ÑäÝ aEkh
c²?àK}3úZS
ÔCýZ^L#únÉÿ
ü¸bAäÏÏõu?
àÃ-äs\ùf²d?ð?a]Gá&1M<3ÜÏ1)Sÿ
±V[A#µ[Óô?êvKukdlÌ:20*ÅXlA`ÕoOðw5;%ºµÑ 1³2|ð²0*ÅX` 0Gj*Áðþy?ïøWFÝ·ìQç®3S
¿'L
íH
0¨÷äÓÒÙQmâ
½ ·<CÉçÞ¢M6Â8¢,8dóbE@GçæO#MØ-à$ÃQÁ(gò¦ÛØYÚ35µ¤³aIüª;-KÓ]ÞÃM³´wf°ô8S'ÓìîdOk®
Ò°åȱ÷=i,¼ ÛX[Á=wSG¤È>iX8îO?vãþ=¥ÿ
bÓu(Tæµ;Óòßøùz*[%Û^F$
FqV7|-§xêÚî5kä´çɳ3z¶TÞþcâ#)©Íä!ûÒ&7µ'>Ý«JÖöËZO§êK,CmÝN¡à{`ÑVô»M;@ÓbÑt´c_+wywýOAìØf´ÓJÑ&¹aNå÷yXtúu=
ü¸bAäÏÏõzþ²¥Ýì&lýÇtý3X·¶þ³Ë¼¸·ió²M¾B~ɬ{ÝÀvrl½OÓlÓ%cô$±4Tºe¦«Å49Éå¸2º6Fñ©4Ý#ú¬s=ýÌ[#xØ6ÐÝÑüj]7Â~Õcíth¿s'âH6
´7F
èÀãìQç®3V|-»oö=¦ìg{QH|?§ÿ
éóåëH|áúZÿ
U$.WÑm Ðס49«4 CEyÍÅìWSG7®Ê¸â¼GQ¼ÔaÕ.â
D:¦C~òOu-fÛĺ¬ ¶òd*ð9(¯MUÒÝ¡¸`Ìå¡ýÕÉÉV=¹'ÕíPÎmvÂ;7ÞsÂ.ãÁuõÜ^K
IÖ.YÞK+¶â8÷±c¢Äí'0:J©6~º¥Åæuewao>&Qê$®ÐyþQɧ߮¥qy£ÝÙ$W_>6C¨Æõ
ËWh<ÿ
*+_
OûjRj?éîÀ¹L ·a,}óÕk
M¦Ú±ÔÊê.àÈÖðâ
yeÊJç;séÔR$1F
ëMÞUV(cERJ
P
7¯ÞÀùº¾¦£[;hüÍD¾gß»ëëÔÒUAá} X2èºp`rµLùT?Ù6
{*KË´Eh-¶Ívà àíÜÕ=GQ%kk-·7î1(s´ä}Õ§ðÉ®{Zס·G±Òö_k2®Ø-b;¶Ñä#î êIôÀÉâ|:%pF
Èê 3°å:-¿tÈmb[tD@+\ËsÖËÀ
µ
¼ÙGu4Q*Iq"üÒ°
±V[A#µ[Óüá
NÉn´hLÌ<,
±VX Ú±ÿ
bb.%U÷¸·æ§UKV³áæ»´tsu*Û´1ÎGÒ¥<
ÞŤê61é÷r<¡1¸ÂÊ0[sdç<QV<1áËoi_bGÞFYïHÇ¿°í³á[xcJû<Îò4²Ìÿ
*v0 A ÓÌ@i¦:+>æx`ZY*Iq·dPÇÑ;q÷TN+&ÿ
H¸.dvsÃÓõ¢;hã}ãq#¦NqI¤QHn$}ÝÍ¿Jl6Ã(ob¿s{éE#ZDÎXÁ9+ ¤{(]ËØ',»¸&M6ÞI>Ö9hì}Å=X«tWÿÙ
ÔEyyÌBá£9f0Pàãò(¦½åÆã"mòÆ~R:l·Yig¹ù
ò@÷õ¨ä¿½*÷QÄ)¸y`3ÔçEXû|_ÝʬiCýÙ?ïµý±oýÉ¿ï)²iòHÌÛö±Üñ!Xûó]Òi]ÍòämÒB$!÷${÷|Õké·3Èî'ÌæIVfÊÇ©esÜt=ÁÉ¢¤¸²áÃé w#`éRÝéÐÝÈ%-,R
ÛæDåI_Cê*}CD¶Ô'[âÞà'ç[ÊcfLçiÇQûc&rÚB¶ë®y' úç×zXÛÅjѦØÓÁ9×=Iäòzæ¦J³¶°Ê¼¸#$ II%²y$I'IÎsE,vñƬ ¸a=iÑÛE:[xÃ9&¤ÊREÁ0aÙÎKOÖHíc÷Ä9Å$vE q¸÷w6vý)°ØC¢A½ýÍìHO¥i9b%sÁ¤{(]ËØ',¹àGÓmäíc1ÚÇÜQSÕ·EÿÙ
±¥ëzµåö«´77öËsÄ1ùbEfeÚËê8 ôã¬Åup³ªËµÎ8ÛW¢º¹KY2HÛ~UÆÓZ±]ÞEsܼrG3ìÂ&
cE×¼¸É6yc?!õ¨Þöëæ6yK!=OG&¡zUî£1Sq2òÀÔçÅcíñuÿ
uËë:(£¿y v ЦrÀg'8ïíP§5KÝ.ÖÞÞ+xui¯&³VBÐÆbݹÕs 9'o%%¶©y]Ez$°Ä$Gm #væ
júÍ/ Ô9ç·O.Á $0ÉÁÈëéô1
:RdÆk*-2ÑcO±°Û ¸¾kاÎ
q«
h±Ï§ØØEoÐ\_5ÌlSçJB8ÍoIÊñeõ`çÌQØ1e?Oß5\Ò£ò¼Uyd;'ºóvcOÓ÷ÍW4¨ü¿^X¦=ÖõæSôýóQ].¦;£q.$ ôÎOëÞðÂì.¢êã¼GôÝÿ
ùWãÏüÿ
rö<f´;FàcEH:sÖu-W5s6¦ÑÍãGåo+Ѱ'ã$ñ\
ÍÆ¬ö·:²j@d+kµ|µ
OÊÃ'Nsϯ;º¼×%Òµ.³5´vK¨aA0È6î$
äç9<c*Õãß^\ùQO%¢¤håP
ÌN{Ðt«²jñ·ækäÛÝì[9É# Æ>¹;Ùu]sX{$¾ºÒ"Öü¸6dgÝKò®6àwÎ{
*5¼Ô'ÓaÉåÌó<Mpr<Ó'¡¨QÔîtËhÞTÒ\Ën÷j£æ »F0ãÅUZÖoô3t`{û)5$EÖ-ø(Ú¶ã¦8l(·º¿³KØd®|¨DÈàeI$a±ÔqÀÑ
ö¥¦¦¥nò½çÙíh¥¡%
OÊÃ'NsϪ7WäºV¡âEÖf¶ÐÎÉcµ(#f9Ýļç'qEjhÜÿ
ËBÒô븳°Û½W_î¯÷G°À¢ìmdÎh¾s:\zûÒI¦XËr.Ö6Ù+ÔûÒM éWÂökà0}ì½Xtb:`F(«n´h¯ÿÙ
èF=óEtPÝÁ<Ì.É2äàà×Mmmuk
Äs/*+®HdW_c¬Xj}µì1ù7,©¹;X2;+Õ좹ðstek(úãDÃ*A;IÜsØk¼²çÀú=ÍѬâþãFë ¤î9ìc⬢¹øcáÛ«³+ZGm)3Æ$G_Þ*A;Y@aÞ¯§XÛiúºÇcajÞjÆZ+A¹ùÆ<ÙH-ÿ
d%Nw2®~fõa*"]X½kH´Ë¸ds1\î¹çæSÃ÷^ñ¢öVº5Ô2¤&bgT
@*?
Ï?0¬ê¼s«Í¦i~)â·kkW5
t¼æ¹û7"9T2¼àe`x!p9õ4Vò}¯M{{Ö[{Xá rbüäm9
é
uÛ«¸¡" òî°%ÜÅXAúÁÞÐVßÄ·ö¶×ÖÖqÛc f.Ì«Ñv¨äúýqðÁ±é5Ôµ}6ÃX±ÒÇìf=m;¦>àU^N9<g½â×ÃZÄRX¬ætqÕX! þuÜê!¢Ón¤BUe#±
¾B¨SÇÍÉïÆ)Z2:.áEºMÖ£máÍN;ëkFëL[qµBÉv+àU8êAïÅst³Å%̶®Ñ4Ê0AúàÄióÃ+ÑuM+G×´¸4MV+XÊ-Nì¦ÚYv©;[JºØõÅfY\ZZ_Ú¥ÒIcxvùò`|d`u
ê?[Êbx§¸þàË!üZ±®´A)ám®n?¸Ò4òÃ%oOÓ´}RÉní`c3/Îb¤pAÍ[Óô/êvKumdLÌ¿:20*ÅXlA`Õ½?ÁÞÔìÖêÛFÆÌÉóÂQV*À«`#°|=§ÿ
B¨ù®ÒsHaW¦yj+~wfñ&¡
þ¥®E®¢#³ØIå5¶ÀAÙ÷6su¯È3©Ü%Ä÷Ë|.B±nÚbÇ\}ݧCî»'ß4VYÖnnü-¥.¯
Íõ½Ü$VI)´±?ÅÄ©ö©&ÒíBI?
ÀvàUÂdúõÅ nÆÞ7ãNúÔUoµ_ÿ
úcô¢¨ÜÏwÔÉ8EvÛ<WjWwðêqBÒgTÀã+ä_jzÅ·õk{W[Åy2DN6 cð¢½2)WJvá[3S÷W'%öävÇÒ½ªÓCí®ØGfò3ÛÎxEÜrQðàx#¢¾¦µ»ÂSKa¨ºÃ¥Ë;ÉevÜGö,bôR¤àÔrUÒµ8&º].úÊ++Zpe
¥hÙ°X(£·6I<±â MÔáét«ûìn%iÔËJcfÁ` 2ËdË*htýF7º>¡`2´êdÌQÁB²ËdË*þ¤.m"ââi³NãØñÓ°
H0àyÈjâÆ¡xØÉ
°Áh«[G1Ãí5
£=
í'£9uG©ü2kÖõèìtúÌ£l±ÛIèò÷u$ã¦Nèt; 7deP¥ØrĦßÃ:\6±E%²M" V.@äsÖeà=ÞÆÞ®¦%I.$_V;ÏãE^¸ÿ
3;Ŷa0À `r$@Ëfxo²x&k²×¶Òé2BîñíL0009CÉ$@ËVÐ<4|ofþÕôfI$lÂaÊp2NH
Àph©<Fý<ÛGñó!õµIãÓþËçÀ¥¢4gÕOP~/ĸbÿ
ÍÓíî´xíe»GM·\<ó®Í¡íÔmÎâÎ ÛÏ$ôàQ]¤+Y#ÜI³ÉrÄ}ðEuz^ié-ÚËÒ³ÊÑî#`f, ½nè^ãIKE. º¹[ySFuR=B°Ü*O¢ÿ
ÍðåÍ®³§K©øm®ì)L{d?+°¹PÄÈ÷úVw¬5m2mSÂy£Ï¦1v[b®@ç¸ÇZ+ºÓµïl"¸r±»3÷Xù]æ«G¨iÜÊR)X=ßuÔ`3Û â½@ñ:¶myrÑ[ÜÑÏþTbzÊp{+QÐíµ&óÃ÷Ï,JÏÆ@f@ûÔ®A<v5ÏÝhvÚ¾{á÷!æ2/3z2ä{)ã¨>¢¹¸´[]GHÔ|©<°<s;®ÂåËæFéA![=2(¬o
hW^{:5JÉp÷SY*àýì¯n:ËðîqàÓsb
l®<ÄË9\·$>¸"º=/@I4ôìKò³Êɸ°z@>õ«¡xF+&;E. º¹[ySyÕHõ
Àph©<Fý<ÛGñó!õµIãÓþËçÀ¥¢4gÕOP~/ĸbÿ
Y-øn=ÿ
ø÷X¸ÁxÃUÓ<E%ýÇiv×W0¥¼<W^`i-¤Gc¸Æx=öÙ¨¼=fþ+ðå³NÖÑÝùó²¬Ëk:ܬÒZ¼,HÈ`À± à´7þÓâEm,¶mÛ>Ñs¶7[iÖågÙâby,8ÇÊAÉ+×ô1\êQõbUl´TgúWiáÄ0êÄKþ¬LF(3ú®Âh`×üK
©ûD.@è$1
ßøèJ+nºë(¢(¬ûø%YòÞè»$utëǸ<©ë+T¶;õ+H̲F9¡_½,yÏËþÒë;×?®ÙÝÛßA®iСÃul~xs·<oSë¹qEyþ'5MRæÖâSq$RÇ2Ê-J"!YcáÉÂR; no+ñgÃåñ¯{s§Ý·uq
ÊL$-
F²KÃä
ܤs´·-wgoâ};Ä:eâtÕå[ë/Ör¬QÆhò$1+ÌIVÚæ+°·ÐômW7:=¤v×rD!ÖÍB$ª3´º\?xÛG¥h&±çè¶A$B ,¬T"J£;K áväáÎ8$sÀ«Ío hÖí
Ö%Õe@ÚnD °È«ò ROÎqHçEt}¡³¶*ìYÉ+
§°Ø
ét«°´eĹgQÎ}=G°ÓxIIÓÝneY¯nek©T`4Ø{*
Q좵W«V(¢(¢à|ÿ
|
|
From: Paul S. O. <ps...@us...> - 2002-05-18 23:04:35
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_japanese In directory usw-pr-cvs1:/tmp/cvs-serv13461/lang_japanese Log Message: Directory /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_japanese added to the repository --> Using per-directory sticky tag `phpBB-2_0_0' |
|
From: Paul S. O. <ps...@us...> - 2002-05-18 14:48:21
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv17598
Modified Files:
Tag: phpBB-2_0_0
update_to_201.php
Log Message:
oops, now that would've been a problematical oversight :D
Index: update_to_201.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/Attic/update_to_201.php,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** update_to_201.php 16 May 2002 12:32:00 -0000 1.1.2.5
--- update_to_201.php 18 May 2002 14:48:17 -0000 1.1.2.6
***************
*** 24,28 ****
global $db;
! if( !$db->sql_query($sql) )
{
$errored = true;
--- 24,28 ----
global $db;
! if( !($result = $db->sql_query($sql)) )
{
$errored = true;
***************
*** 37,41 ****
}
! return;
}
--- 37,41 ----
}
! return $result;
}
***************
*** 434,438 ****
FROM " . THEMES_TABLE . "
WHERE template_name = 'subSilver'";
! _sql($sql, $errored, $error_ary);
if( $row = $db->sql_fetchrow($result) )
--- 434,438 ----
FROM " . THEMES_TABLE . "
WHERE template_name = 'subSilver'";
! $result = _sql($sql, $errored, $error_ary);
if( $row = $db->sql_fetchrow($result) )
***************
*** 458,462 ****
GROUP BY topic_id
ORDER BY topic_id ASC";
! _sql($sql, $errored, $error_ary);
if ( $row = $db->sql_fetchrow($result) )
--- 458,462 ----
GROUP BY topic_id
ORDER BY topic_id ASC";
! $result = _sql($sql, $errored, $error_ary);
if ( $row = $db->sql_fetchrow($result) )
***************
*** 478,482 ****
AND u.user_id = ug.user_id
AND u.user_level <> " . ADMIN;
! _sql($sql, $errored, $error_ary);
$mod_user = array();
--- 478,482 ----
AND u.user_id = ug.user_id
AND u.user_level <> " . ADMIN;
! $result = _sql($sql, $errored, $error_ary);
$mod_user = array();
***************
*** 521,525 ****
$sql = "SELECT user_id, user_timezone_old
FROM " . USERS_TABLE;
! _sql($sql, $errored, $error_ary);
while ( $row = $db->sql_fetchrow($result) )
--- 521,525 ----
$sql = "SELECT user_id, user_timezone_old
FROM " . USERS_TABLE;
! $result = _sql($sql, $errored, $error_ary);
while ( $row = $db->sql_fetchrow($result) )
***************
*** 535,539 ****
FROM " . TOPICS_TABLE . "
WHERE topic_moved_id <> 0";
! _sql($sql, $errored, $error_ary);
$topic_ary = array();
--- 535,539 ----
FROM " . TOPICS_TABLE . "
WHERE topic_moved_id <> 0";
! $result = _sql($sql, $errored, $error_ary);
$topic_ary = array();
***************
*** 548,552 ****
FROM " . POSTS_TABLE . "
WHERE topic_id = $topic_moved_id";
! _sql($sql, $errored, $error_ary);
$sql = ( $row = $db->sql_fetchrow($result) ) ? "UPDATE " . TOPICS_TABLE . " SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " WHERE topic_id = $topic_id" : "DELETE FROM " . TOPICS_TABLE . " WHERE topic_id = " . $row['topic_id'];
--- 548,552 ----
FROM " . POSTS_TABLE . "
WHERE topic_id = $topic_moved_id";
! $result = _sql($sql, $errored, $error_ary);
$sql = ( $row = $db->sql_fetchrow($result) ) ? "UPDATE " . TOPICS_TABLE . " SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " WHERE topic_id = $topic_id" : "DELETE FROM " . TOPICS_TABLE . " WHERE topic_id = " . $row['topic_id'];
|
|
From: Paul S. O. <ps...@us...> - 2002-05-18 02:20:14
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv21467/admin
Modified Files:
Tag: phpBB-2_0_0
admin_mass_email.php
Log Message:
Well, after accidently mass emailing members of my own board (at least twice :oops: ) I think this is behaving now ...
Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -C2 -r1.15.2.3 -r1.15.2.4
*** admin_mass_email.php 17 May 2002 21:42:26 -0000 1.15.2.3
--- admin_mass_email.php 18 May 2002 02:20:09 -0000 1.15.2.4
***************
*** 118,126 ****
$email_headers = 'Return-Path: ' . $userdata['board_email'] . "\r\nFrom: " . $board_config['board_email'] . "\r\n";
! $email_headers .= "Bcc: $bcc_list\r\n";
! $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\r\n";
$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\r\n";
$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\r\n";
$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
$emailer->use_template('admin_send_email');
--- 118,126 ----
$email_headers = 'Return-Path: ' . $userdata['board_email'] . "\r\nFrom: " . $board_config['board_email'] . "\r\n";
! $email_headers .= 'X-AntiAbuse: Board servername - ' . $board_config['server_name'] . "\r\n";
$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\r\n";
$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\r\n";
$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
+ $email_headers .= "Bcc: $bcc_list\r\n";
$emailer->use_template('admin_send_email');
|
|
From: Paul S. O. <ps...@us...> - 2002-05-17 22:58:22
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv12786/admin
Modified Files:
Tag: phpBB-2_0_0
index.php
Log Message:
Close DB connection for frameset ... overlooked that ... has this been causing the MySQL open connection problems I wonder?
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -C2 -r1.40.2.1 -r1.40.2.2
*** index.php 12 May 2002 00:47:40 -0000 1.40.2.1
--- index.php 17 May 2002 22:58:18 -0000 1.40.2.2
***************
*** 584,590 ****
$template->pparse("body");
exit;
}
! ?>
--- 584,591 ----
$template->pparse("body");
+ $db->sql_close();
exit;
}
! ?>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2002-05-17 21:52:39
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv27950 Modified Files: update_script.php Log Message: Fix ban_ip ALTER error Index: update_script.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/update_script.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** update_script.php 9 May 2002 14:13:45 -0000 1.8 --- update_script.php 17 May 2002 21:52:35 -0000 1.9 *************** *** 101,105 **** $sql[] = "ALTER TABLE " . BANLIST_TABLE . " MODIFY ban_email char(60) NULL, ! MODIFY ban_ip char(40) NULL"; $sql[] = "ALTER TABLE " . DISALLOW_TABLE . " MODIFY disallow_username char(30) NOT NULL"; --- 101,105 ---- $sql[] = "ALTER TABLE " . BANLIST_TABLE . " MODIFY ban_email char(60) NULL, ! MODIFY ban_ip char(40) NOT NULL"; $sql[] = "ALTER TABLE " . DISALLOW_TABLE . " MODIFY disallow_username char(30) NOT NULL"; |
|
From: Paul S. O. <ps...@us...> - 2002-05-17 21:42:31
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv25447/admin
Modified Files:
Tag: phpBB-2_0_0
admin_mass_email.php
Log Message:
Fix and clean up a few things, add in error checking, fix header output (hopefully).
Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -C2 -r1.15.2.2 -r1.15.2.3
*** admin_mass_email.php 12 May 2002 00:47:40 -0000 1.15.2.2
--- admin_mass_email.php 17 May 2002 21:42:26 -0000 1.15.2.3
***************
*** 34,38 ****
//
$no_page_header = TRUE;
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
require('./pagestart.' . $phpEx);
--- 34,38 ----
//
$no_page_header = TRUE;
! $phpbb_root_path = './../';
require($phpbb_root_path . 'extension.inc');
require('./pagestart.' . $phpEx);
***************
*** 50,131 ****
// Do the job ...
//
! if( isset($HTTP_POST_VARS['submit']) )
{
! $group_id = intval($HTTP_POST_VARS[POST_GROUPS_URL]);
! if( $group_id != -1 )
! {
! $sql = "SELECT u.user_email
! FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug
! WHERE ug.group_id = $group_id
! AND ug.user_pending <> " . TRUE . "
! AND u.user_id = ug.user_id";
! }
! else
{
! $sql = "SELECT user_email
! FROM " . USERS_TABLE;
}
! if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not select group members', '', __LINE__, __FILE__, $sql);
}
!
!
!
! if( !$db->sql_numrows($result) )
{
! //
! // Output a relevant GENERAL_MESSAGE about users/group
! // not existing
! //
}
! $email_list = $db->sql_fetchrowset($g_result);
!
!
!
! $subject = stripslashes($HTTP_POST_VARS['subject']);
! $message = stripslashes($HTTP_POST_VARS['message']);
!
! //
! // Error checking needs to go here ... if no subject and/or
! // no message then skip over the send and return to the form
! //
! $error = FALSE;
! if( !$error )
{
include($phpbb_root_path . 'includes/emailer.'.$phpEx);
//
// Let's do some checking to make sure that mass mail functions
// are working in win32 versions of php.
//
! if( preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$board_config['smtp_delivery'])
{
! // We are running on windows, force delivery to use
! // our smtp functions since php's are broken by default
$board_config['smtp_delivery'] = 1;
! $board_config['smtp_host'] = get_cfg_var('SMTP');
}
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'From: ' . $board_config['board_email'] . "\n";
!
! $bcc_list = '';
! for($i = 0; $i < count($email_list); $i++)
! {
! $bcc_list .= ( ( $bcc_list != '' ) ? ', ' : '' ) . $email_list[$i]['user_email'];
! }
! $email_headers .= "Bcc: $bcc_list\n";
!
! $email_headers .= 'Return-Path: ' . $userdata['board_email'] . "\n";
! $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
! $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
! $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
--- 50,125 ----
// Do the job ...
//
! if ( isset($HTTP_POST_VARS['submit']) )
{
! $subject = stripslashes(trim($HTTP_POST_VARS['subject']));
! $message = stripslashes(trim($HTTP_POST_VARS['message']));
!
! $error = FALSE;
! $error_msg = '';
! if ( empty($subject) )
{
! $error = true;
! $error_msg .= ( !empty($error_msg) ) ? '<br />' . $lang['Empty_subject'] : $lang['Empty_subject'];
}
!
! if ( empty($message) )
{
! $error = true;
! $error_msg .= ( !empty($error_msg) ) ? '<br />' . $lang['Empty_message'] : $lang['Empty_message'];
}
+ $group_id = intval($HTTP_POST_VARS[POST_GROUPS_URL]);
! $sql = ( $group_id != -1 ) ? "SELECT u.user_email FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id AND ug.user_pending <> " . TRUE . " AND u.user_id = ug.user_id" : "SELECT user_email FROM " . USERS_TABLE;
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not select group members', '', __LINE__, __FILE__, $sql);
}
! if ( $row = $db->sql_fetchrow($result) )
! {
! $bcc_list = '';
! do
! {
! $bcc_list .= ( ( $bcc_list != '' ) ? ', ' : '' ) . $row['user_email'];
! }
! while ( $row = $db->sql_fetchrow($result) );
! $db->sql_freeresult($result);
! }
! else
! {
! $message = ( $group_id != -1 ) ? $lang['Group_not_exist'] : $lang['No_such_user'];
! $error = true;
! $error_msg .= ( !empty($error_msg) ) ? '<br />' . $message : $message;
! }
! if ( !$error )
{
include($phpbb_root_path . 'includes/emailer.'.$phpEx);
+
//
// Let's do some checking to make sure that mass mail functions
// are working in win32 versions of php.
//
! if ( preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$board_config['smtp_delivery'])
{
! $ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
!
! // We are running on windows, force delivery to use our smtp functions
! // since php's are broken by default
$board_config['smtp_delivery'] = 1;
! $board_config['smtp_host'] = @$ini_val('SMTP');
}
+
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'Return-Path: ' . $userdata['board_email'] . "\r\nFrom: " . $board_config['board_email'] . "\r\n";
! $email_headers .= "Bcc: $bcc_list\r\n";
! $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\r\n";
! $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\r\n";
! $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\r\n";
$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
***************
*** 143,151 ****
$emailer->reset();
! $message = $lang['Email_sent'] . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
!
! message_die(GENERAL_MESSAGE, $message);
}
}
//
--- 137,154 ----
$emailer->reset();
! message_die(GENERAL_MESSAGE, $lang['Email_sent'] . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>'));
}
}
+
+ if ( $error )
+ {
+ $template->set_filenames(array(
+ 'reg_header' => 'error_body.tpl')
+ );
+ $template->assign_vars(array(
+ 'ERROR_MESSAGE' => $error_msg)
+ );
+ $template->assign_var_from_handle('ERROR_BOX', 'reg_header');
+ }
//
|
|
From: Paul S. O. <ps...@us...> - 2002-05-17 21:42:31
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv25447/templates/subSilver/admin
Modified Files:
Tag: phpBB-2_0_0
user_email_body.tpl
Log Message:
Fix and clean up a few things, add in error checking, fix header output (hopefully).
Index: user_email_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_email_body.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_email_body.tpl 3 Dec 2001 00:11:18 -0000 1.3
--- user_email_body.tpl 17 May 2002 21:42:27 -0000 1.3.2.1
***************
*** 4,8 ****
<p>{L_EMAIL_EXPLAIN}</p>
! <form method="post" action="{S_USER_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
<th class="thHead" colspan="2">{L_COMPOSE}</th>
--- 4,12 ----
<p>{L_EMAIL_EXPLAIN}</p>
! <form method="post" action="{S_USER_ACTION}">
!
! {ERROR_BOX}
!
! <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
<th class="thHead" colspan="2">{L_COMPOSE}</th>
***************
*** 23,25 ****
<td class="catBottom" align="center" colspan="2"><input type="submit" value="{L_EMAIL}" name="submit" class="mainoption" /></td>
</tr>
! </table></form>
--- 27,31 ----
<td class="catBottom" align="center" colspan="2"><input type="submit" value="{L_EMAIL}" name="submit" class="mainoption" /></td>
</tr>
! </table>
!
! </form>
|
|
From: Jonathan H. <the...@us...> - 2002-05-17 18:22:38
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv32493/includes
Modified Files:
Tag: phpBB-2_0_0
bbcode.php functions_post.php
Log Message:
Fix (hopefully anyway :) for nested code tag issues with bbcode
Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.36.2.6
retrieving revision 1.36.2.7
diff -C2 -r1.36.2.6 -r1.36.2.7
*** bbcode.php 13 May 2002 01:30:59 -0000 1.36.2.6
--- bbcode.php 17 May 2002 18:22:34 -0000 1.36.2.7
***************
*** 484,487 ****
--- 484,493 ----
if ($mark_lowest_level && ($curr_nesting_depth == 1))
{
+ if ($open_tag[0] == '[code]')
+ {
+ $code_entities_match = array('#<#', '#>#', '#"#', '#:#', '#\[#', '#\]#', '#\(#', '#\)#', '#\{#', '#\}#');
+ $code_entities_replace = array('<', '>', '"', ':', '[', ']', '(', ')', '{', '}');
+ $between_tags = preg_replace($code_entities_match, $code_entities_replace, $between_tags);
+ }
$text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$curr_nesting_depth:$uid]";
$text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$curr_nesting_depth:$uid]";
***************
*** 489,501 ****
else
{
! if ($open_is_regexp)
{
! $text = $before_start_tag . $start_tag;
}
else
{
! $text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$uid]";
}
- $text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$uid]";
}
--- 495,515 ----
else
{
! if ($open_tag[0] == '[code]')
{
! $text = $before_start_tag . '[code]';
! $text .= $between_tags . '[/code]';
}
else
{
! if ($open_is_regexp)
! {
! $text = $before_start_tag . $start_tag;
! }
! else
! {
! $text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$uid]";
! }
! $text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$uid]";
}
}
Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -C2 -r1.9.2.5 -r1.9.2.6
*** functions_post.php 17 May 2002 13:13:35 -0000 1.9.2.5
--- functions_post.php 17 May 2002 18:22:36 -0000 1.9.2.6
***************
*** 109,129 ****
if( $bbcode_on && $bbcode_uid != '' )
{
- $tmp_message = $message;
- if ( ($match_count = preg_match_all('#^(.*?)\[code\](.*?)\[\/code\](.*?)$#is', $tmp_message, $match)) )
- {
- $code_entities_match = array('#<#', '#>#', '#"#', '#:#', '#\[#', '#\]#', '#\(#', '#\)#', '#\{#', '#\}#');
- $code_entities_replace = array('<', '>', '"', ':', '[', ']', '(', ')', '{', '}');
-
- $message = '';
-
- for($i = 0; $i < $match_count; $i++)
- {
- $message .= $match[1][$i] . '[code]' . preg_replace($code_entities_match, $code_entities_replace, $match[2][$i]) . '[/code]';
- $tmp_message = $match[3][$i];
- }
-
- $message .= $tmp_message;
- }
-
$message = bbencode_first_pass($message, $bbcode_uid);
}
--- 109,112 ----
***************
*** 837,839 ****
}
! ?>
\ No newline at end of file
--- 820,822 ----
}
! ?>
|
|
From: Paul S. O. <ps...@us...> - 2002-05-17 13:57:55
|
Update of /cvsroot/phpbb/phpBB2/language/lang_finnish
In directory usw-pr-cvs1:/tmp/cvs-serv18638/language/lang_finnish
Modified Files:
Tag: phpBB-2_0_0
lang_admin.php lang_main.php
Log Message:
Ooops, missed a couple of things
Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/lang_admin.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** lang_admin.php 17 May 2002 13:55:41 -0000 1.5.2.1
--- lang_admin.php 17 May 2002 13:57:52 -0000 1.5.2.2
***************
*** 26,59 ****
//
-
- //
- // Format is same as lang_main
- //
-
//
// Modules, this replaces the keys used
// in the modules[][] arrays in each module file
[...1378 lines suppressed...]
! $lang['ftp_info'] = 'Anna FTP tiedot ';
! $lang['Attempt_ftp'] = 'Yritetään siirtää konfigurointitiedosto ftp:llä';
! $lang['Send_file'] = 'Lähetä tiedosto minulle ja siirrän sen ftp:llä manuaalisesti';
! $lang['ftp_path'] = 'FTP polku phpBB 2:lle';
! $lang['ftp_username'] = 'FTP käyttäjätunnus';
! $lang['ftp_password'] = 'FTP salasana';
! $lang['Transfer_config'] = 'Aloita siirto';
! $lang['NoFTP_config'] = 'Konfigurointitiedoston ftp siirto ei onnistunut. Ole hyvä ja lataa konfigurointitiedosto ja käytä ftp:tä manuaalisesti.';
!
! $lang['Install'] = 'Asennus';
! $lang['Upgrade'] = 'Päivitys';
! $lang['Install_Method'] = 'Valitse asennustapa';
! $lang['Install_No_Ext'] = 'Palvelimen php asetukset eivät tue valitsemaasi tietokantaa.';
! $lang['Install_No_PCRE'] = 'PhpBB2 tarvitsee moduulin (Perl-Compatible Regular Expressions Module) php:lle jota php asetuksesi eivät näytä tukevan!';
//
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/lang_main.php,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** lang_main.php 17 May 2002 13:55:41 -0000 1.9.2.1
--- lang_main.php 17 May 2002 13:57:52 -0000 1.9.2.2
***************
*** 34,38 ****
// along with our copyright message indicating you are the translator
// please add it here.
! $lang['TRANSLATION_INFO'] = 'Käännös Jorma Aaltonen, <a href="mailto:jorma@pitro.com">jo...@pi...</a>';
//
--- 34,38 ----
// along with our copyright message indicating you are the translator
// please add it here.
! $lang['TRANSLATION_INFO'] = 'Käännös Jorma Aaltonen, <a href="mailto:jorma@pitro.com">jorma@pitro.com</a>';
//
|
|
From: Paul S. O. <ps...@us...> - 2002-05-17 13:55:45
|
Update of /cvsroot/phpbb/phpBB2/language/lang_finnish
In directory usw-pr-cvs1:/tmp/cvs-serv18113/language/lang_finnish
Modified Files:
Tag: phpBB-2_0_0
lang_admin.php lang_main.php
Log Message:
Updates to 2.0.1
Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/lang_admin.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** lang_admin.php 14 Feb 2002 16:02:13 -0000 1.5
--- lang_admin.php 17 May 2002 13:55:41 -0000 1.5.2.1
***************
*** 468,471 ****
--- 468,472 ----
$lang['No_group_moderator'] = "Ryhmälle on määritettävä moderaattori";
$lang['No_group_mode'] = "Ryhmälle on määriteltävä onko se avoin vai suljettu";
+ $lang['No_group_action'] = "Toimintoa ei ole määritelty";
$lang['delete_group_moderator'] = "Poistetaanko ryhmän entinen moderaattori?";
$lang['delete_moderator_explain'] = "Jos muutat ryhmän moderaattoria laita rasti tähän ruutuun poistaaksesi vanhan moderaattoritiedon. Muussa tapauksessa älä laita raksia ja käyttäjästä tulee tavallinen ryhmän jäsen.";
***************
*** 543,546 ****
--- 544,548 ----
$lang['Rank_added'] = "Tittelin lisäys onnistui";
$lang['Rank_removed'] = "Tittelin poisto onnistui";
+ $lang['No_update_ranks'] = "Titteli on poistettu mutta käyttäjätietoja, joilla titteli oli, ei ole päivitetty. Näiden käyttäjien tiedot on muutettava käsin";
$lang['Click_return_rankadmin'] = "Klikkaa %stästä%s palataksesi Tittelien hallintaan";
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/lang_main.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** lang_main.php 6 Mar 2002 00:36:22 -0000 1.9
--- lang_main.php 17 May 2002 13:55:41 -0000 1.9.2.1
***************
*** 25,111 ****
//
! //setlocale(LC_ALL, "fi");
! $lang['ENCODING'] = "iso-8859-1";
! $lang['DIRECTION'] = "ltr";
! $lang['LEFT'] = "left";
! $lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
[...1914 lines suppressed...]
! $lang['Critical_Information'] = "Tärkeää informaatiota";
! $lang['General_Error'] = "Yleinen virhe";
! $lang['Critical_Error'] = "Kriittinen virhe";
! $lang['An_error_occured'] = "Tapahtui virhe";
! $lang['A_critical_error'] = "Tapahtui kriittinen virhe";
//
--- 987,997 ----
// specific failure on a page)
//
! $lang['Information'] = 'Informaatio';
! $lang['Critical_Information'] = 'Tärkeää informaatiota';
! $lang['General_Error'] = 'Yleinen virhe';
! $lang['Critical_Error'] = 'Kriittinen virhe';
! $lang['An_error_occured'] = 'Tapahtui virhe';
! $lang['A_critical_error'] = 'Tapahtui kriittinen virhe';
//
|
Update of /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_portuguese_brazil/email
Modified Files:
Tag: phpBB-2_0_0
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:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/admin_activate.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin_activate.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- admin_activate.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Registro de Novo Usuário
+ Charset: iso-8859-1
Olá,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/admin_send_email.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin_send_email.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- admin_send_email.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
A mensagem seguinte é um email enviado para você por um administrador de "{SITENAME}". Se a mensagem contém material abusivo, "spam", ou comentários que você ache ofensivos por favor contate o "webmaster" dos fóruns no seguinte endereço:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/admin_welcome_activated.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin_welcome_activated.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- admin_welcome_activated.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Registo Ativado
+ Charset: iso-8859-1
Olá {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/admin_welcome_inactive.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin_welcome_inactive.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- admin_welcome_inactive.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Bem-vindo ao Fórum {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/coppa_welcome_inactive.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** coppa_welcome_inactive.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Bem-vindo ao Fórum {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/group_added.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** group_added.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- group_added.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Você foi adicionado a este Grupo de Usuários
+ Charset: iso-8859-1
Parabéns,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/group_approved.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** group_approved.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- group_approved.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: O seu pedido foi aceito
+ Charset: iso-8859-1
Parabéns,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/group_request.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** group_request.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- group_request.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Foi feito um pedido para se juntar ao seu Grupo
+ Charset: iso-8859-1
Estimado {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/privmsg_notify.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** privmsg_notify.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- privmsg_notify.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Chegou uma Mensagem Particular nova
+ Charset: iso-8859-1
Olá {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/profile_send_email.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** profile_send_email.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- profile_send_email.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Olá {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/topic_notify.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** topic_notify.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- topic_notify.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Notificação de Resposta a Tópico - {TOPIC_TITLE}
+ Charset: iso-8859-1
Olá {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/user_activate.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** user_activate.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- user_activate.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Reativação de registo!
+ Charset: iso-8859-1
Olá {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/user_activate_passwd.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** user_activate_passwd.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- user_activate_passwd.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Ativação de Senha Nova
+ Charset: iso-8859-1
Olá {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/user_welcome.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** user_welcome.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- user_welcome.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Bem-vindo ao Fórum {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/email/Attic/user_welcome_inactive.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** user_welcome_inactive.tpl 5 May 2002 12:16:43 -0000 1.1.2.1
--- user_welcome_inactive.tpl 17 May 2002 13:13:53 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Bem-vindo ao Fórum {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_turkish/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_turkish/email
Modified Files:
Tag: phpBB-2_0_0
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:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Yeni kullanýcý hesabý
+ Charset: iso-8859-9
Merhaba,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 31 Jan 2002 13:42:22 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:14:04 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-9
+
Asagidaki msg size "{SITENAME}" admini tarafindan gonderildi. Eger bu msgin spam oldugunu dusunuyorsaniz veya iceriginden rahatsiz olduysaniz asagida adresten iletisime gecin:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Hesap aktif hale getirilmiþtir
+ Charset: iso-8859-9
Merhaba {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- admin_welcome_inactive.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: {SITENAME} Forumlarýna Hoþgeldiniz
+ Charset: iso-8859-9
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: {SITENAME} Forumlarýna Hoþgeldiniz
+ Charset: iso-8859-9
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_added.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- group_added.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Bu gruba eklendiniz
+ Charset: iso-8859-9
Tebrikler,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- group_approved.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Baþvurunuz onaylanmýþtýr
+ Charset: iso-8859-9
Tebrikler,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_request.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- group_request.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Grubunuza katýlmak için bir baþvuru var
+ Charset: iso-8859-9
Degerli {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- privmsg_notify.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Yeni bir özel mesaj geldi
+ Charset: iso-8859-9
Merhaba {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 31 Jan 2002 13:42:22 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:14:04 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-9
+
Merhaba {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- topic_notify.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Cevap gözleme - {TOPIC_TITLE}
+ Charset: iso-8859-9
Merhaba {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_activate.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Hesabýnýzý yeniden aktif hale getirmelisiniz!
+ Charset: iso-8859-9
Merhaba {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_activate_passwd.tpl 17 May 2002 13:14:05 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Yeni þifre aktivasyonu
+ Charset: iso-8859-9
Merhaba {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_welcome.tpl 17 May 2002 13:14:05 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: {SITENAME} Forumlarýna Hoþgeldiniz
+ Charset: iso-8859-9
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_turkish/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_welcome_inactive.tpl 17 May 2002 13:14:05 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: {SITENAME} Forumlarýna Hoþgeldiniz
+ Charset: iso-8859-9
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_japanese/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_japanese/email
Modified Files:
Tag: phpBB-2_0_0
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:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:13:44 -0000 1.2.2.1
***************
*** 1,7 ****
! Subject: Vµ¢[U[AJEg
!
! "{USERNAME}"ÌAJEgªâ~AܽÍVµì¬³êܵ½BKvÅ êαÌ[U[ÌÚ×ðmFµAºLÌN©çANeBx[VðsÁľ³¢F
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,8 ----
! Subject: Vµ¢[U[AJEg
! Charset: shift_jis
!
! "{USERNAME}"ÌAJEgªâ~AܽÍVµì¬³êܵ½BKvÅ êαÌ[U[ÌÚ×ðmFµAºLÌN©çANeBx[VðsÁľ³¢F
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 25 Feb 2002 15:00:29 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:44 -0000 1.1.2.1
***************
*** 1,10 ****
! ºLÌ[ÍA"{SITENAME}"ÌÇlÉæÁÄM³ê½àÌÅ·B±Ì[ªXpAs³ÈàÌAîæðÜÞàÌÅ êÎAºLÌEFu}X^[ÌAhXÌûÉâ¢í¹Ä¾³¢F
!
! {BOARD_EMAIL}
!
! ãLÌAhX¶É[ðéêÍAM³ê½ÌàeiÁÉwb_[îñjðÜßľ³¢B
!
! ȽÉçê½[ÌàeÍȺÌÊèÅ·
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
--- 1,12 ----
! Charset: shift_jis
!
! ºLÌ[ÍA"{SITENAME}"ÌÇlÉæÁÄM³ê½àÌÅ·B±Ì[ªXpAs³ÈàÌAîæðÜÞàÌÅ êÎAºLÌEFu}X^[ÌAhXÌûÉâ¢í¹Ä¾³¢F
!
! {BOARD_EMAIL}
!
! ãLÌAhX¶É[ðéêÍAM³ê½ÌàeiÁÉwb_[îñjðÜßľ³¢B
!
! ȽÉçê½[ÌàeÍȺÌÊèÅ·
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:13:45 -0000 1.2.2.1
***************
*** 1,7 ****
! Subject: AJEgÍANeBuÉÈèܵ½
!
! {USERNAME}³ñÖ
!
! Your account on "{SITENAME}"ÌAJEgªANeBuÉÈèܵ½B±êżOÆpX[hðgÁÄf¦ÂÉOC·é±ÆªÅ«Ü·BAJEg̼OÆpX[hÍOñM³ê½[ÉÚÁĢܷB
!
{EMAIL_SIG}
--- 1,8 ----
! Subject: AJEgÍANeBuÉÈèܵ½
! Charset: shift_jis
!
! {USERNAME}³ñÖ
!
! Your account on "{SITENAME}"ÌAJEgªANeBuÉÈèܵ½B±êżOÆpX[hðgÁÄf¦ÂÉOC·é±ÆªÅ«Ü·BAJEg̼OÆpX[hÍOñM³ê½[ÉÚÁĢܷB
!
{EMAIL_SIG}
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_welcome_inactive.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,18 ****
! Subject: 椱»{SITENAME}Ìf¦ÂÖ
!
! {WELCOME_MSG}
!
! ±Ì[ÍåØÉÛǵľ³¢B ȽÌAJEgîñÍȺÌÊèÅ·F
!
! ----------------------------
! ¼O: {USERNAME}
! pX[h: {PASSWORD}
! ----------------------------
!
! ȽÌAJEgÍܾANeBuÉÈÁĢܹñBÇÒªAJEgðANeBuÉ·éÜÅÍAAJEgðgÁÄf¦ÂÉOC·é±ÆÍūܹñBAJEgÌANeBx[VªsíêéÆA»Ìï|Ì[ªM³êÜ·B
!
! AJEgÌpX[hÍf[^x[XàÅû³êÄ¢é½ßApX[hðYêĵÜÁ½êÉA»ÌpX[hð©Â¯o·±ÆÍūȢÌÅӵľ³¢Bµ©µAªêpX[hðYêĵÜÁ½êÍAVµ¢pX[hðs·é±ÆªÅ«Ü·BÄs³ê½pX[hÅOC·é½ßÉÍAÄÑAJEgÌANeBx[VðÒÂKvª èÜ·B
!
! [U[o^ðµÄ¢½¾«AܱÆÉL爐´¢Ü·B
!
{EMAIL_SIG}
--- 1,19 ----
! Subject: 椱»{SITENAME}Ìf¦ÂÖ
! Charset: shift_jis
!
! {WELCOME_MSG}
!
! ±Ì[ÍåØÉÛǵľ³¢B ȽÌAJEgîñÍȺÌÊèÅ·F
!
! ----------------------------
! ¼O: {USERNAME}
! pX[h: {PASSWORD}
! ----------------------------
!
! ȽÌAJEgÍܾANeBuÉÈÁĢܹñBÇÒªAJEgðANeBuÉ·éÜÅÍAAJEgðgÁÄf¦ÂÉOC·é±ÆÍūܹñBAJEgÌANeBx[VªsíêéÆA»Ìï|Ì[ªM³êÜ·B
!
! AJEgÌpX[hÍf[^x[XàÅû³êÄ¢é½ßApX[hðYêĵÜÁ½êÉA»ÌpX[hð©Â¯o·±ÆÍūȢÌÅӵľ³¢Bµ©µAªêpX[hðYêĵÜÁ½êÍAVµ¢pX[hðs·é±ÆªÅ«Ü·BÄs³ê½pX[hÅOC·é½ßÉÍAÄÑAJEgÌANeBx[VðÒÂKvª èÜ·B
!
! [U[o^ðµÄ¢½¾«AܱÆÉL爐´¢Ü·B
!
{EMAIL_SIG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,50 ****
! Subject: 椱»{SITENAME}Ìf¦ÂÖ
!
! {WELCOME_MSG}
!
! COPPAiqÌICEvCoV[Ûì@jÉæèA ȽÌAJEgÍ»ÝANeBuÉÈÁĢܹñB
!
! ¼eÍÛìÒªºLÌLüÉKvÈÚðLüµAÌFAXÔÜÅÁľ³¢F
!
! {FAX_INFO}
!
! ܽÍÌ[AhXÜÅÁľ³¢F
!
! {MAIL_INFO}
!
! ------------------------------ Øèæè ------------------------------
! {SITENAME}ÉQÁ·éÂ
!
! ¼O: {USERNAME}
! pX[h: {PASSWORD}
! [AhX: {EMAIL_ADDRESS}
!
! ICQio[: {ICQ}
! AIMAhX: {AIM}
! MSN Messenger: {MSN}
! Yahoo Messenger: {YIM}
! z[y[W: {WEB_SITE}
! Ýn: {FROM}
! EÆ: {OCC}
! ï¡: {INTERESTS}
!
! Í©ªÌqÌîñð{µA{SITENAME}ɱÌîñðÛdz¹éÂð^¦Ü·B
! ͱÌîñªpX[hðüÍ·é±ÆÅ¢ÂÅàÏXªÂ\Èð³mµÄ¢Ü·B
!
! ¼eÍÛìÒ
! (¼Oð±ÌÉLü): _____________________
!
! (TCð±ÌÉLü): __________________
!
! út: _______________
!
! ------------------------------ Øèæè ------------------------------
!
!
! ÇÒªãLÌCOPPAÌf[^ðó¯æÁ½ãA ȽÌAJEgÍANeBuÆÈèÜ·B
!
! AJEgÌpX[hÍf[^x[XàÅû³êÄ¢é½ßApX[hðYêĵÜÁ½êÉA»ÌpX[hð©Â¯o·±ÆÍūȢÌÅӵľ³¢Bµ©µAªêpX[hðYêĵÜÁ½êÍAVµ¢pX[hðs·é±ÆªÅ«Ü·B
!
! [U[o^ðµÄ¢½¾«AܱÆÉL爐´¢Ü·B
!
{EMAIL_SIG}
--- 1,51 ----
! Subject: 椱»{SITENAME}Ìf¦ÂÖ
! Charset: shift_jis
!
! {WELCOME_MSG}
!
! COPPAiqÌICEvCoV[Ûì@jÉæèA ȽÌAJEgÍ»ÝANeBuÉÈÁĢܹñB
!
! ¼eÍÛìÒªºLÌLüÉKvÈÚðLüµAÌFAXÔÜÅÁľ³¢F
!
! {FAX_INFO}
!
! ܽÍÌ[AhXÜÅÁľ³¢F
!
! {MAIL_INFO}
!
! ------------------------------ Øèæè ------------------------------
! {SITENAME}ÉQÁ·éÂ
!
! ¼O: {USERNAME}
! pX[h: {PASSWORD}
! [AhX: {EMAIL_ADDRESS}
!
! ICQio[: {ICQ}
! AIMAhX: {AIM}
! MSN Messenger: {MSN}
! Yahoo Messenger: {YIM}
! z[y[W: {WEB_SITE}
! Ýn: {FROM}
! EÆ: {OCC}
! ï¡: {INTERESTS}
!
! Í©ªÌqÌîñð{µA{SITENAME}ɱÌîñðÛdz¹éÂð^¦Ü·B
! ͱÌîñªpX[hðüÍ·é±ÆÅ¢ÂÅàÏXªÂ\Èð³mµÄ¢Ü·B
!
! ¼eÍÛìÒ
! (¼Oð±ÌÉLü): _____________________
!
! (TCð±ÌÉLü): __________________
!
! út: _______________
!
! ------------------------------ Øèæè ------------------------------
!
!
! ÇÒªãLÌCOPPAÌf[^ðó¯æÁ½ãA ȽÌAJEgÍANeBuÆÈèÜ·B
!
! AJEgÌpX[hÍf[^x[XàÅû³êÄ¢é½ßApX[hðYêĵÜÁ½êÉA»ÌpX[hð©Â¯o·±ÆÍūȢÌÅӵľ³¢Bµ©µAªêpX[hðYêĵÜÁ½êÍAVµ¢pX[hðs·é±ÆªÅ«Ü·B
!
! [U[o^ðµÄ¢½¾«AܱÆÉL爐´¢Ü·B
!
{EMAIL_SIG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_added.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_added.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,10 ****
! Subject: ±ÌO[vÉÇÁ³êܵ½
!
! ¨ßÅÆ¤²´¢Ü·
!
! È½Í {SITENAME}ÌO[vÅ é"{GROUP_NAME}"Ìo[ÉÇÁ³êܵ½B±ÌìÆÍO[vÌf[^[AܽÍÇlÉæÁÄsíêܵ½BÚ×É¢ÄÍÞçÉâ¢í¹Ä¾³¢B
!
! O[vîñͱ¿çũ鱯ªÅ«Ü·F
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Subject: ±ÌO[vÉÇÁ³êܵ½
! Charset: shift_jis
!
! ¨ßÅÆ¤²´¢Ü·
!
! È½Í {SITENAME}ÌO[vÅ é"{GROUP_NAME}"Ìo[ÉÇÁ³êܵ½B±ÌìÆÍO[vÌf[^[AܽÍÇlÉæÁÄsíêܵ½BÚ×É¢ÄÍÞçÉâ¢í¹Ä¾³¢B
!
! O[vîñͱ¿çũ鱯ªÅ«Ü·F
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_approved.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,10 ****
! Subject: O[vQÁÌ\µÝͳø³êܵ½
!
! ¨ßÅÆ¤²´¢Ü·
!
! ȽÌ{SITENAME}ÌO[vÅ é"{GROUP_NAME}"ÉηéQÁªÂ³êܵ½B
! ȽÌO[vÌo[Vbvîñð©éêÍAºLÌNðNbNµÄ¾³¢B
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Subject: O[vQÁÌ\µÝͳø³êܵ½
! Charset: shift_jis
!
! ¨ßÅÆ¤²´¢Ü·
!
! ȽÌ{SITENAME}ÌO[vÅ é"{GROUP_NAME}"ÉηéQÁªÂ³êܵ½B
! ȽÌO[vÌo[Vbvîñð©éêÍAºLÌNðNbNµÄ¾³¢B
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_request.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_request.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,9 ****
! Subject: O[vQÁÌ\µÝª èÜ·
!
! {GROUP_MODERATOR}³ñÖ
!
! [U[ª{SITENAME}ÌO[vÌQÁð\µñŢܷBQÁ̳øEÛ·éêÍAºLÌNðNbNµÄ¾³¢F
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,10 ----
! Subject: O[vQÁÌ\µÝª èÜ·
! Charset: shift_jis
!
! {GROUP_MODERATOR}³ñÖ
!
! [U[ª{SITENAME}ÌO[vÌQÁð\µñŢܷBQÁ̳øEÛ·éêÍAºLÌNðNbNµÄ¾³¢F
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- privmsg_notify.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,11 ****
! Subject: Vµ¢bZ[WªÍ«Üµ½
!
! {USERNAME}³ñÖ
!
! "{SITENAME}"Ìf¦ÂÅAVµ¢vCx[gbZ[Wª Ƚ¶É͢ĢܷB ȽÌ[U[ÝèÅÍAvCx[gbZ[WªÍ¢½ÉmµÄàç¤æ¤ÉÝè³êĢܷBºLÌNðNbN·éÆAM³ê½vCx[gbZ[Wð©é±ÆªÅ«Ü·F
!
! {U_INBOX}
!
! vCx[gbZ[WªÍ¢½ÉÊmð³øÉµ½¢êÍA[U[ÝèæÊÅs¤±ÆªÅ«Ü·BB
!
{EMAIL_SIG}
--- 1,12 ----
! Subject: Vµ¢bZ[WªÍ«Üµ½
! Charset: shift_jis
!
! {USERNAME}³ñÖ
!
! "{SITENAME}"Ìf¦ÂÅAVµ¢vCx[gbZ[Wª Ƚ¶É͢ĢܷB ȽÌ[U[ÝèÅÍAvCx[gbZ[WªÍ¢½ÉmµÄàç¤æ¤ÉÝè³êĢܷBºLÌNðNbN·éÆAM³ê½vCx[gbZ[Wð©é±ÆªÅ«Ü·F
!
! {U_INBOX}
!
! vCx[gbZ[WªÍ¢½ÉÊmð³øÉµ½¢êÍA[U[ÝèæÊÅs¤±ÆªÅ«Ü·BB
!
{EMAIL_SIG}
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 25 Feb 2002 15:00:29 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:48 -0000 1.1.2.1
***************
*** 1,12 ****
! {TO_USERNAME}³ñÖ
!
! {FROM_USERNAME}ª{SITENAME}Ìf¦ÂðîµÄ[ðMµÄ«Üµ½B±Ì[ª±Ì[ªXpAs³ÈàÌAîæðÜÞàÌÅ êÎAºLÌEFu}X^[ÌAhXÌûÉâ¢í¹Ä¾³¢F
!
! {BOARD_EMAIL}
!
! ãLÌAhX¶É[ðéêÍAM³ê½ÌàeiÁÉwb_[îñjðÜßľ³¢B±Ì[ÌÔMæÍA{FROM_USERNAME}Ì[AhXÈÌÅӵľ³¢B
!
! ȽÉçê½[ÌàeÍȺÌÊèÅ·
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
--- 1,14 ----
! Charset: shift_jis
!
! {TO_USERNAME}³ñÖ
!
! {FROM_USERNAME}ª{SITENAME}Ìf¦ÂðîµÄ[ðMµÄ«Üµ½B±Ì[ª±Ì[ªXpAs³ÈàÌAîæðÜÞàÌÅ êÎAºLÌEFu}X^[ÌAhXÌûÉâ¢í¹Ä¾³¢F
!
! {BOARD_EMAIL}
!
! ãLÌAhX¶É[ðéêÍAM³ê½ÌàeiÁÉwb_[îñjðÜßľ³¢B±Ì[ÌÔMæÍA{FROM_USERNAME}Ì[AhXÈÌÅӵľ³¢B
!
! ȽÉçê½[ÌàeÍȺÌÊèÅ·
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- topic_notify.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,13 ****
! Subject: ÔMÌÊm - {TOPIC_TITLE}
!
! {USERNAME}³ñÖ
!
! {SITENAME}Ìf¦ÂÌ"{TOPIC_TITLE}"Æ¢¤è¼ÌgsbNÉVµ¢ÔMª èÜ·B±ÌÔMÍA ȽªÅãɱÌgsbNÉKê½ãÉ Á½ÔMÅ·BÔMð©éêÍAºLÌNðNbNµÄ¾³¢BgsbNðÏ{·éÜÅÍA±ÌgsbNÌmÍêØ³êܹñB
!
! {U_TOPIC}
!
! ±ÌgsbNÌmªà¤KvªÈ¢êÍAgsbNæÊÌºÉ éu±ÌgsbNÌÔMÌ`FbNððvðNbN·é©AºLÌNðNbNµÄ¾³¢F
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
--- 1,14 ----
! Subject: ÔMÌÊm - {TOPIC_TITLE}
! Charset: shift_jis
!
! {USERNAME}³ñÖ
!
! {SITENAME}Ìf¦ÂÌ"{TOPIC_TITLE}"Æ¢¤è¼ÌgsbNÉVµ¢ÔMª èÜ·B±ÌÔMÍA ȽªÅãɱÌgsbNÉKê½ãÉ Á½ÔMÅ·BÔMð©éêÍAºLÌNðNbNµÄ¾³¢BgsbNðÏ{·éÜÅÍA±ÌgsbNÌmÍêØ³êܹñB
!
! {U_TOPIC}
!
! ±ÌgsbNÌmªà¤KvªÈ¢êÍAgsbNæÊÌºÉ éu±ÌgsbNÌÔMÌ`FbNððvðNbN·é©AºLÌNðNbNµÄ¾³¢F
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_activate.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,9 ****
! Subject: Reactivate your account!
!
! {USERNAME}³ñÖ
!
! "{SITENAME}"ɨ¯éAJEgÌANeBuª³øÆÈèܵ½B¨»ç[U[Ýè𵽽߾Æl¦çêÜ·BAJEgðÄÑANeBuÉ·éêÍAºLÌNðNbNµÄ¾³¢F
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,10 ----
! Subject: Reactivate your account!
! Charset: shift_jis
!
! {USERNAME}³ñÖ
!
! "{SITENAME}"ɨ¯éAJEgÌANeBuª³øÆÈèܵ½B¨»ç[U[Ýè𵽽߾Æl¦çêÜ·BAJEgðÄÑANeBuÉ·éêÍAºLÌNðNbNµÄ¾³¢F
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_activate_passwd.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,17 ****
! Subject: Vµ¢pX[hÌANeBx[V
!
! {USERNAME}³ñÖ
!
! ±Ì[ÍA ȽiÍ È½ðÁ½N©jª{SITENAME}ÌAJEgÌVµ¢pX[hðs·éNGXgðsÁ½½ßÉM³êܵ½BNGXgðsÁĢȢêÍA±Ì[ð³µÄ¾³¢B½x௶[ªéêÍAÇlÉâ¢í¹Ä¾³¢B
!
! Vµ¢pX[hðgp·éêÍAAJEgðANeBuÉ·éKvª èÜ·BAJEgÌANeBx[Vðs¤êÍAºLÌNðNbNµÄ¾³¢B
!
! {U_ACTIVATE}
!
! AJEgðANeBuɵ½çAºLÌpX[hðgÁÄOCū鿤ÉÈèÜ·F
!
! pX[h: {PASSWORD}
!
! pX[hÌÄsðµÈÄàA[U[Ýè©çpX[hðÏX·é±ÆªÅ«Ü·B½©âèª éêÍAf¦ÂÌÇlÉâ¢í¹Ä¾³¢B
!
{EMAIL_SIG}
--- 1,18 ----
! Subject: Vµ¢pX[hÌANeBx[V
! Charset: shift_jis
!
! {USERNAME}³ñÖ
!
! ±Ì[ÍA ȽiÍ È½ðÁ½N©jª{SITENAME}ÌAJEgÌVµ¢pX[hðs·éNGXgðsÁ½½ßÉM³êܵ½BNGXgðsÁĢȢêÍA±Ì[ð³µÄ¾³¢B½x௶[ªéêÍAÇlÉâ¢í¹Ä¾³¢B
!
! Vµ¢pX[hðgp·éêÍAAJEgðANeBuÉ·éKvª èÜ·BAJEgÌANeBx[Vðs¤êÍAºLÌNðNbNµÄ¾³¢B
!
! {U_ACTIVATE}
!
! AJEgðANeBuɵ½çAºLÌpX[hðgÁÄOCū鿤ÉÈèÜ·F
!
! pX[h: {PASSWORD}
!
! pX[hÌÄsðµÈÄàA[U[Ýè©çpX[hðÏX·é±ÆªÅ«Ü·B½©âèª éêÍAf¦ÂÌÇlÉâ¢í¹Ä¾³¢B
!
{EMAIL_SIG}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_welcome.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,18 ****
! Subject: 椱»{SITENAME}Ìf¦ÂÖ
!
! {WELCOME_MSG}
!
!
! ±Ì[ÍåØÉÛǵľ³¢B ȽÌAJEgîñÍȺÌÊèÅ·F
!
! ----------------------------
! ¼O: {USERNAME}
! pX[h: {PASSWORD}
! ----------------------------
!
!
! AJEgÌpX[hÍf[^x[XàÅû³êÄ¢é½ßApX[hðYêĵÜÁ½êÉA»ÌpX[hð©Â¯o·±ÆÍūȢÌÅӵľ³¢Bµ©µAªêpX[hðYêĵÜÁ½êÍAVµ¢pX[hðs·é±ÆªÅ«Ü·B
!
! [U[o^ðµÄ¢½¾«AܱÆÉL爐´¢Ü·B
!
{EMAIL_SIG}
--- 1,19 ----
! Subject: 椱»{SITENAME}Ìf¦ÂÖ
! Charset: shift_jis
!
! {WELCOME_MSG}
!
!
! ±Ì[ÍåØÉÛǵľ³¢B ȽÌAJEgîñÍȺÌÊèÅ·F
!
! ----------------------------
! ¼O: {USERNAME}
! pX[h: {PASSWORD}
! ----------------------------
!
!
! AJEgÌpX[hÍf[^x[XàÅû³êÄ¢é½ßApX[hðYêĵÜÁ½êÉA»ÌpX[hð©Â¯o·±ÆÍūȢÌÅӵľ³¢Bµ©µAªêpX[hðYêĵÜÁ½êÍAVµ¢pX[hðs·é±ÆªÅ«Ü·B
!
! [U[o^ðµÄ¢½¾«AܱÆÉL爐´¢Ü·B
!
{EMAIL_SIG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_japanese/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_welcome_inactive.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,21 ****
! Subject: 椱»{SITENAME}Ìf¦ÂÖ
!
! {WELCOME_MSG}
!
! ±Ì[ÍåØÉÛǵľ³¢B ȽÌAJEgîñÍȺÌÊèÅ·F
!
!
! ----------------------------
! ¼O: {USERNAME}
! pX[h: {PASSWORD}
! ----------------------------
!
! ȽÌAJEgÍ»ÝANeBuÅÍ èܹñBºLÌNðNbNµÄAJEgÌANeBx[Vðs¤Kvª èÜ·B
!
! {U_ACTIVATE}
!
! AJEgÌpX[hÍf[^x[XàÅû³êÄ¢é½ßApX[hðYêĵÜÁ½êÉA»ÌpX[hð©Â¯o·±ÆÍūȢÌÅӵľ³¢Bµ©µAªêpX[hðYêĵÜÁ½êÍAVµ¢pX[hðs·é±ÆªÅ«Ü·B
!
! [U[o^ðµÄ¢½¾«AܱÆÉL爐´¢Ü·B
!
{EMAIL_SIG}
--- 1,22 ----
! Subject: 椱»{SITENAME}Ìf¦ÂÖ
! Charset: shift_jis
!
! {WELCOME_MSG}
!
! ±Ì[ÍåØÉÛǵľ³¢B ȽÌAJEgîñÍȺÌÊèÅ·F
!
!
! ----------------------------
! ¼O: {USERNAME}
! pX[h: {PASSWORD}
! ----------------------------
!
! ȽÌAJEgÍ»ÝANeBuÅÍ èܹñBºLÌNðNbNµÄAJEgÌANeBx[Vðs¤Kvª èÜ·B
!
! {U_ACTIVATE}
!
! AJEgÌpX[hÍf[^x[XàÅû³êÄ¢é½ßApX[hðYêĵÜÁ½êÉA»ÌpX[hð©Â¯o·±ÆÍūȢÌÅӵľ³¢Bµ©µAªêpX[hðYêĵÜÁ½êÍAVµ¢pX[hðs·é±ÆªÅ«Ü·B
!
! [U[o^ðµÄ¢½¾«AܱÆÉL爐´¢Ü·B
!
{EMAIL_SIG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_french/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_french/email
Modified Files:
Tag: phpBB-2_0_0
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:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:13:38 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Nouveau compte utilisateur
+ Charset: ISO-8859-1
Hello,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 1 Jan 2002 01:39:35 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:38 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: ISO-8859-1
+
Ce qui suit est un email qui vous a été envoyé par un administrateur de "{SITENAME}". Si ce message est du spam, contient des commentaires abusifs ou autre chose que vous trouvez offensif, veuillez contacter le webmestre de ce forum à l'adresse suivante:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:13:38 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Compte activé
+ Charset: ISO-8859-1
Hello {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/admin_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_inactive.tpl 3 Apr 2002 17:47:16 -0000 1.3
--- admin_welcome_inactive.tpl 17 May 2002 13:13:38 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Bienvenue sur les forums de {SITENAME}
+ Charset: ISO-8859-1
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** coppa_welcome_inactive.tpl 3 Apr 2002 17:47:16 -0000 1.3
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:39 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Bienvenue sur les forums de {SITENAME}
+ Charset: ISO-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/group_added.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_added.tpl 3 Apr 2002 17:47:16 -0000 1.3
--- group_added.tpl 17 May 2002 13:13:39 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Vous avez été ajouté à un groupe
+ Charset: ISO-8859-1
Félicitations,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/group_approved.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_approved.tpl 3 Apr 2002 17:47:16 -0000 1.3
--- group_approved.tpl 17 May 2002 13:13:39 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Votre demande a été approuvée
+ Charset: ISO-8859-1
Félicitations,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/group_request.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_request.tpl 3 Apr 2002 17:47:16 -0000 1.3
--- group_request.tpl 17 May 2002 13:13:39 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Une demande pour rejoindre votre groupe a été formulée
+ Charset: ISO-8859-1
Cher {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/privmsg_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** privmsg_notify.tpl 3 Apr 2002 17:47:16 -0000 1.3
--- privmsg_notify.tpl 17 May 2002 13:13:40 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Un nouveau message privé vient d'arriver
+ Charset: ISO-8859-1
Hello {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 1 Jan 2002 01:39:35 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:41 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: ISO-8859-1
+
Bonjour {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/topic_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** topic_notify.tpl 3 Apr 2002 17:47:16 -0000 1.3
--- topic_notify.tpl 17 May 2002 13:13:41 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Notification de réponse au sujet - {TOPIC_TITLE}
+ Charset: ISO-8859-1
Bonjour {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/user_activate.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate.tpl 3 Apr 2002 17:47:16 -0000 1.3
--- user_activate.tpl 17 May 2002 13:13:41 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Réactivez votre compte
+ Charset: ISO-8859-1
Bonjour {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/user_activate_passwd.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate_passwd.tpl 3 Apr 2002 17:47:16 -0000 1.3
--- user_activate_passwd.tpl 17 May 2002 13:13:41 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Activation du nouveau mot de passe
+ Charset: ISO-8859-1
Bonjour {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/user_welcome.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome.tpl 3 Apr 2002 17:47:16 -0000 1.3
--- user_welcome.tpl 17 May 2002 13:13:41 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Bienvenue sur les forums de {SITENAME}
+ Charset: ISO-8859-1
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/user_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome_inactive.tpl 3 Apr 2002 17:47:16 -0000 1.3
--- user_welcome_inactive.tpl 17 May 2002 13:13:41 -0000 1.3.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: ISO-8859-1
+
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_chinese_traditional_taiwan/email
Modified Files:
Tag: phpBB-2_0_0
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_denied.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:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/admin_activate.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** admin_activate.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- admin_activate.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,7 ****
! ±z¦n,
!
! ³oÓ "{USERNAME}" ªº±b¸¹¥¿¦bµ¥«Ý¶}³q (¥i¯à¼È®É³Qáµ²¤F©Î¬O¤~è§¹¦¨µù¥Uµ{§Ç). ¦pªG¦³¥²nªº¸Ü, ½Ð¥ý¬d©ú³oӨϥΪ̪º¸ê®Æ, µM«á§Q¥Î¥H¤U³sµ²±Ò¥Î³oÓ·|û±b¸¹:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,9 ----
! Charset: big5
!
! ±z¦n,
!
! ³oÓ "{USERNAME}" ªº±b¸¹¥¿¦bµ¥«Ý¶}³q (¥i¯à¼È®É³Qáµ²¤F©Î¬O¤~è§¹¦¨µù¥Uµ{§Ç). ¦pªG¦³¥²nªº¸Ü, ½Ð¥ý¬d©ú³oӨϥΪ̪º¸ê®Æ, µM«á§Q¥Î¥H¤U³sµ²±Ò¥Î³oÓ·|û±b¸¹:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 28 Feb 2002 14:18:52 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:36 -0000 1.1.2.1
***************
*** 1,10 ****
! ³o«Ê¹q¤l¶l¥ó¬O¥Ñ"{SITENAME}"ºÞ²z¹Î¶¤©Ò±H¥X. °²¦p³o«Ê¹q¤l¶l¥óªº¤º®e¥O§A·P¨ì¤£´r§Ö, ¬Æ¦Ü¬O´c·Nªº§ðÀ»§åµû, ½Ð§Q¥Î¥H¤Uªº³sµ²´£¥X¥Ó¶D:
!
! {BOARD_EMAIL}
!
! ¥]§t³o«Ê§¹¾ãªº¹q¤l¶l¥ó(¯S§O¬O¼ÐÃD).
!
! ªþ±aµ¹§Aªº°T®§¦p¤U:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
--- 1,12 ----
! Charset: big5
!
! ³o«Ê¹q¤l¶l¥ó¬O¥Ñ"{SITENAME}"ºÞ²z¹Î¶¤©Ò±H¥X. °²¦p³o«Ê¹q¤l¶l¥óªº¤º®e¥O§A·P¨ì¤£´r§Ö, ¬Æ¦Ü¬O´c·Nªº§ðÀ»§åµû, ½Ð§Q¥Î¥H¤Uªº³sµ²´£¥X¥Ó¶D:
!
! {BOARD_EMAIL}
!
! ¥]§t³o«Ê§¹¾ãªº¹q¤l¶l¥ó(¯S§O¬O¼ÐÃD).
!
! ªþ±aµ¹§Aªº°T®§¦p¤U:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/admin_welcome_activated.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** admin_welcome_activated.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- admin_welcome_activated.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,5 ****
! ¿Ë·Rªº {USERNAME} ±z¦n,
!
! ±z¦b"{SITENAME}"ªº±b¸¹¤w¸g±Ò¥Î, ±z¥i¥H¨Ï¥Î©Ò¦¬¨ìªº·|û±b¸¹¤Î±K½Xµn¤J"{SITENAME}".
!
{EMAIL_SIG}
--- 1,7 ----
! Charset: big5
!
! ¿Ë·Rªº {USERNAME} ±z¦n,
!
! ±z¦b"{SITENAME}"ªº±b¸¹¤w¸g±Ò¥Î, ±z¥i¥H¨Ï¥Î©Ò¦¬¨ìªº·|û±b¸¹¤Î±K½Xµn¤J"{SITENAME}".
!
{EMAIL_SIG}
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** admin_welcome_inactive.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- admin_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,16 ****
! {WELCOME_MSG}
!
! ½Ð§´µ½«O¯d³o«Ê¹q¤l¶l¥ó. ±zªº±b¸¹¸ê®Æ¦p¤U:
!
! ----------------------------
! ±b¸¹: {USERNAME}
! ±K½X: {PASSWORD}
! ----------------------------
!
! ±zªº±b¸¹¥Ø«e©|¥¼±Ò¥Î, ¨t²ÎºÞ²zû±N¬°±z¶}³q±b¸¹. ·í¦¹°Ê§@§¹¦¨«á, ±z±N·|¦¬¨ì¤@«Ê½T»{«H¨ç.
!
! ½Ð¤£n§Ñ°O±zªº±K½X, ¦]¬°©Ò¦³±K½X§¡¸g¹L¥[±K³B²z, ´N³s¨t²ÎºÞ²zû¤]µLªk¨ú±o. µM¦Ó, ¦pªG±z§Ñ°O¤F±K½X, ±z¥i¥H«·s¥Ó½Ð¤@²Õ·sªº±K½X, ¨t²Î±N·|±Hµo·sªº±K½Xµ¹±z.
!
! ·PÁ±zªºµù¥U.
!
{EMAIL_SIG}
--- 1,18 ----
! Charset: big5
!
! {WELCOME_MSG}
!
! ½Ð§´µ½«O¯d³o«Ê¹q¤l¶l¥ó. ±zªº±b¸¹¸ê®Æ¦p¤U:
!
! ----------------------------
! ±b¸¹: {USERNAME}
! ±K½X: {PASSWORD}
! ----------------------------
!
! ±zªº±b¸¹¥Ø«e©|¥¼±Ò¥Î, ¨t²ÎºÞ²zû±N¬°±z¶}³q±b¸¹. ·í¦¹°Ê§@§¹¦¨«á, ±z±N·|¦¬¨ì¤@«Ê½T»{«H¨ç.
!
! ½Ð¤£n§Ñ°O±zªº±K½X, ¦]¬°©Ò¦³±K½X§¡¸g¹L¥[±K³B²z, ´N³s¨t²ÎºÞ²zû¤]µLªk¨ú±o. µM¦Ó, ¦pªG±z§Ñ°O¤F±K½X, ±z¥i¥H«·s¥Ó½Ð¤@²Õ·sªº±K½X, ¨t²Î±N·|±Hµo·sªº±K½Xµ¹±z.
!
! ·PÁ±zªºµù¥U.
!
{EMAIL_SIG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** coppa_welcome_inactive.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,51 ****
! {WELCOME_MSG}
!
! ¨Ì·Ó"¬ü°ê¨àµ£ºô¸ôÁô¨p«OÅ@ªk"³W©w, ±zªº±b¸¹©|¥¼¯à±Ò¥Î.
!
! ½Ð¦C¦L¥H¤Uªí®æ¨Ã½Ð±zªº¤÷¥À©ÎºÊÅ@¤Hñ¤W¦W¦r©M¤é´Á,±N¨ä¶Ç¯u¨ì:
!
! {FAX_INFO}
!
! ©Î¶l±H¨ì:
!
! {MAIL_INFO}
!
! ------------------------------ ¥Ñ¦¹µô¶} ------------------------------
! {SITENAME} ·|ûµù¥U¥Ó½Ð®Ñ
!
! ¨Ï¥ÎªÌ¦WºÙ: {USERNAME}
! ±K½X: {PASSWORD}
! ¹q¤l¶l¥ó: {EMAIL_ADDRESS}
!
! ICQ ½s¸¹: {ICQ}
! AIM ¦ì§}: {AIM}
! MSN ¶Ç°TªÌ: {MSN}
! ¶®ªê§Y®É³q: {YIM}
! Ó¤Hº¶: {WEB_SITE}
! ¨Ó¦Û: {FROM}
! ¾·~: {OCC}
! ¿³½ì: {INTERESTS}
!
! ¥»¤H¤w¬Ý¹L«OÅ@¨àµ£ªº±ø¤å¨Ã¥B¤¹³\"{SITENAME}"Àx¦s³o¨Ç¸ê°T.
! ¥»¤H¤F¸Ñ³o¨Ç¸ê°T¥i¯à¦b¥ô¦ó®ÉÔ³QÁä¤J±K½X§ó§ï.
! ¥»¤H¤F¸Ñ³o¨Ç¸ê®Æ¥i¯à¦b¥ô¦ó®ÉÔ¥Ñ"{SITENAME}"©Ò²¾°£.
!
!
! ®aªø©ÎºÊÅ@¤H
! (½Ð¦b¦¹Ã±¦W): _____________________
!
! ¥»¤H
! (½Ð¦b¦¹Ã±¦W): __________________
!
! ¤é´Á: _______________
!
! ------------------------------ ¥Ñ¦¹µô¶}------------------------------
!
!
! ·íºÞ²z¤Hû¦¬¨ì¥H¤Wªº¥Ó½Ð¶Ç¯u©Î¶l¥ó, ¨Ã³q¹L¼f®Ö, ±zªº±b¸¹¤~·|³Q±Ò¥Î.
!
! ½Ð¤£n§Ñ°O±zªº±K½X, ¦]¬°©Ò¦³±K½X§¡¸g¹L¥[±K³B²z, ´N³s¨t²ÎºÞ²zû¤]µLªk¨ú±o. µM¦Ó, ¦pªG±z§Ñ°O¤F±K½X, ±z¥i¥H«·s¥Ó½Ð¤@²Õ·sªº±K½X, ¨t²Î±N·|±Hµo·sªº±K½Xµ¹±z.
!
! ·PÁ±zªºµù¥U.
!
{EMAIL_SIG}
--- 1,53 ----
! Charset: big5
!
! {WELCOME_MSG}
!
! ¨Ì·Ó"¬ü°ê¨àµ£ºô¸ôÁô¨p«OÅ@ªk"³W©w, ±zªº±b¸¹©|¥¼¯à±Ò¥Î.
!
! ½Ð¦C¦L¥H¤Uªí®æ¨Ã½Ð±zªº¤÷¥À©ÎºÊÅ@¤Hñ¤W¦W¦r©M¤é´Á,±N¨ä¶Ç¯u¨ì:
!
! {FAX_INFO}
!
! ©Î¶l±H¨ì:
!
! {MAIL_INFO}
!
! ------------------------------ ¥Ñ¦¹µô¶} ------------------------------
! {SITENAME} ·|ûµù¥U¥Ó½Ð®Ñ
!
! ¨Ï¥ÎªÌ¦WºÙ: {USERNAME}
! ±K½X: {PASSWORD}
! ¹q¤l¶l¥ó: {EMAIL_ADDRESS}
!
! ICQ ½s¸¹: {ICQ}
! AIM ¦ì§}: {AIM}
! MSN ¶Ç°TªÌ: {MSN}
! ¶®ªê§Y®É³q: {YIM}
! Ó¤Hº¶: {WEB_SITE}
! ¨Ó¦Û: {FROM}
! ¾·~: {OCC}
! ¿³½ì: {INTERESTS}
!
! ¥»¤H¤w¬Ý¹L«OÅ@¨àµ£ªº±ø¤å¨Ã¥B¤¹³\"{SITENAME}"Àx¦s³o¨Ç¸ê°T.
! ¥»¤H¤F¸Ñ³o¨Ç¸ê°T¥i¯à¦b¥ô¦ó®ÉÔ³QÁä¤J±K½X§ó§ï.
! ¥»¤H¤F¸Ñ³o¨Ç¸ê®Æ¥i¯à¦b¥ô¦ó®ÉÔ¥Ñ"{SITENAME}"©Ò²¾°£.
!
!
! ®aªø©ÎºÊÅ@¤H
! (½Ð¦b¦¹Ã±¦W): _____________________
!
! ¥»¤H
! (½Ð¦b¦¹Ã±¦W): __________________
!
! ¤é´Á: _______________
!
! ------------------------------ ¥Ñ¦¹µô¶}------------------------------
!
!
! ·íºÞ²z¤Hû¦¬¨ì¥H¤Wªº¥Ó½Ð¶Ç¯u©Î¶l¥ó, ¨Ã³q¹L¼f®Ö, ±zªº±b¸¹¤~·|³Q±Ò¥Î.
!
! ½Ð¤£n§Ñ°O±zªº±K½X, ¦]¬°©Ò¦³±K½X§¡¸g¹L¥[±K³B²z, ´N³s¨t²ÎºÞ²zû¤]µLªk¨ú±o. µM¦Ó, ¦pªG±z§Ñ°O¤F±K½X, ±z¥i¥H«·s¥Ó½Ð¤@²Õ·sªº±K½X, ¨t²Î±N·|±Hµo·sªº±K½Xµ¹±z.
!
! ·PÁ±zªºµù¥U.
!
{EMAIL_SIG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/group_added.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** group_added.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- group_added.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,9 ****
! ®¥³ß±z,
!
! ±z¤w¸g¥¿¦¡¥[¤J"{SITENAME}"ªº"{GROUP_NAME}"³oÓ¸s²Õ.
! ³oӰʧ@¬O¥ÑºÞ²z¹Î¶¤©Ò§@¥Xªº¨M©w, ¦p¦³¥ô¦óºÃ°Ý½ÐÁpôºÞ²zûÌ.
!
! ±z¥i¥H§Q¥Î¥H¤U³sµ²¬d¬Ý¸s²Õ¸ê®Æ:
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Charset: big5
!
! ®¥³ß±z,
!
! ±z¤w¸g¥¿¦¡¥[¤J"{SITENAME}"ªº"{GROUP_NAME}"³oÓ¸s²Õ.
! ³oӰʧ@¬O¥ÑºÞ²z¹Î¶¤©Ò§@¥Xªº¨M©w, ¦p¦³¥ô¦óºÃ°Ý½ÐÁpôºÞ²zûÌ.
!
! ±z¥i¥H§Q¥Î¥H¤U³sµ²¬d¬Ý¸s²Õ¸ê®Æ:
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/group_approved.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** group_approved.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- group_approved.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,8 ****
! ®¥³ß±z,
!
! §A¦b"{SITENAME}"©Ò¥Ó½Ð¥[¤Jªº¸s²Õ"{GROUP_NAME}", ¤w¸gÀò±o§åã.
! ½Ð§Q¥Î¥H¤U³sµ²¥h¬Ý¬Ý±zªº¸s²Õ¦¨û§a!
!
! {U_GROUPCP}
!
{EMAIL_SIG}
--- 1,10 ----
! Charset: big5
!
! ®¥³ß±z,
!
! §A¦b"{SITENAME}"©Ò¥Ó½Ð¥[¤Jªº¸s²Õ"{GROUP_NAME}", ¤w¸gÀò±o§åã.
! ½Ð§Q¥Î¥H¤U³sµ²¥h¬Ý¬Ý±zªº¸s²Õ¦¨û§a!
!
! {U_GROUPCP}
!
{EMAIL_SIG}
Index: group_denied.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/group_denied.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_denied.tpl 10 Mar 2002 03:23:55 -0000 1.2
--- group_denied.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,9 ****
! ±z¦n,
!
! «Ü©êºp, §A¦b"{SITENAME}"©Ò¥Ó½Ð¥[¤Jªº¸s²Õ"{GROUP_NAME}", ¨Ã¥¼Àò±o§åã.
!
! ½Ð¦b¸Ô²Ó¤F¸Ñ¥[¤J¿ìªk«á, ¨Ì·Ó¸s²Õ²Õªø©Ò§@¤§³W©w¿ì²z¥Ó½Ð¤âÄò. ¦pªG±z¥¼²Å¦X¥[¤Jªº¸ê®æ, ½Ð¤Å«½Æ¥Ó½Ð¥[¤J, ¸s²Õ²Õªø¦³Åv¼f®Ö¨ä¸s²Õ¦¨û.
!
! ¤£«K¤§³B, ·q½Ðì½Ì.
!
{EMAIL_SIG}
--- 1,11 ----
! Charset: big5
!
! ±z¦n,
!
! «Ü©êºp, §A¦b"{SITENAME}"©Ò¥Ó½Ð¥[¤Jªº¸s²Õ"{GROUP_NAME}", ¨Ã¥¼Àò±o§åã.
!
! ½Ð¦b¸Ô²Ó¤F¸Ñ¥[¤J¿ìªk«á, ¨Ì·Ó¸s²Õ²Õªø©Ò§@¤§³W©w¿ì²z¥Ó½Ð¤âÄò. ¦pªG±z¥¼²Å¦X¥[¤Jªº¸ê®æ, ½Ð¤Å«½Æ¥Ó½Ð¥[¤J, ¸s²Õ²Õªø¦³Åv¼f®Ö¨ä¸s²Õ¦¨û.
!
! ¤£«K¤§³B, ·q½Ðì½Ì.
!
{EMAIL_SIG}
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/group_request.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** group_request.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- group_request.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,8 ****
! ¿Ë·Rªº {GROUP_MODERATOR} ±z¦n,
!
! ¦³¤@Ó·|û´£¥X¥Ó½Ð¥[¤J§A¦b"{SITENAME}"©ÒºÞ²zªº·|û¸s²Õ.
! ½Ð§Q¥Î¥H¤U³sµ²§@¥X§åã©Î¬O»é¦^¥Ó½Ðªº¨M©w:
!
! {U_GROUPCP}
!
{EMAIL_SIG}
--- 1,10 ----
! Charset: big5
!
! ¿Ë·Rªº {GROUP_MODERATOR} ±z¦n,
!
! ¦³¤@Ó·|û´£¥X¥Ó½Ð¥[¤J§A¦b"{SITENAME}"©ÒºÞ²zªº·|û¸s²Õ.
! ½Ð§Q¥Î¥H¤U³sµ²§@¥X§åã©Î¬O»é¦^¥Ó½Ðªº¨M©w:
!
! {U_GROUPCP}
!
{EMAIL_SIG}
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/privmsg_notify.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** privmsg_notify.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- privmsg_notify.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,9 ****
! ¿Ë·Rªº {USERNAME} ±z¦n,
!
! ±z¦b"{SITENAME}"¦³·sªº¨p¤H°T®§, ¦Ó¥B±zn¨D¨t²Î¥H¹q¤l¶l¥ó³qª¾. ±z¥i¥H§Q¥Î¥H¤Uªº³sµ²À˵ø±z覬¨ìªº¨p¤H°T®§:
!
! {U_INBOX}
!
! ½Ð°O±o±zÀH®É³£¥i¥H¨ú®ø³oÃþªº¹q¤l¶l¥ó³qª¾, ±z¥i¥H§ó§ïÓ¤H¸ê®Æ³]©w¸Ìªº¬ÛÃö¿ï¶µ.
!
{EMAIL_SIG}
--- 1,11 ----
! Charset: big5
!
! ¿Ë·Rªº {USERNAME} ±z¦n,
!
! ±z¦b"{SITENAME}"¦³·sªº¨p¤H°T®§, ¦Ó¥B±zn¨D¨t²Î¥H¹q¤l¶l¥ó³qª¾. ±z¥i¥H§Q¥Î¥H¤Uªº³sµ²À˵ø±z覬¨ìªº¨p¤H°T®§:
!
! {U_INBOX}
!
! ½Ð°O±o±zÀH®É³£¥i¥H¨ú®ø³oÃþªº¹q¤l¶l¥ó³qª¾, ±z¥i¥H§ó§ïÓ¤H¸ê®Æ³]©w¸Ìªº¬ÛÃö¿ï¶µ.
!
{EMAIL_SIG}
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 28 Feb 2002 14:18:52 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:36 -0000 1.1.2.1
***************
*** 1,12 ****
! ¿Ë·Rªº {TO_USERNAME} ±z¦n,
!
! ³o«Ê¹q¤l¶l¥ó¬O¥Ñ"{FROM_USERNAME}"³z¹L±z¦b"{SITENAME}"ªº·|û¸ê®Æ©Ò¶Ç°e. °²¦p³o«Ê¹q¤l¶l¥óªº¤º®e¥O§A·P¨ì¤£´r§Ö, ¬Æ¦Ü¬O´c·Nªº§ðÀ»§åµû, ½Ð§Q¥Î¥H¤Uªº³sµ²´£¥X¥Ó¶D:
!
! {BOARD_EMAIL}
!
! ¥]§t³o«Ê§¹¾ãªº¹q¤l¶l¥ó(¯S§O¬O¼ÐÃD). ½Ðª`·N¦^ÂЪº¹q¤l¶l¥ó«H½c¤w³]©w¬°"{FROM_USERNAME}".
!
! ªþ±aµ¹§Aªº°T®§¦p¤U:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
{MESSAGE}
--- 1,14 ----
! Charset: big5
!
! ¿Ë·Rªº {TO_USERNAME} ±z¦n,
!
! ³o«Ê¹q¤l¶l¥ó¬O¥Ñ"{FROM_USERNAME}"³z¹L±z¦b"{SITENAME}"ªº·|û¸ê®Æ©Ò¶Ç°e. °²¦p³o«Ê¹q¤l¶l¥óªº¤º®e¥O§A·P¨ì¤£´r§Ö, ¬Æ¦Ü¬O´c·Nªº§ðÀ»§åµû, ½Ð§Q¥Î¥H¤Uªº³sµ²´£¥X¥Ó¶D:
!
! {BOARD_EMAIL}
!
! ¥]§t³o«Ê§¹¾ãªº¹q¤l¶l¥ó(¯S§O¬O¼ÐÃD). ½Ðª`·N¦^ÂЪº¹q¤l¶l¥ó«H½c¤w³]©w¬°"{FROM_USERNAME}".
!
! ªþ±aµ¹§Aªº°T®§¦p¤U:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
{MESSAGE}
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/topic_notify.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** topic_notify.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- topic_notify.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,11 ****
! ¿Ë·Rªº {USERNAME} ±z¦n,
!
! ±z¦¬¨ì³o«Ê³o«Ê¹q¤l¶l¥ó¬O¦]¬°±z¦b"{SITENAME}"q¾\¤F¥DÃD"{TOPIC_TITLE}", ³oÓ¥DÃD¦b±z¤W¦¸¨Ó³X«á¦³·sªº¦^ÂаT®§. ±z¥i¥H¨Ï¥Î¥H¤U³sµ²¨ÓÆ[¬Ý¦^ÂЪº°T®§, ¦b±zÆ[¬Ýì¥DÃD¤§«e, ¤£·|¦³§ó·sªº°T®§³qª¾±z.
!
! {U_TOPIC}
!
! ¦pªG±z·Q¨ú®øq¾\³oÓ¥DÃD, ±z¥i¥H«ö¤U¥DÃD¤U¤è"¨ú®øq¾\³oÓ¥DÃD (¦^Âгqª¾)"ªº³sµ², ©Îª½±µ¨Ï¥Î¥H¤U³sµ²:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
--- 1,13 ----
! Charset: big5
!
! ¿Ë·Rªº {USERNAME} ±z¦n,
!
! ±z¦¬¨ì³o«Ê³o«Ê¹q¤l¶l¥ó¬O¦]¬°±z¦b"{SITENAME}"q¾\¤F¥DÃD"{TOPIC_TITLE}", ³oÓ¥DÃD¦b±z¤W¦¸¨Ó³X«á¦³·sªº¦^ÂаT®§. ±z¥i¥H¨Ï¥Î¥H¤U³sµ²¨ÓÆ[¬Ý¦^ÂЪº°T®§, ¦b±zÆ[¬Ýì¥DÃD¤§«e, ¤£·|¦³§ó·sªº°T®§³qª¾±z.
!
! {U_TOPIC}
!
! ¦pªG±z·Q¨ú®øq¾\³oÓ¥DÃD, ±z¥i¥H«ö¤U¥DÃD¤U¤è"¨ú®øq¾\³oÓ¥DÃD (¦^Âгqª¾)"ªº³sµ², ©Îª½±µ¨Ï¥Î¥H¤U³sµ²:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/user_activate.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** user_activate.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- user_activate.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,7 ****
! ¿Ë·Rªº {USERNAME} ±z¦n,
!
! ±z¦b"{SITENAME}"ªº±b¸¹¼È®É³Qáµ², ³Ì¦³¥i¯àªºì¦]¬O¦]¬°±z§ó§ï¹L±zªºÓ¤H¸ê®Æ. ½Ð¨Ï¥Î¥H¤U³sµ²«·s±Ò¥Î±zªº±b¸¹:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,9 ----
! Charset: big5
!
! ¿Ë·Rªº {USERNAME} ±z¦n,
!
! ±z¦b"{SITENAME}"ªº±b¸¹¼È®É³Qáµ², ³Ì¦³¥i¯àªºì¦]¬O¦]¬°±z§ó§ï¹L±zªºÓ¤H¸ê®Æ. ½Ð¨Ï¥Î¥H¤U³sµ²«·s±Ò¥Î±zªº±b¸¹:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/user_activate_passwd.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** user_activate_passwd.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- user_activate_passwd.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,15 ****
! ¿Ë·Rªº {USERNAME} ±z¦n,
!
! ±z¦¬¨ì³o«Ê³o«Ê¹q¤l¶l¥ó¬O¦]¬°±z (©ÎªÌ¬O¬Y¤H«_¥R±zªº¦W¸q) ¥Ó½Ð¤F¤@²Õ·sªº±K½X. °²¦p³o¤£¬O±z¥»¤H©Ò¥Ó½Ð, ½Ð¤£¥Î²z·|³o«Ê¹q¤l¶l¥ó, ¦ý¬O¦pªG±z«ùÄò¦¬¨ì³oÃþªº«H¥óÄÌÂZ, ½Ð±z¾¨§Ö¦VºÞ²z¤Hû³sô.
!
! n¨Ï¥Î³o²Õ·sªº±K½X, ½Ð¨Ï¥Î¥H¤U³sµ²±Ò¥Î±K½X.
!
! {U_ACTIVATE}
!
! ¦b±K½X±Ò¥Î¤§«á, ±z±N¥i¥H¶¶§Q¨Ï¥Î·sªº±K½Xµn¤J:
!
! ±K½X: {PASSWORD}
!
! ±z¥i¥H¦b±zªºÓ¤H¸ê®Æ¤¤¦Û¦æ§ó§ï±b¸¹±K½X. ¦pªG±zÁÙ¦³¥ô¦óªººÃ°Ý, ½Ð»P¨t²ÎºÞ²zûÁpµ¸.
!
{EMAIL_SIG}
--- 1,17 ----
! Charset: big5
!
! ¿Ë·Rªº {USERNAME} ±z¦n,
!
! ±z¦¬¨ì³o«Ê³o«Ê¹q¤l¶l¥ó¬O¦]¬°±z (©ÎªÌ¬O¬Y¤H«_¥R±zªº¦W¸q) ¥Ó½Ð¤F¤@²Õ·sªº±K½X. °²¦p³o¤£¬O±z¥»¤H©Ò¥Ó½Ð, ½Ð¤£¥Î²z·|³o«Ê¹q¤l¶l¥ó, ¦ý¬O¦pªG±z«ùÄò¦¬¨ì³oÃþªº«H¥óÄÌÂZ, ½Ð±z¾¨§Ö¦VºÞ²z¤Hû³sô.
!
! n¨Ï¥Î³o²Õ·sªº±K½X, ½Ð¨Ï¥Î¥H¤U³sµ²±Ò¥Î±K½X.
!
! {U_ACTIVATE}
!
! ¦b±K½X±Ò¥Î¤§«á, ±z±N¥i¥H¶¶§Q¨Ï¥Î·sªº±K½Xµn¤J:
!
! ±K½X: {PASSWORD}
!
! ±z¥i¥H¦b±zªºÓ¤H¸ê®Æ¤¤¦Û¦æ§ó§ï±b¸¹±K½X. ¦pªG±zÁÙ¦³¥ô¦óªººÃ°Ý, ½Ð»P¨t²ÎºÞ²zûÁpµ¸.
!
{EMAIL_SIG}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/user_welcome.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** user_welcome.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- user_welcome.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,14 ****
! {WELCOME_MSG}
!
! ½Ð§´µ½«O¯d³o«Ê¹q¤l¶l¥ó. ±zªº±b¸¹¸ê®Æ¦p¤U:
!
! ----------------------------
! ±b¸¹: {USERNAME}
! ±K½X: {PASSWORD}
! ----------------------------
!
! ½Ð¤£n§Ñ°O±zªº±K½X, ¦]¬°©Ò¦³±K½X§¡¸g¹L¥[±K³B²z, ´N³s¨t²ÎºÞ²zû¤]µLªk¨ú±o. µM¦Ó, ¦pªG±z§Ñ°O¤F±K½X, ±z¥i¥H«·s¥Ó½Ð¤@²Õ·sªº±K½X, ¨t²Î±N·|±Hµo·sªº±K½Xµ¹±z.
!
! ·PÁ±zªºµù¥U.
!
{EMAIL_SIG}
--- 1,16 ----
! Charset: big5
!
! {WELCOME_MSG}
!
! ½Ð§´µ½«O¯d³o«Ê¹q¤l¶l¥ó. ±zªº±b¸¹¸ê®Æ¦p¤U:
!
! ----------------------------
! ±b¸¹: {USERNAME}
! ±K½X: {PASSWORD}
! ----------------------------
!
! ½Ð¤£n§Ñ°O±zªº±K½X, ¦]¬°©Ò¦³±K½X§¡¸g¹L¥[±K³B²z, ´N³s¨t²ÎºÞ²zû¤]µLªk¨ú±o. µM¦Ó, ¦pªG±z§Ñ°O¤F±K½X, ±z¥i¥H«·s¥Ó½Ð¤@²Õ·sªº±K½X, ¨t²Î±N·|±Hµo·sªº±K½Xµ¹±z.
!
! ·PÁ±zªºµù¥U.
!
{EMAIL_SIG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/user_welcome_inactive.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** user_welcome_inactive.tpl 8 Apr 2002 14:44:12 -0000 1.2.2.1
--- user_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.2.2.2
***************
*** 1,18 ****
! {WELCOME_MSG}
!
! ½Ð§´µ½«O¯d³o«Ê¹q¤l¶l¥ó. ±zªº±b¸¹¸ê®Æ¦p¤U:
!
! ----------------------------
! ±b¸¹: {USERNAME}
! ±K½X: {PASSWORD}
! ----------------------------
!
! ±zªº±b¸¹©|¥¼±Ò¥Î, ±z¥²¶·¨Ï¥Î¥H¤U³sµ²±Ò¥Î§Aªº±b¸¹:
!
! {U_ACTIVATE}
!
! ½Ð¤£n§Ñ°O±zªº±K½X, ¦]¬°©Ò¦³±K½X§¡¸g¹L¥[±K³B²z, ´N³s¨t²ÎºÞ²zû¤]µLªk¨ú±o. µM¦Ó, ¦pªG±z§Ñ°O¤F±K½X, ±z¥i¥H«·s¥Ó½Ð¤@²Õ·sªº±K½X, ¨t²Î±N·|±Hµo·sªº±K½Xµ¹±z.
!
! ·PÁ±zªºµù¥U.
!
{EMAIL_SIG}
--- 1,20 ----
! Charset: big5
!
! {WELCOME_MSG}
!
! ½Ð§´µ½«O¯d³o«Ê¹q¤l¶l¥ó. ±zªº±b¸¹¸ê®Æ¦p¤U:
!
! ----------------------------
! ±b¸¹: {USERNAME}
! ±K½X: {PASSWORD}
! ----------------------------
!
! ±zªº±b¸¹©|¥¼±Ò¥Î, ±z¥²¶·¨Ï¥Î¥H¤U³sµ²±Ò¥Î§Aªº±b¸¹:
!
! {U_ACTIVATE}
!
! ½Ð¤£n§Ñ°O±zªº±K½X, ¦]¬°©Ò¦³±K½X§¡¸g¹L¥[±K³B²z, ´N³s¨t²ÎºÞ²zû¤]µLªk¨ú±o. µM¦Ó, ¦pªG±z§Ñ°O¤F±K½X, ±z¥i¥H«·s¥Ó½Ð¤@²Õ·sªº±K½X, ¨t²Î±N·|±Hµo·sªº±K½Xµ¹±z.
!
! ·PÁ±zªºµù¥U.
!
{EMAIL_SIG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_finnish/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_finnish/email
Modified Files:
Tag: phpBB-2_0_0
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:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/admin_activate.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_activate.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- admin_activate.tpl 17 May 2002 13:13:38 -0000 1.3.2.1
***************
*** 1,9 ****
! Subject: Uusi käyttäjätunnus
!
! Tervehdys,
!
! Käyttäjätunnus nimellä "{USERNAME}" on passivoitu tai juuri luotu, sinun tulee tarkistaa tämän käyttäjätunnuksen tiedot (jos tarpeen) ja aktivoida tunnus käyttäen seuraava linkkiä:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,10 ----
! Subject: Uusi käyttäjätunnus
! Charset: iso-8859-1
!
! Tervehdys,
!
! Käyttäjätunnus nimellä "{USERNAME}" on passivoitu tai juuri luotu, sinun tulee tarkistaa tämän käyttäjätunnuksen tiedot (jos tarpeen) ja aktivoida tunnus käyttäen seuraava linkkiä:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 26 Dec 2001 23:52:58 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:38 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Oheisen sähköpostin on lähettänyt sinulle ylläpito sivustolta "{SITENAME}". Jos tämä viesti on roskapostia, sisältää loukkaavaa tai muuten mielestäsi sopimatonta tekstiä, ole hyvä ja ota yhteys sivuston webmasteriin seuraavassa osoitteessa:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/admin_welcome_activated.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_activated.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- admin_welcome_activated.tpl 17 May 2002 13:13:38 -0000 1.3.2.1
***************
*** 1,7 ****
! Subject: Käyttäjätunnus aktivoitu
!
! Tervehdys {USERNAME},
!
! Käyttäjätunnuksesi sivustolla "{SITENAME}" on nyt aktivoitu. Voit kirjautua sisään käyttäen käyttäjätunnusta ja salasanaa jotka sait edellisessä sähköpostissa.
!
{EMAIL_SIG}
--- 1,8 ----
! Subject: Käyttäjätunnus aktivoitu
! Charset: iso-8859-1
!
! Tervehdys {USERNAME},
!
! Käyttäjätunnuksesi sivustolla "{SITENAME}" on nyt aktivoitu. Voit kirjautua sisään käyttäen käyttäjätunnusta ja salasanaa jotka sait edellisessä sähköpostissa.
!
{EMAIL_SIG}
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/admin_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_inactive.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- admin_welcome_inactive.tpl 17 May 2002 13:13:38 -0000 1.3.2.1
***************
*** 1,18 ****
! Subject: Tervetuloa {SITENAME} Foorumeihin
!
! {WELCOME_MSG}
!
! Ole hyvä ja säilytä tämä viesti. Käyttäjätietosi ovat seuraavanlaiset:
!
! ----------------------------
! Käyttäjätunnus: {USERNAME}
! Salasana: {PASSWORD}
! ----------------------------
!
! Käyttäjätunnustasi ei ole vielä aktivoitu. Ylläpidon on aktivoitava käyttäjätunnuksesi ennen kuin voit kirjautua järjestelmään. Saat toisen sähköpostin kun aktivointi on tapahtunut.
!
! Pyydämme, että et unohda salasanaasi. Salasana on kryptattu tietokantaamme emmekä voi selvittää sitä sinulle. Jos kuitenkin unohdat salasanasi niin voit pyytää uutta joka aktivoidaan samalla tavalla kuin tämä.
!
! Kiitoksia rekisteröitymisestä.
!
{EMAIL_SIG}
--- 1,19 ----
! Subject: Tervetuloa {SITENAME} Foorumeihin
! Charset: iso-8859-1
!
! {WELCOME_MSG}
!
! Ole hyvä ja säilytä tämä viesti. Käyttäjätietosi ovat seuraavanlaiset:
!
! ----------------------------
! Käyttäjätunnus: {USERNAME}
! Salasana: {PASSWORD}
! ----------------------------
!
! Käyttäjätunnustasi ei ole vielä aktivoitu. Ylläpidon on aktivoitava käyttäjätunnuksesi ennen kuin voit kirjautua järjestelmään. Saat toisen sähköpostin kun aktivointi on tapahtunut.
!
! Pyydämme, että et unohda salasanaasi. Salasana on kryptattu tietokantaamme emmekä voi selvittää sitä sinulle. Jos kuitenkin unohdat salasanasi niin voit pyytää uutta joka aktivoidaan samalla tavalla kuin tämä.
!
! Kiitoksia rekisteröitymisestä.
!
{EMAIL_SIG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:38 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Tervetuloa {SITENAME} Foorumeihin
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/group_added.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_added.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- group_added.tpl 17 May 2002 13:13:38 -0000 1.3.2.1
***************
*** 1,11 ****
! Subject: Sinut on lisätty tähän käyttäjäryhmään
!
! Onneksi olkoon,
!
! Sinut on lisätty ryhmään "{GROUP_NAME}" sivustolla {SITENAME}.
! Toimenpiteen on tehnyt ryhmän moderaattori tai järjestelmän ylläpitäjä. Ota yhteys heihin, jos tarvitset lisätietoja.
!
! Voit katsella ryhmän tietoja täällä:
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,12 ----
! Subject: Sinut on lisätty tähän käyttäjäryhmään
! Charset: iso-8859-1
!
! Onneksi olkoon,
!
! Sinut on lisätty ryhmään "{GROUP_NAME}" sivustolla {SITENAME}.
! Toimenpiteen on tehnyt ryhmän moderaattori tai järjestelmän ylläpitäjä. Ota yhteys heihin, jos tarvitset lisätietoja.
!
! Voit katsella ryhmän tietoja täällä:
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_approved.tpl 17 May 2002 13:13:38 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Hakemuksesi on hyväksytty
+ Charset: iso-8859-1
Onneksi olkoon,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/group_request.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_request.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- group_request.tpl 17 May 2002 13:13:38 -0000 1.3.2.1
***************
*** 1,10 ****
! Subject: Ryhmään on tehty jäseneksi liittymispyyntö
!
! Arvoisa {GROUP_MODERATOR},
!
! Käyttäjä on pyytänyt lupaa liittyä ryhmään, jonka moderaattori sinä olet sivustolla {SITENAME}.
! Hyväksyäksesi tai hylätäksesi pyyntö käy seuraavassa linkissä:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Subject: Ryhmään on tehty jäseneksi liittymispyyntö
! Charset: iso-8859-1
!
! Arvoisa {GROUP_MODERATOR},
!
! Käyttäjä on pyytänyt lupaa liittyä ryhmään, jonka moderaattori sinä olet sivustolla {SITENAME}.
! Hyväksyäksesi tai hylätäksesi pyyntö käy seuraavassa linkissä:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/privmsg_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- privmsg_notify.tpl 17 May 2002 13:13:38 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Uusi yksityinen viesti on saapunut
+ Charset: iso-8859-1
Tervehdys {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 26 Dec 2001 23:52:58 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:38 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Tervehdys {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- topic_notify.tpl 17 May 2002 13:13:38 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Ilmoitus vastauksesta aiheeseen - {TOPIC_TITLE}
+ Charset: iso-8859-1
Tervehdys {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_activate.tpl 17 May 2002 13:13:38 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Aktivoi uudelleen käyttäjätunnuksesi!
+ Charset: iso-8859-1
Tervehdys {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/user_activate_passwd.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** user_activate_passwd.tpl 10 Mar 2002 03:23:55 -0000 1.4
--- user_activate_passwd.tpl 17 May 2002 13:13:38 -0000 1.4.2.1
***************
*** 1,17 ****
! Subject: Uuden salasanan aktivointi
!
! Tervehdys {USERNAME}
!
! Saat tämän sähköpostin koska olet (tai joku joka väittää olevansa sinä) pyytänyt uutta salasanaa lähetettäväksi käyttäjätunnuksellesi sivustolla {SITENAME}. Jos et pyytänyt tätä sähköpostia, älä piittaa tästä. Jos saat tämän toistuvasti ota yhteys järjestelmän ylläpitoon.
!
! Voidaksesi käyttää uutta salasanaa on sinun aktivoitava se. Tehdäksesi se klikkaa linkkiä alapuolella.
!
! {U_ACTIVATE}
!
! Jos aktivointi onnistuu voi kirjautua uudella salasanalla:
!
! Salasana: {PASSWORD}
!
! Voit tietysti muuttaa tätä salasanaa käyttäjätiedoissasi. Mikäli koet tässä vaikeuksia ota yhteys järjestelmän ylläpitoon.
!
{EMAIL_SIG}
--- 1,18 ----
! Subject: Uuden salasanan aktivointi
! Charset: iso-8859-1
!
! Tervehdys {USERNAME}
!
! Saat tämän sähköpostin koska olet (tai joku joka väittää olevansa sinä) pyytänyt uutta salasanaa lähetettäväksi käyttäjätunnuksellesi sivustolla {SITENAME}. Jos et pyytänyt tätä sähköpostia, älä piittaa tästä. Jos saat tämän toistuvasti ota yhteys järjestelmän ylläpitoon.
!
! Voidaksesi käyttää uutta salasanaa on sinun aktivoitava se. Tehdäksesi se klikkaa linkkiä alapuolella.
!
! {U_ACTIVATE}
!
! Jos aktivointi onnistuu voi kirjautua uudella salasanalla:
!
! Salasana: {PASSWORD}
!
! Voit tietysti muuttaa tätä salasanaa käyttäjätiedoissasi. Mikäli koet tässä vaikeuksia ota yhteys järjestelmän ylläpitoon.
!
{EMAIL_SIG}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/user_welcome.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- user_welcome.tpl 17 May 2002 13:13:38 -0000 1.3.2.1
***************
*** 1,16 ****
! Subject: Tervetuloa {SITENAME} Foorumeihin
!
! {WELCOME_MSG}
!
! Ole hyvä ja talleta tämä sähköposti. Käyttäjätietosi ovat seuraavat:
!
! ----------------------------
! Käyttäjätunnus: {USERNAME}
! Salasana: {PASSWORD}
! ----------------------------
!
! Pyydämme, että et unohda salasanaa. Salasana on kryptattu tietokantaamme, emmekä voi selvittää sitä sinulle. Jos kuitenkin unohdat salasanasi, voit pyytää uutta, joka aktivoidaan kuten tämäkin.
!
! Kiitoksia rekisteröitymisestä.
!
{EMAIL_SIG}
--- 1,17 ----
! Subject: Tervetuloa {SITENAME} Foorumeihin
! Charset: iso-8859-1
!
! {WELCOME_MSG}
!
! Ole hyvä ja talleta tämä sähköposti. Käyttäjätietosi ovat seuraavat:
!
! ----------------------------
! Käyttäjätunnus: {USERNAME}
! Salasana: {PASSWORD}
! ----------------------------
!
! Pyydämme, että et unohda salasanaa. Salasana on kryptattu tietokantaamme, emmekä voi selvittää sitä sinulle. Jos kuitenkin unohdat salasanasi, voit pyytää uutta, joka aktivoidaan kuten tämäkin.
!
! Kiitoksia rekisteröitymisestä.
!
{EMAIL_SIG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_finnish/email/user_welcome_inactive.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** user_welcome_inactive.tpl 10 Mar 2002 03:23:55 -0000 1.4
--- user_welcome_inactive.tpl 17 May 2002 13:13:38 -0000 1.4.2.1
***************
*** 1,20 ****
! Subject: Tervetuloa {SITENAME} Foorumeihin
!
! {WELCOME_MSG}
!
! Ole hyvä ja tallenna tämä sähköposti. Käyttäjätietosi ovat seuraavat:
!
! ----------------------------
! Käyttäjätunnus: {USERNAME}
! Salasana: {PASSWORD}
! ----------------------------
!
! Käyttäjätietojasi ei ole aktivoitu. Et voi käyttää niitä ennen kuin käyt seuraavassa linkissä:
!
! {U_ACTIVATE}
!
! Pyydämme, että et unohda salasanaasi. Salasana on kryptattu tietokantaamme, emmekä voi selvittää sitä sinulle. Jos kuitenkin unohdat salasanasi voit pyytää uutta, joka aktivoidaan kuten tämä.
!
! Kiitoksia rekisteröitymisestä.
!
{EMAIL_SIG}
--- 1,21 ----
! Subject: Tervetuloa {SITENAME} Foorumeihin
! Charset: iso-8859-1
!
! {WELCOME_MSG}
!
! Ole hyvä ja tallenna tämä sähköposti. Käyttäjätietosi ovat seuraavat:
!
! ----------------------------
! Käyttäjätunnus: {USERNAME}
! Salasana: {PASSWORD}
! ----------------------------
!
! Käyttäjätietojasi ei ole aktivoitu. Et voi käyttää niitä ennen kuin käyt seuraavassa linkissä:
!
! {U_ACTIVATE}
!
! Pyydämme, että et unohda salasanaasi. Salasana on kryptattu tietokantaamme, emmekä voi selvittää sitä sinulle. Jos kuitenkin unohdat salasanasi voit pyytää uutta, joka aktivoidaan kuten tämä.
!
! Kiitoksia rekisteröitymisestä.
!
{EMAIL_SIG}
|