forked from github/server
Merge pull request #613 from ennorehling/develop
new address, finishing 3.10
This commit is contained in:
commit
aa7cc69fe1
|
@ -54,14 +54,14 @@
|
||||||
<xi:include href="config://default/names-dragons.xml"/>
|
<xi:include href="config://default/names-dragons.xml"/>
|
||||||
<strings>
|
<strings>
|
||||||
<string name="mailto">
|
<string name="mailto">
|
||||||
<text locale="de">eressea-server@eressea.de</text>
|
<text locale="de">eressea-server@eressea.kn-bremen.de</text>
|
||||||
<text locale="en">eressea-server@eressea.de</text>
|
<text locale="en">eressea-server@eressea.kn-bremen.de</text>
|
||||||
</string>
|
</string>
|
||||||
<string name="newbie_info_game">
|
<string name="newbie_info_game">
|
||||||
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
|
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
|
||||||
ERESSEA 2 BEFEHLE an eressea-server@eressea.de zu senden.</text>
|
ERESSEA 2 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden.</text>
|
||||||
<text locale="en">Remember to send your orders to
|
<text locale="en">Remember to send your orders to
|
||||||
eressea-server@eressea.de with the subject ERESSEA 2 ORDERS.</text>
|
eressea-server@eressea.kn-bremen.de with the subject ERESSEA 2 ORDERS.</text>
|
||||||
</string>
|
</string>
|
||||||
<string name="mailcmd">
|
<string name="mailcmd">
|
||||||
<text locale="de">ERESSEA 2 BEFEHLE</text>
|
<text locale="de">ERESSEA 2 BEFEHLE</text>
|
||||||
|
|
|
@ -46,14 +46,14 @@
|
||||||
</rules>
|
</rules>
|
||||||
<strings>
|
<strings>
|
||||||
<string name="mailto">
|
<string name="mailto">
|
||||||
<text locale="de">eressea-server@eressea.de</text>
|
<text locale="de">eressea-server@eressea.kn-bremen.de</text>
|
||||||
<text locale="en">eressea-server@eressea.de</text>
|
<text locale="en">eressea-server@eressea.kn-bremen.de</text>
|
||||||
</string>
|
</string>
|
||||||
<string name="newbie_info_game">
|
<string name="newbie_info_game">
|
||||||
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
|
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
|
||||||
ERESSEA 3 BEFEHLE an eressea-server@eressea.de zu senden.</text>
|
ERESSEA 3 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden.</text>
|
||||||
<text locale="en">Remember to send your orders to
|
<text locale="en">Remember to send your orders to
|
||||||
eressea-server@eressea.de with the subject E3 ORDERS.</text>
|
eressea-server@eressea.kn-bremen.de with the subject E3 ORDERS.</text>
|
||||||
</string>
|
</string>
|
||||||
<string name="mailcmd">
|
<string name="mailcmd">
|
||||||
<text locale="de">ERESSEA 3 BEFEHLE</text>
|
<text locale="de">ERESSEA 3 BEFEHLE</text>
|
||||||
|
|
|
@ -47,14 +47,14 @@
|
||||||
</rules>
|
</rules>
|
||||||
<strings>
|
<strings>
|
||||||
<string name="mailto">
|
<string name="mailto">
|
||||||
<text locale="de">eressea-server@eressea.de</text>
|
<text locale="de">eressea-server@eressea.kn-bremen.de</text>
|
||||||
<text locale="en">eressea-server@eressea.de</text>
|
<text locale="en">eressea-server@eressea.kn-bremen.de</text>
|
||||||
</string>
|
</string>
|
||||||
<string name="newbie_info_game">
|
<string name="newbie_info_game">
|
||||||
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
|
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
|
||||||
ERESSEA 4 BEFEHLE an eressea-server@eressea.de zu senden.</text>
|
ERESSEA 4 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden.</text>
|
||||||
<text locale="en">Remember to send your orders to
|
<text locale="en">Remember to send your orders to
|
||||||
eressea-server@eressea.de with the subject ERESSEA 4 ORDERS.</text>
|
eressea-server@eressea.kn-bremen.de with the subject ERESSEA 4 ORDERS.</text>
|
||||||
</string>
|
</string>
|
||||||
<string name="mailcmd">
|
<string name="mailcmd">
|
||||||
<text locale="de">ERESSEA 4 BEFEHLE</text>
|
<text locale="de">ERESSEA 4 BEFEHLE</text>
|
||||||
|
|
|
@ -30,15 +30,15 @@ rejecthtml = True
|
||||||
|
|
||||||
games = [
|
games = [
|
||||||
{
|
{
|
||||||
"from" : "Eressea Server <eressea-server@eressea.de>",
|
"from" : "Eressea Server <eressea-server@eressea.kn-bremen.de>",
|
||||||
"prefix" : "Eressea"
|
"prefix" : "Eressea"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"from" : "Eressea Server <eressea-server@eressea.de>",
|
"from" : "Eressea Server <eressea-server@eressea.kn-bremen.de>",
|
||||||
"prefix": "E3"
|
"prefix": "E3"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"from" : "Eressea Server <eressea-server@eressea.de>",
|
"from" : "Eressea Server <eressea-server@eressea.kn-bremen.de>",
|
||||||
"prefix": "E4"
|
"prefix": "E4"
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
|
@ -65,7 +65,7 @@ messages = {
|
||||||
|
|
||||||
# base directory for all your games:
|
# base directory for all your games:
|
||||||
rootdir = "/home/eressea/eressea"
|
rootdir = "/home/eressea/eressea"
|
||||||
frommail = "Eressea Server <eressea-server@eressea.de>"
|
frommail = "Eressea Server <eressea-server@eressea.kn-bremen.de>"
|
||||||
orderbase = "orders.dir"
|
orderbase = "orders.dir"
|
||||||
sendmail = True
|
sendmail = True
|
||||||
maxlines = 25
|
maxlines = 25
|
||||||
|
|
Loading…
Reference in New Issue