From f2d3ed2a6d56b556e5985c8cd37f98db8bb99fd6 Mon Sep 17 00:00:00 2001
From: HarpyWar <harpywar@gmail.com>
Date: Thu, 27 Mar 2014 17:37:23 +0400
Subject: [PATCH] * minor changes in motd, to avoid questions from users "how
 to display red color there"; message with a mail box is more visible now 
 http://img819.imageshack.us/img819/810/40ao.png * add text with a file
 location into all the files with a text information that displayed in games *
 version string changed from "SVN" to "GIT"

---
 conf/bnetd.conf.in               |  3 ++-
 conf/bnetd.conf.win32            |  1 +
 conf/bnmotd-bgBG.txt.in          |  4 +++-
 conf/bnmotd-csCZ.txt.in          | 10 ++++-----
 conf/bnmotd-deDE.txt.in          |  6 ++++--
 conf/bnmotd-enUS.txt.in          |  6 ++++--
 conf/bnmotd-esES.txt.in          |  6 ++++--
 conf/bnmotd-frFR.txt.in          |  6 ++++--
 conf/bnmotd-jpJA.txt.in          |  6 ++++--
 conf/bnmotd-koKR.txt.in          |  6 ++++--
 conf/bnmotd-nlNL.txt.in          |  6 ++++--
 conf/bnmotd-plPL.txt.in          |  6 ++++--
 conf/bnmotd-ptBR.txt.in          |  6 ++++--
 conf/bnmotd-ruRU.txt.in          | 16 +++++++-------
 conf/bnmotd-svSE.txt.in          |  6 ++++--
 conf/bnmotd-zhCN.txt.in          |  6 ++++--
 conf/bnmotd-zhTW.txt.in          |  6 ++++--
 conf/news.txt.in                 | 36 +++++++++++++++++++-------------
 files/newaccount-default.txt     |  2 ++
 files/newaccount-enUS.txt        |  2 ++
 files/termsofservice-default.txt |  2 ++
 files/termsofservice-enUS.txt    |  2 ++
 files/tos-unicode_default.txt    |  2 ++
 files/tos.txt                    |  2 ++
 files/tos_default.txt            |  2 ++
 src/common/version.h             |  2 +-
 26 files changed, 104 insertions(+), 54 deletions(-)

diff --git a/conf/bnetd.conf.in b/conf/bnetd.conf.in
index 5e54a7c..f563516 100644
--- a/conf/bnetd.conf.in
+++ b/conf/bnetd.conf.in
@@ -81,7 +81,8 @@ storage_path = "file:mode=plain;dir=${LOCALSTATEDIR}/users;clan=${LOCALSTATEDIR}
 filedir     = "${LOCALSTATEDIR}/files"
 reportdir   = "${LOCALSTATEDIR}/reports"
 chanlogdir  = "${LOCALSTATEDIR}/chanlogs"
-motdfile    = "${SYSCONFDIR}/bnmotd-enUS.txt"
+motdfile    = "${SYSCONFDIR}/bnmotd.txt"
+motdw3file  = "${SYSCONFDIR}/bnmotd_w3.txt"
 issuefile   = "${SYSCONFDIR}/bnissue.txt"
 channelfile = "${SYSCONFDIR}/channel.conf"
 newsfile    = "${SYSCONFDIR}/news.txt"
diff --git a/conf/bnetd.conf.win32 b/conf/bnetd.conf.win32
index 01157df..ee1524b 100644
--- a/conf/bnetd.conf.win32
+++ b/conf/bnetd.conf.win32
@@ -62,6 +62,7 @@ filedir     = files
 reportdir   = var\reports
 chanlogdir  = var\chanlogs
 motdfile    = conf\bnmotd.txt
+motdw3file  = conf\bnmotd_w3.txt
 issuefile   = conf\bnissue.txt
 channelfile = conf\channel.conf
 newsfile    = conf\news.txt
diff --git a/conf/bnmotd-bgBG.txt.in b/conf/bnmotd-bgBG.txt.in
index 2778516..c21507f 100644
--- a/conf/bnmotd-bgBG.txt.in
+++ b/conf/bnmotd-bgBG.txt.in
@@ -1,4 +1,4 @@
-%IЗдравей %l, добре дошъл в %s!
+%EЗдравей %l, добре дошъл в %s!
 %IВерсията на сървъра е %v на %h.
 %IТози сървър се хоства от %H
 %I
@@ -8,4 +8,6 @@
 %IИмате проблем с команда? Въведете /help за да
 %Iнаучите повече за нея.
 %I
+%I(edit this text in conf/bnmotd-bgBG.txt)
+%I
 %I%m
\ No newline at end of file
diff --git a/conf/bnmotd-csCZ.txt.in b/conf/bnmotd-csCZ.txt.in
index b5f4745..879d6f9 100644
--- a/conf/bnmotd-csCZ.txt.in
+++ b/conf/bnmotd-csCZ.txt.in
@@ -1,14 +1,14 @@
-%IAhoj %l,
+%EAhoj %l,
 %IVitej na serveru %s, verze %v.
 %I
-%I
 %IMomentalne je zde registrovanych %a uzivatelu, z toho je %u online, hrajicich %g hry.
 %I
 %I%N si muzes zahrat s %U hraci, v %G prave probihajicich hrach nebo si muzes pokecat v %c chatech.
 %I
-%I
 %INevis si rady ? Napis /help pro napovedu.
 %I
-%I
 %ITvoje IP adresa: %r, tvoje ID %i a tvuj klient %t.
-%ICZ MOTD by Machy_CZ
\ No newline at end of file
+%I
+%I(edit this text in conf/bnmotd-csCZ.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-deDE.txt.in b/conf/bnmotd-deDE.txt.in
index 369cac5..b28467b 100644
--- a/conf/bnmotd-deDE.txt.in
+++ b/conf/bnmotd-deDE.txt.in
@@ -1,4 +1,4 @@
-%IHallo %l, willkommen zu %s!
+%EHallo %l, willkommen zu %s!
 %ILaufende Version %v auf %h.
 %IDer Server ist von %H gehostet
 %I
@@ -8,4 +8,6 @@
 %IEin Problem mit den Kommandos? Schreibe /help und
 %Ilerne mehr über die Kommandos.
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-deDE.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-enUS.txt.in b/conf/bnmotd-enUS.txt.in
index 82e84ec..43d8600 100644
--- a/conf/bnmotd-enUS.txt.in
+++ b/conf/bnmotd-enUS.txt.in
@@ -1,4 +1,4 @@
-%IHello %l, welcome to %s!
+%EHello %l, welcome to %s!
 %IRunning version %v on %h.
 %IThis server is hosted by %H
 %I
@@ -8,4 +8,6 @@
 %IHaving trouble with a command? Type /help to
 %Ilearn more about it.
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-enUS.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-esES.txt.in b/conf/bnmotd-esES.txt.in
index 220a43d..de6fe58 100644
--- a/conf/bnmotd-esES.txt.in
+++ b/conf/bnmotd-esES.txt.in
@@ -1,4 +1,4 @@
-%IHola %l, bienvenido a %s!
+%EHola %l, bienvenido a %s!
 %IEn %h se usa la versión %v
 %IEste servidor es alojado por %H
 %I
@@ -8,4 +8,6 @@
 %ITiene problemas con algun comando? Teclee "/help" para
 %Iaprender más sobre los comandos.
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-ptBR.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-frFR.txt.in b/conf/bnmotd-frFR.txt.in
index c264825..974fa78 100644
--- a/conf/bnmotd-frFR.txt.in
+++ b/conf/bnmotd-frFR.txt.in
@@ -1,4 +1,4 @@
-%IBonjour %l, bienvenue sur %s!
+%EBonjour %l, bienvenue sur %s!
 %IUtilisant la version %v sur %h.
 %ICe serveur est hébergé par %H
 %I
@@ -8,4 +8,6 @@
 %IUn problème avec une commande ? Tappez /help pour
 %Ien savoir plus.
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-ptBR.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-jpJA.txt.in b/conf/bnmotd-jpJA.txt.in
index 1e4c45a..d9db629 100644
--- a/conf/bnmotd-jpJA.txt.in
+++ b/conf/bnmotd-jpJA.txt.in
@@ -1,4 +1,4 @@
-%I%l さん, PvPGN サーバへようこそ！
+%E%l さん, PvPGN サーバへようこそ！
 %I%h さんが %v を運用します。
 %Iこのサーバは今 %H さんがホスティング中です。
 %I
@@ -8,4 +8,6 @@
 %I%c 個のチャンネが生成しました。
 %Iコマンド・リストは「/help」をタイプして下さい。
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-ptBR.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-koKR.txt.in b/conf/bnmotd-koKR.txt.in
index 76ad1f7..902c6a3 100644
--- a/conf/bnmotd-koKR.txt.in
+++ b/conf/bnmotd-koKR.txt.in
@@ -1,4 +1,4 @@
-%I안녕하세요 %l 님, PvPGN 서버에 오신것을 환영합니다!
+%E안녕하세요 %l 님, PvPGN 서버에 오신것을 환영합니다!
 %I%h 님이 %v 를 구동하고 계십니다.
 %I본 서버는 %H 님이 호스팅하고 계십니다.
 %I
@@ -8,4 +8,6 @@
 %I명령어의 대해 궁금한 사항이 있으시다구요? 
 %I/help 명령어를 이용해 보세요.
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-ptBR.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-nlNL.txt.in b/conf/bnmotd-nlNL.txt.in
index 4515144..cbf3f50 100644
--- a/conf/bnmotd-nlNL.txt.in
+++ b/conf/bnmotd-nlNL.txt.in
@@ -1,5 +1,5 @@
 %IHallo %l, welom bij %s!
-%IWe draaien versie %v op %h.
+%EWe draaien versie %v op %h.
 %IDeze server wordt gehost bij %H
 %I
 %IEr zijn %a gebruikers accounts op deze server.
@@ -8,4 +8,6 @@
 %IProblemen met een commando? Type /help om
 %Ier meer te weten over te komen.
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-nlNL.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-plPL.txt.in b/conf/bnmotd-plPL.txt.in
index 4537cf9..818bc53 100644
--- a/conf/bnmotd-plPL.txt.in
+++ b/conf/bnmotd-plPL.txt.in
@@ -1,4 +1,4 @@
-%ICześć %l, witaj w %s!
+%ECześć %l, witaj w %s!
 %IWersja serwera %v uruchomiona na %h.
 %ISerwer obsługuje %H
 %I
@@ -8,4 +8,6 @@
 %IJeśli masz jakieś problemy z poleceniami, to napiszsz /help aby
 %Idowiedzieć się wiecej.
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-plPL.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-ptBR.txt.in b/conf/bnmotd-ptBR.txt.in
index 8bb264c..527def5 100644
--- a/conf/bnmotd-ptBR.txt.in
+++ b/conf/bnmotd-ptBR.txt.in
@@ -1,4 +1,4 @@
-%IOlá %l, Bem vindo a %s!
+%EOlá %l, Bem vindo a %s!
 %IRodando a versão %v em %h.
 %IEste servidor é hosteado por %H
 %I
@@ -8,4 +8,6 @@
 %ITendo algum problema com comando? Digite /help ra
 %Aprender mais sobre.
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-ptBR.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-ruRU.txt.in b/conf/bnmotd-ruRU.txt.in
index 1c4fd52..65344ea 100644
--- a/conf/bnmotd-ruRU.txt.in
+++ b/conf/bnmotd-ruRU.txt.in
@@ -1,11 +1,13 @@
-%IПривет %l, добро пожаловать на %s!
+%EПривет %l, добро пожаловать на %s!
 %IВерсия сервера %v.
-%IСервер расположен у %h (%H)
+%IСервер расположен у %H (%h)
 %I
-%IСейчас на сервере %a игроков.
-%IВ %G играх находятся %U игроков %N
-%Iиз них %u играют в %g играх и сидят на %c каналах.
+%IНа сервере зарегистрировано %a аккаунтов.
+%IСейчас %G игр и %U игроков в %N
+%Iиз них %u находятся в %g играх и общаются на %c каналах.
 %I
-%IВведите /help для получения помощи по командам чата  
+%IВведите /help для получения помощи по командам чата
 %I
-%I%m
\ No newline at end of file
+%I(измените этот текст в файле conf/bnmotd-ruRU.txt)  
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-svSE.txt.in b/conf/bnmotd-svSE.txt.in
index 9c95920..29ded59 100644
--- a/conf/bnmotd-svSE.txt.in
+++ b/conf/bnmotd-svSE.txt.in
@@ -1,4 +1,4 @@
-%IHej %l, välkommen till %s!
+%EHej %l, välkommen till %s!
 %IKör version %v på %h.
 %IVärden för den här servern är %H
 %I
@@ -8,4 +8,6 @@
 %IHar du problem med ett kommando? Skriv /help för
 %Iatt lära dig mer om det.
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-svSE.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-zhCN.txt.in b/conf/bnmotd-zhCN.txt.in
index 67e42a2..716cccb 100644
--- a/conf/bnmotd-zhCN.txt.in
+++ b/conf/bnmotd-zhCN.txt.in
@@ -1,4 +1,4 @@
-%I%l，你好。欢迎来到 %s！
+%E%l，你好。欢迎来到 %s！
 %I现在 %h 正在运行的版本为 %v
 %I本服务器由 %H 管理维护
 %I
@@ -8,4 +8,6 @@
 %I还不了解可以使用哪些命令？
 %I输入 /help 就可以学习了
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-zhCB.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/bnmotd-zhTW.txt.in b/conf/bnmotd-zhTW.txt.in
index 23b08f6..54c5a5f 100644
--- a/conf/bnmotd-zhTW.txt.in
+++ b/conf/bnmotd-zhTW.txt.in
@@ -1,4 +1,4 @@
-%I哈囉! %l, 歡迎蒞臨 %s!
+%E哈囉! %l, 歡迎蒞臨 %s!
 %I本伺服器由 %H 架設於 %h.
 %I現行的伺服器版本是 %v.
 %I
@@ -7,4 +7,6 @@
 %I其中有 %u 個玩家一邊在玩 %g 個遊戲一邊在 %c 個聊天頻道.
 %I不懂使用指令? 請輸入 /help 來了解更多...
 %I
-%I%m
\ No newline at end of file
+%I(edit this text in conf/bnmotd-zhTW.txt)
+%I
+%M%m
\ No newline at end of file
diff --git a/conf/news.txt.in b/conf/news.txt.in
index a48a6fc..1d1310e 100644
--- a/conf/news.txt.in
+++ b/conf/news.txt.in
@@ -1,26 +1,32 @@
+{03/28/2014}
+(edit this text in conf/news.txt)
+ 
+ 
+Note that Warcraft 3 client caches news in bncache.dat
+(remove the file on the client side before login to see the changes immediately)
+
+ 
+New support channel at:
+http://pvpgn.pro
+
+
 {10/01/2004}
 Welcome To The Player-vs-Player Gaming Network!
 Bringing Emulation To New Levels!
-
+ 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-==-=-=-=-=-=-=-=-=-=-=-=-=-=-==-=-=-=-=-=-=-=
-
+ 
 ** IF YOU EXPERIENCE PROBLEMS USING THIS SERVER PLEASE REPORT IT TO THE **
 *********  ADMINISTRATOR OF THE SERVER NOT TO THE PVPGN TEAM  ************
-
+ 
 Project development homepage: http://pvpgn.berlios.de
-
+ 
 Support channels (ONLY for the admins):
 ========================================
-1. BugTracker (preffered support method):
-http://sourceforge.net/tracker/?atid=470605&group_id=53514&func=browse
-
-2. Mailing List: pvpgn-users@lists.sourceforge.net (to subscribe go here 
-http://lists.sourceforge.net/lists/listinfo/pvpgn-users )
-
-3. Forums: http://forums.pvpgn.org
-
-4. IRC live support: #pvpgn on irc.pvpgn.org
-
+ 
+1. Forums: http://forums.pvpgn.org
+ 
+2. IRC live support: #pvpgn on irc.pvpgn.org
+ 
 Enjoy!
 The PvPGN Team
-http://www.PvPGN.org
diff --git a/files/newaccount-default.txt b/files/newaccount-default.txt
index d457818..6b53ef9 100644
--- a/files/newaccount-default.txt
+++ b/files/newaccount-default.txt
@@ -19,3 +19,5 @@ Battle.net(R) and Blizzard Entertainment(R) are trademarks or registered tradema
 
 Besides all this... Happy gaming..
 PvPGN Project Page: http://pvpgn.berlios.de/
+
+(edit this text in var/files/newaccount-default.txt)
\ No newline at end of file
diff --git a/files/newaccount-enUS.txt b/files/newaccount-enUS.txt
index d457818..d97e629 100644
--- a/files/newaccount-enUS.txt
+++ b/files/newaccount-enUS.txt
@@ -19,3 +19,5 @@ Battle.net(R) and Blizzard Entertainment(R) are trademarks or registered tradema
 
 Besides all this... Happy gaming..
 PvPGN Project Page: http://pvpgn.berlios.de/
+
+(edit this text in var/files/newaccount-enUS.txt)
\ No newline at end of file
diff --git a/files/termsofservice-default.txt b/files/termsofservice-default.txt
index d457818..7e8591f 100644
--- a/files/termsofservice-default.txt
+++ b/files/termsofservice-default.txt
@@ -19,3 +19,5 @@ Battle.net(R) and Blizzard Entertainment(R) are trademarks or registered tradema
 
 Besides all this... Happy gaming..
 PvPGN Project Page: http://pvpgn.berlios.de/
+
+(edit this text in var/files/termsofservice-default.txt)
\ No newline at end of file
diff --git a/files/termsofservice-enUS.txt b/files/termsofservice-enUS.txt
index d457818..40dfcfc 100644
--- a/files/termsofservice-enUS.txt
+++ b/files/termsofservice-enUS.txt
@@ -19,3 +19,5 @@ Battle.net(R) and Blizzard Entertainment(R) are trademarks or registered tradema
 
 Besides all this... Happy gaming..
 PvPGN Project Page: http://pvpgn.berlios.de/
+
+(edit this text in var/files/termsofservice-enUS.txt)
\ No newline at end of file
diff --git a/files/tos-unicode_default.txt b/files/tos-unicode_default.txt
index d457818..519ddba 100644
--- a/files/tos-unicode_default.txt
+++ b/files/tos-unicode_default.txt
@@ -19,3 +19,5 @@ Battle.net(R) and Blizzard Entertainment(R) are trademarks or registered tradema
 
 Besides all this... Happy gaming..
 PvPGN Project Page: http://pvpgn.berlios.de/
+
+(edit this text in var/files/tos-unicode_default.txt)
\ No newline at end of file
diff --git a/files/tos.txt b/files/tos.txt
index d457818..5fe368b 100644
--- a/files/tos.txt
+++ b/files/tos.txt
@@ -19,3 +19,5 @@ Battle.net(R) and Blizzard Entertainment(R) are trademarks or registered tradema
 
 Besides all this... Happy gaming..
 PvPGN Project Page: http://pvpgn.berlios.de/
+
+(edit this text in var/files/tos.txt)
\ No newline at end of file
diff --git a/files/tos_default.txt b/files/tos_default.txt
index d457818..452a180 100644
--- a/files/tos_default.txt
+++ b/files/tos_default.txt
@@ -19,3 +19,5 @@ Battle.net(R) and Blizzard Entertainment(R) are trademarks or registered tradema
 
 Besides all this... Happy gaming..
 PvPGN Project Page: http://pvpgn.berlios.de/
+
+(edit this text in var/files/tos-defaut.txt)
\ No newline at end of file
diff --git a/src/common/version.h b/src/common/version.h
index 2fecb14..9d0fd5a 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #ifndef PVPGN_VERSION
-#define PVPGN_VERSION "1.99.0-SVN"
+#define PVPGN_VERSION "1.99.0-GIT"
 #endif
 #ifndef PVPGN_SOFTWARE
 #define PVPGN_SOFTWARE "PvPGN"