Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renaming keyword tokens to English.

This commit is contained in:
Enno Rehling 2014-06-16 19:12:55 -07:00
parent 27374a9329
commit 0af5e96e3a
10 changed files with 296 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
core/res/de/strings.xml
View File

@ -2113,213 +2113,178 @@
<string name="//"> <string name="//">
<text locale="de">//</text> <text locale="de">//</text>
</string> </string>
<string name="BANNER"> <string name="banner">
<text locale="de">BANNER</text> <text locale="de">BANNER</text>
</string> </string>
<string name="ARBEITEN"> <string name="work">
<text locale="de">ARBEITEN</text> <text locale="de">ARBEITEN</text>
</string> </string>
<string name="WARTEN"> <string name="attack">
<text locale="de">WARTEN</text>
<text locale="en">WAIT</text>
</string>
<string name="ATTACKIEREN">
<text locale="de">ATTACKIEREN</text> <text locale="de">ATTACKIEREN</text>
</string> </string>
<string name="BIETEN"> <string name="claim">
<text locale="de">BIETEN</text>
</string>
<string name="BEANSPRUCHEN">
<text locale="de">BEANSPRUCHEN</text>
<text locale="en">CLAIM</text> <text locale="en">CLAIM</text>
</string> </string>
<string name="BEKLAUEN"> <string name="steal">
<text locale="de">BEKLAUEN</text> <text locale="de">BEKLAUEN</text>
</string> </string>
<string name="BELAGERE"> <string name="besiege">
<text locale="de">BELAGERE</text> <text locale="de">BELAGERE</text>
</string> </string>
<string name="BENENNEN"> <string name="name">
<text locale="de">BENENNEN</text> <text locale="de">BENENNEN</text>
</string> </string>
<string name="BENUTZEN"> <string name="use">
<text locale="de">BENUTZEN</text> <text locale="de">BENUTZEN</text>
</string> </string>
<string name="BESCHREIBEN"> <string name="describe">
<text locale="de">BESCHREIBEN</text> <text locale="de">BESCHREIBEN</text>
</string> </string>
<string name="BETRETEN"> <string name="enter">
<text locale="de">BETRETEN</text> <text locale="de">BETRETEN</text>
</string> </string>
<string name="BEWACHEN"> <string name="guard">
<text locale="de">BEWACHEN</text> <text locale="de">BEWACHEN</text>
</string> </string>
<string name="BOTSCHAFT"> <string name="message">
<text locale="de">BOTSCHAFT</text> <text locale="de">BOTSCHAFT</text>
</string> </string>
<string name="ENDE"> <string name="end">
<text locale="de">ENDE</text> <text locale="de">ENDE</text>
</string> </string>
<string name="FAHREN"> <string name="ride">
<text locale="de">FAHREN</text> <text locale="de">FAHREN</text>
</string> </string>
<string name="NUMMER"> <string name="number">
<text locale="de">NUMMER</text> <text locale="de">NUMMER</text>
</string> </string>
<string name="FRIEDEN"> <string name="follow">
<text locale="de">FRIEDEN</text>
<text locale="en">PEACE</text>
</string>
<string name="KRIEG">
<text locale="de">KRIEG</text>
<text locale="en">WAR</text>
</string>
<string name="FOLGEN">
<text locale="de">FOLGEN</text> <text locale="de">FOLGEN</text>
</string> </string>
<string name="FORSCHEN"> <string name="research">
<text locale="de">FORSCHEN</text> <text locale="de">FORSCHEN</text>
</string> </string>
<string name="HELFEN"> <string name="help">
<text locale="de">HELFEN</text> <text locale="de">HELFEN</text>
</string> </string>
<string name="KAEMPFEN"> <string name="fight">
<text locale="de">KÄMPFEN</text> <text locale="de">KÄMPFEN</text>
</string> </string>
<string name="KAMPFZAUBER"> <string name="ready">
<text locale="de">KAMPFZAUBER</text> <text locale="de">KAMPFZAUBER</text>
</string> </string>
<string name="KAUFEN"> <string name="buy">
<text locale="de">KAUFEN</text> <text locale="de">KAUFEN</text>
</string> </string>
<string name="KONTAKTIEREN"> <string name="contact">
<text locale="de">KONTAKTIEREN</text> <text locale="de">KONTAKTIEREN</text>
</string> </string>
<string name="LEHREN"> <string name="teach">
<text locale="de">LEHREN</text> <text locale="de">LEHREN</text>
</string> </string>
<string name="LERNEN"> <string name="study">
<text locale="de">LERNEN</text> <text locale="de">LERNEN</text>
</string> </string>
<string name="MACHEN"> <string name="make">
<text locale="de">MACHEN</text> <text locale="de">MACHEN</text>
</string> </string>
<string name="NACH"> <string name="move">
<text locale="de">NACH</text> <text locale="de">NACH</text>
</string> </string>
<string name="ALLIANZ"> <string name="alliance">
<text locale="de">ALLIANZ</text> <text locale="de">ALLIANZ</text>
<text locale="en">ALLIANCE</text>
</string> </string>
<string name="PROMOTION"> <string name="promote">
<text locale="de">BEFÖRDERUNG</text> <text locale="de">BEFÖRDERUNG</text>
<text locale="en">PROMOTION</text>
</string> </string>
<string name="BEZAHLEN"> <string name="plant">
<text locale="de">BEZAHLEN</text>
<text locale="en">PAY</text>
</string>
<string name="PFLANZEN">
<text locale="de">PFLANZEN</text> <text locale="de">PFLANZEN</text>
</string> </string>
<string name="PRAEFIX"> <string name="prefix">
<text locale="de">PRÄFIX</text> <text locale="de">PRÄFIX</text>
</string> </string>
<string name="INFO"> <string name="info">
<text locale="de">INFO</text> <text locale="de">INFO</text>
</string> </string>
<string name="PASSWORT"> <string name="password">
<text locale="de">PASSWORT</text> <text locale="de">PASSWORT</text>
</string> </string>
<string name="REKRUTIEREN"> <string name="recruit">
<text locale="de">REKRUTIEREN</text> <text locale="de">REKRUTIEREN</text>
</string> </string>
<string name="RESERVIEREN"> <string name="reserve">
<text locale="de">RESERVIEREN</text> <text locale="de">RESERVIEREN</text>
</string> </string>
<string name="ROUTE"> <string name="route">
<text locale="de">ROUTE</text> <text locale="de">ROUTE</text>
</string> </string>
<string name="SABOTIEREN"> <string name="sabotage">
<text locale="de">SABOTIEREN</text> <text locale="de">SABOTIEREN</text>
</string> </string>
<string name="OPTION"> <string name="option">
<text locale="de">OPTION</text> <text locale="de">OPTION</text>
</string> </string>
<string name="SPIONIEREN"> <string name="spy">
<text locale="de">SPIONIEREN</text> <text locale="de">SPIONIEREN</text>
</string> </string>
<string name="STIRB"> <string name="quit">
<text locale="de">STIRB</text> <text locale="de">STIRB</text>
</string> </string>
<string name="TARNEN"> <string name="hide">
<text locale="de">TARNEN</text> <text locale="de">TARNEN</text>
</string> </string>
<string name="TRANSPORTIEREN"> <string name="carry">
<text locale="de">TRANSPORTIEREN</text> <text locale="de">TRANSPORTIEREN</text>
</string> </string>
<string name="TREIBEN"> <string name="tax">
<text locale="de">TREIBEN</text> <text locale="de">TREIBEN</text>
</string> </string>
<string name="UNTERHALTEN"> <string name="entertain">
<text locale="de">UNTERHALTEN</text> <text locale="de">UNTERHALTEN</text>
</string> </string>
<string name="VERKAUFEN"> <string name="sell">
<text locale="de">VERKAUFEN</text> <text locale="de">VERKAUFEN</text>
</string> </string>
<string name="VERLASSEN"> <string name="leave">
<text locale="de">VERLASSEN</text> <text locale="de">VERLASSEN</text>
</string> </string>
<string name="VERGESSEN"> <string name="forget">
<text locale="de">VERGESSEN</text> <text locale="de">VERGESSEN</text>
</string> </string>
<string name="ZAUBERE"> <string name="cast">
<text locale="de">ZAUBERE</text> <text locale="de">ZAUBERE</text>
</string> </string>
<string name="ZEIGEN"> <string name="show">
<text locale="de">ZEIGEN</text> <text locale="de">ZEIGEN</text>
</string> </string>
<string name="ZERSTOEREN"> <string name="destroy">
<text locale="de">ZERSTÖREN</text> <text locale="de">ZERSTÖREN</text>
</string> </string>
<string name="ZUECHTEN"> <string name="grow">
<text locale="de">ZÜCHTEN</text> <text locale="de">ZÜCHTEN</text>
</string> </string>
<string name="DEFAULT"> <string name="default">
<text locale="de">DEFAULT</text> <text locale="de">DEFAULT</text>
</string> </string>
<string name="REPORT"> <string name="report">
<text locale="de">REPORT</text> <text locale="de">REPORT</text>
</string> </string>
<string name="XML"> <string name="origin">
<text locale="de">XML</text>
<text locale="en">XML</text>
</string>
<string name="URSPRUNG">
<text locale="de">URSPRUNG</text> <text locale="de">URSPRUNG</text>
</string> </string>
<string name="EMAIL"> <string name="email">
<text locale="de">EMAIL</text> <text locale="de">EMAIL</text>
</string> </string>
<string name="PIRATERIE"> <string name="piracy">
<text locale="de">PIRATERIE</text> <text locale="de">PIRATERIE</text>
</string> </string>
<string name="LOCALE"> <string name="locale">
<text locale="de">LOCALE</text> <text locale="de">LOCALE</text>
</string> </string>
<string name="NEUSTART"> <string name="group">
<text locale="de">NEUSTART</text>
</string>
<string name="GRUPPE">
<text locale="de">GRUPPE</text> <text locale="de">GRUPPE</text>
</string> </string>
<string name="OPFERE"> <string name="sort">
<text locale="de">OPFERE</text>
</string>
<string name="BETEN">
<text locale="de">BETEN</text>
</string>
<string name="SORTIEREN">
<text locale="de">SORTIEREN</text> <text locale="de">SORTIEREN</text>
</string> </string>
</namespace> </namespace>

131
core/res/en/strings.xml
View File

@ -1385,181 +1385,178 @@
<string name="//"> <string name="//">
<text locale="en">//</text> <text locale="en">//</text>
</string> </string>
<string name="ARBEITEN"> <string name="work">
<text locale="en">WORK</text> <text locale="en">WORK</text>
</string> </string>
<string name="ATTACKIEREN"> <string name="attack">
<text locale="en">ATTACK</text> <text locale="en">ATTACK</text>
</string> </string>
<string name="BANNER"> <string name="banner">
<text locale="en">BANNER</text> <text locale="en">BANNER</text>
</string> </string>
<string name="BEKLAUEN"> <string name="steal">
<text locale="en">STEAL</text> <text locale="en">STEAL</text>
</string> </string>
<string name="BELAGERE"> <string name="besiege">
<text locale="en">BESIEGE</text> <text locale="en">BESIEGE</text>
</string> </string>
<string name="BENENNEN"> <string name="name">
<text locale="en">NAME</text> <text locale="en">NAME</text>
</string> </string>
<string name="BENUTZEN"> <string name="use">
<text locale="en">USE</text> <text locale="en">USE</text>
</string> </string>
<string name="BESCHREIBEN"> <string name="describe">
<text locale="en">DESCRIBE</text> <text locale="en">DESCRIBE</text>
</string> </string>
<string name="BETEN"> <string name="enter">
<text locale="en">PRAY</text>
</string>
<string name="BETRETEN">
<text locale="en">ENTER</text> <text locale="en">ENTER</text>
</string> </string>
<string name="BEWACHEN"> <string name="guard">
<text locale="en">GUARD</text> <text locale="en">GUARD</text>
</string> </string>
<string name="BIETEN"> <string name="bid">
<text locale="en">BID</text> <text locale="en">BID</text>
</string> </string>
<string name="BOTSCHAFT"> <string name="message">
<text locale="en">MESSAGE</text> <text locale="en">MESSAGE</text>
</string> </string>
<string name="DEFAULT"> <string name="default">
<text locale="en">DEFAULT</text> <text locale="en">DEFAULT</text>
</string> </string>
<string name="EMAIL"> <string name="email">
<text locale="en">EMAIL</text> <text locale="en">EMAIL</text>
</string> </string>
<string name="ENDE"> <string name="end">
<text locale="en">END</text> <text locale="en">END</text>
</string> </string>
<string name="FAHREN"> <string name="ride">
<text locale="en">RIDE</text> <text locale="en">RIDE</text>
</string> </string>
<string name="FOLGEN"> <string name="follow">
<text locale="en">FOLLOW</text> <text locale="en">FOLLOW</text>
</string> </string>
<string name="FORSCHEN"> <string name="research">
<text locale="en">RESEARCH</text> <text locale="en">RESEARCH</text>
</string> </string>
<string name="GRUPPE"> <string name="group">
<text locale="en">GROUP</text> <text locale="en">GROUP</text>
</string> </string>
<string name="HELFEN"> <string name="help">
<text locale="en">HELP</text> <text locale="en">HELP</text>
</string> </string>
<string name="KAMPFZAUBER"> <string name="ready">
<text locale="en">COMBATSPELL</text> <text locale="en">COMBATSPELL</text>
</string> </string>
<string name="KAUFEN"> <string name="buy">
<text locale="en">BUY</text> <text locale="en">BUY</text>
</string> </string>
<string name="KONTAKTIEREN"> <string name="contact">
<text locale="en">CONTACT</text> <text locale="en">CONTACT</text>
</string> </string>
<string name="KAEMPFEN"> <string name="combat">
<text locale="en">COMBAT</text> <text locale="en">COMBAT</text>
</string> </string>
<string name="LEHREN"> <string name="teach">
<text locale="en">TEACH</text> <text locale="en">TEACH</text>
</string> </string>
<string name="LERNEN"> <string name="study">
<text locale="en">LEARN</text> <text locale="en">LEARN</text>
</string> </string>
<string name="LIEFERE"> <string name="locale">
<text locale="en">SUPPLY</text>
</string>
<string name="LOCALE">
<text locale="en">LOCALE</text> <text locale="en">LOCALE</text>
</string> </string>
<string name="MACHEN"> <string name="make">
<text locale="en">MAKE</text> <text locale="en">MAKE</text>
</string> </string>
<string name="NACH"> <string name="move">
<text locale="en">MOVE</text> <text locale="en">MOVE</text>
</string> </string>
<string name="NEUSTART"> <string name="number">
<text locale="en">RESTART</text>
</string>
<string name="NUMMER">
<text locale="en">NUMBER</text> <text locale="en">NUMBER</text>
</string> </string>
<string name="OPFERE"> <string name="option">
<text locale="en">SACRIFICE</text>
</string>
<string name="OPTION">
<text locale="en">OPTION</text> <text locale="en">OPTION</text>
</string> </string>
<string name="PASSWORT"> <string name="password">
<text locale="en">PASSWORD</text> <text locale="en">PASSWORD</text>
</string> </string>
<string name="PFLANZEN"> <string name="plant">
<text locale="en">PLANT</text> <text locale="en">PLANT</text>
</string> </string>
<string name="PIRATERIE"> <string name="piracy">
<text locale="en">PIRACY</text> <text locale="en">PIRACY</text>
</string> </string>
<string name="PRAEFIX"> <string name="prefix">
<text locale="en">PREFIX</text> <text locale="en">PREFIX</text>
</string> </string>
<string name="REKRUTIEREN"> <string name="alliance">
<text locale="en">ALLIANCE</text>
</string>
<string name="promote">
<text locale="en">PROMOTION</text>
</string>
<string name="claim">
<text locale="en">CLAIM</text>
</string>
<string name="recruit">
<text locale="en">RECRUIT</text> <text locale="en">RECRUIT</text>
</string> </string>
<string name="REPORT"> <string name="report">
<text locale="en">REPORT</text> <text locale="en">REPORT</text>
</string> </string>
<string name="RESERVIEREN"> <string name="reserve">
<text locale="en">RESERVE</text> <text locale="en">RESERVE</text>
</string> </string>
<string name="ROUTE"> <string name="route">
<text locale="en">ROUTE</text> <text locale="en">ROUTE</text>
</string> </string>
<string name="SABOTIEREN"> <string name="sabotage">
<text locale="en">SABOTAGE</text> <text locale="en">SABOTAGE</text>
</string> </string>
<string name="SORTIEREN"> <string name="sort">
<text locale="en">SORT</text> <text locale="en">SORT</text>
</string> </string>
<string name="SPIONIEREN"> <string name="spy">
<text locale="en">SPY</text> <text locale="en">SPY</text>
</string> </string>
<string name="STIRB"> <string name="quit">
<text locale="en">QUIT</text> <text locale="en">QUIT</text>
</string> </string>
<string name="TARNEN"> <string name="hide">
<text locale="en">HIDE</text> <text locale="en">HIDE</text>
</string> </string>
<string name="TRANSPORTIEREN"> <string name="carry">
<text locale="en">CARRY</text> <text locale="en">CARRY</text>
</string> </string>
<string name="TREIBEN"> <string name="tax">
<text locale="en">TAX</text> <text locale="en">TAX</text>
</string> </string>
<string name="UNTERHALTEN"> <string name="entertain">
<text locale="en">ENTERTAIN</text> <text locale="en">ENTERTAIN</text>
</string> </string>
<string name="URSPRUNG"> <string name="origin">
<text locale="en">ORIGIN</text> <text locale="en">ORIGIN</text>
</string> </string>
<string name="VERGESSEN"> <string name="forget">
<text locale="en">FORGET</text> <text locale="en">FORGET</text>
</string> </string>
<string name="VERKAUFEN"> <string name="sell">
<text locale="en">SELL</text> <text locale="en">SELL</text>
</string> </string>
<string name="VERLASSEN"> <string name="leave">
<text locale="en">LEAVE</text> <text locale="en">LEAVE</text>
</string> </string>
<string name="ZAUBERE"> <string name="cast">
<text locale="en">CAST</text> <text locale="en">CAST</text>
</string> </string>
<string name="ZEIGEN"> <string name="show">
<text locale="en">SHOW</text> <text locale="en">SHOW</text>
</string> </string>
<string name="ZERSTOEREN"> <string name="destroy">
<text locale="en">DESTROY</text> <text locale="en">DESTROY</text>
</string> </string>
<string name="ZUECHTEN"> <string name="grow">
<text locale="en">GROW</text> <text locale="en">GROW</text>
</string> </string>
</namespace> </namespace>

123
core/res/fr/strings.xml
View File

@ -1393,184 +1393,169 @@
<string name="//"> <string name="//">
<text locale="fr">//</text> <text locale="fr">//</text>
</string> </string>
<string name="ARBEITEN"> <string name="work">
<text locale="fr">TRAVAILLER</text> <text locale="fr">TRAVAILLER</text>
</string> </string>
<string name="ATTACKIEREN"> <string name="attack">
<text locale="fr">ATTAQUER</text> <text locale="fr">ATTAQUER</text>
</string> </string>
<string name="BANNER"> <string name="banner">
<text locale="fr">ANNONCE</text> <text locale="fr">ANNONCE</text>
</string> </string>
<string name="BEKLAUEN"> <string name="steal">
<text locale="fr">VOLER</text> <text locale="fr">VOLER</text>
</string> </string>
<string name="BELAGERE"> <string name="besiege">
<text locale="fr">ASSIEGER</text> <text locale="fr">ASSIEGER</text>
</string> </string>
<string name="BENENNEN"> <string name="name">
<text locale="fr">NOMMER</text> <text locale="fr">NOMMER</text>
</string> </string>
<string name="BENUTZEN"> <string name="use">
<text locale="fr">UTILISER</text> <text locale="fr">UTILISER</text>
</string> </string>
<string name="BESCHREIBEN"> <string name="describe">
<text locale="fr">DECRIRE</text> <text locale="fr">DECRIRE</text>
</string> </string>
<string name="BETEN"> <string name="enter">
<text locale="fr">PRIER</text>
</string>
<string name="BETRETEN">
<text locale="fr">ENTRER</text> <text locale="fr">ENTRER</text>
</string> </string>
<string name="BEWACHEN"> <string name="guard">
<text locale="fr">GUARDER</text> <text locale="fr">GUARDER</text>
</string> </string>
<string name="BIETEN"> <string name="message">
<text locale="fr">OFFRIR</text>
</string>
<string name="BOTSCHAFT">
<text locale="fr">MESSAGE</text> <text locale="fr">MESSAGE</text>
</string> </string>
<string name="DEFAULT"> <string name="default">
<text locale="fr">DEFAUT</text> <text locale="fr">DEFAUT</text>
</string> </string>
<string name="EMAIL"> <string name="email">
<text locale="fr">EMAIL</text> <text locale="fr">EMAIL</text>
</string> </string>
<string name="ENDE"> <string name="end">
<text locale="fr">FIN</text> <text locale="fr">FIN</text>
</string> </string>
<string name="FAHREN"> <string name="ride">
<text locale="fr">CHEVAUCHER</text> <text locale="fr">CHEVAUCHER</text>
</string> </string>
<string name="FOLGEN"> <string name="follow">
<text locale="fr">SUIVRE</text> <text locale="fr">SUIVRE</text>
</string> </string>
<string name="FORSCHEN"> <string name="research">
<text locale="fr">CHERCHER</text> <text locale="fr">CHERCHER</text>
</string> </string>
<string name="GRUPPE"> <string name="group">
<text locale="fr">GROUPER</text> <text locale="fr">GROUPER</text>
</string> </string>
<string name="HELFEN"> <string name="help">
<text locale="fr">AIDER</text> <text locale="fr">AIDER</text>
</string> </string>
<string name="KAMPFZAUBER"> <string name="ready">
<text locale="fr">PREPARER</text> <text locale="fr">PREPARER</text>
</string> </string>
<string name="KAUFEN"> <string name="buy">
<text locale="fr">ACHETER</text> <text locale="fr">ACHETER</text>
</string> </string>
<string name="KONTAKTIEREN"> <string name="contact">
<text locale="fr">CONTACTER</text> <text locale="fr">CONTACTER</text>
</string> </string>
<string name="KÄMPFEN"> <string name="fight">
<text locale="fr">COMBATTRE</text> <text locale="fr">COMBATTRE</text>
</string> </string>
<string name="LEHREN"> <string name="teach">
<text locale="fr">ENSEIGNER</text> <text locale="fr">ENSEIGNER</text>
</string> </string>
<string name="LERNEN"> <string name="study">
<text locale="fr">APPRENDRE</text> <text locale="fr">APPRENDRE</text>
</string> </string>
<string name="LIEFERE"> <string name="LIEFERE">
<text locale="fr">FOURNIR</text> <text locale="fr">FOURNIR</text>
</string> </string>
<string name="LOCALE"> <string name="locale">
<text locale="fr">LOCAL</text> <text locale="fr">LOCAL</text>
</string> </string>
<string name="MACHEN"> <string name="make">
<text locale="fr">FAIRE</text> <text locale="fr">FAIRE</text>
</string> </string>
<string name="NACH"> <string name="move">
<text locale="fr">ALLER</text> <text locale="fr">ALLER</text>
</string> </string>
<string name="NEUSTART"> <string name="number">
<text locale="fr">RECOMMENCER</text>
</string>
<string name="NUMMER">
<text locale="fr">NOMBRE</text> <text locale="fr">NOMBRE</text>
</string> </string>
<string name="OPFERE"> <string name="option">
<text locale="fr">SACRIFIER</text>
</string>
<string name="OPTION">
<text locale="fr">OPTION</text> <text locale="fr">OPTION</text>
</string> </string>
<string name="PASSWORT"> <string name="password">
<text locale="fr">PASSWORD</text> <text locale="fr">PASSWORD</text>
</string> </string>
<string name="PFLANZEN"> <string name="plant">
<text locale="fr">PLANTER</text> <text locale="fr">PLANTER</text>
</string> </string>
<string name="PIRATERIE"> <string name="piracy">
<text locale="fr">PIRATERIE</text> <text locale="fr">PIRATERIE</text>
</string> </string>
<string name="PRÄFIX"> <string name="prefix">
<text locale="fr">PREFIXE</text> <text locale="fr">PREFIXE</text>
</string> </string>
<string name="REKRUTIEREN"> <string name="recruit">
<text locale="fr">RECRUTER</text> <text locale="fr">RECRUTER</text>
</string> </string>
<string name="REPORT"> <string name="report">
<text locale="fr">RAPPORT</text> <text locale="fr">RAPPORT</text>
</string> </string>
<string name="RESERVIEREN"> <string name="reserver">
<text locale="fr">RESERVER</text> <text locale="fr">RESERVER</text>
</string> </string>
<string name="ROUTE"> <string name="route">
<text locale="fr">TRAJET</text> <text locale="fr">TRAJET</text>
</string> </string>
<string name="SABOTIEREN"> <string name="sabotage">
<text locale="fr">SABOTER</text> <text locale="fr">SABOTER</text>
</string> </string>
<string name="SORTIEREN"> <string name="sort">
<text locale="fr">TRIER</text> <text locale="fr">TRIER</text>
</string> </string>
<string name="SPIONIEREN"> <string name="spy">
<text locale="fr">ESPIONNER</text> <text locale="fr">ESPIONNER</text>
</string> </string>
<string name="STIRB"> <string name="quit">
<text locale="fr">ABANDONNER</text> <text locale="fr">ABANDONNER</text>
</string> </string>
<string name="SYNONYM"> <string name="hide">
<text locale="fr">SYNONYME</text>
</string>
<string name="TARNEN">
<text locale="fr">CACHER</text> <text locale="fr">CACHER</text>
</string> </string>
<string name="TRANSPORTIEREN"> <string name="transport">
<text locale="fr">TRANSPORTER</text> <text locale="fr">TRANSPORTER</text>
</string> </string>
<string name="TREIBEN"> <string name="tax">
<text locale="fr">TAXER</text> <text locale="fr">TAXER</text>
</string> </string>
<string name="UNTERHALTEN"> <string name="entertain">
<text locale="fr">DIVERTIR</text> <text locale="fr">DIVERTIR</text>
</string> </string>
<string name="URSPRUNG"> <string name="origin">
<text locale="fr">ORIGINE</text> <text locale="fr">ORIGINE</text>
</string> </string>
<string name="VERGESSEN"> <string name="forget">
<text locale="fr">OUBLIER</text> <text locale="fr">OUBLIER</text>
</string> </string>
<string name="VERKAUFEN"> <string name="sell">
<text locale="fr">VENDRE</text> <text locale="fr">VENDRE</text>
</string> </string>
<string name="VERLASSEN"> <string name="leave">
<text locale="fr">SORTIR</text> <text locale="fr">SORTIR</text>
</string> </string>
<string name="ZAUBERE"> <string name="cast">
<text locale="fr">INCANTER</text> <text locale="fr">INCANTER</text>
</string> </string>
<string name="ZEIGEN"> <string name="show">
<text locale="fr">MONTRER</text> <text locale="fr">MONTRER</text>
</string> </string>
<string name="ZERSTÖREN"> <string name="destroy">
<text locale="fr">DETRUIRE</text> <text locale="fr">DETRUIRE</text>
</string> </string>
<string name="ZÜCHTEN"> <string name="grow">
<text locale="fr">ACCROITRE</text> <text locale="fr">ACCROITRE</text>
</string> </string>
</namespace> </namespace>

4
game-e2/config.xml
View File

@ -54,10 +54,6 @@
<!-- Game specific settings --> <!-- Game specific settings -->
<order name="BEZAHLEN" disable="yes"/> <order name="BEZAHLEN" disable="yes"/>
<order name="FRIEDEN" disable="yes"/>
<order name="GM" disable="yes"/>
<order name="JIHAD" disable="yes"/>
<order name="KRIEG" disable="yes"/>
<skill name="alchemy" enable="true"/> <skill name="alchemy" enable="true"/>
<skill name="crossbow" enable="true"/> <skill name="crossbow" enable="true"/>

44
src/kernel/jsonconf.c
View File

@ -55,7 +55,7 @@ without prior permission by the authors of Eressea.
void json_construction(cJSON *json, construction **consp) { void json_construction(cJSON *json, construction **consp) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("building %s is not a json object: %d\n", json->string, json->type); log_error_n("building %s is not a json object: %d", json->string, json->type);
return; return;
} }
construction * cons = (construction *)calloc(sizeof(construction), 1); construction * cons = (construction *)calloc(sizeof(construction), 1);
@ -73,7 +73,7 @@ void json_construction(cJSON *json, construction **consp) {
} }
break; break;
default: default:
log_error("building %s contains unknown attribute %s\n", json->string, child->string); log_error_n("building %s contains unknown attribute %s", json->string, child->string);
} }
} }
*consp = cons; *consp = cons;
@ -82,18 +82,18 @@ void json_construction(cJSON *json, construction **consp) {
void json_terrain(cJSON *json, terrain_type *ter) { void json_terrain(cJSON *json, terrain_type *ter) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("terrain %s is not a json object: %d\n", json->string, json->type); log_error_n("terrain %s is not a json object: %d", json->string, json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
log_error("terrain %s contains unknown attribute %s\n", json->string, child->string); log_error_n("terrain %s contains unknown attribute %s", json->string, child->string);
} }
} }
void json_building(cJSON *json, building_type *bt) { void json_building(cJSON *json, building_type *bt) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("building %s is not a json object: %d\n", json->string, json->type); log_error_n("building %s is not a json object: %d", json->string, json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -104,7 +104,7 @@ void json_building(cJSON *json, building_type *bt) {
} }
break; break;
default: default:
log_error("building %s contains unknown attribute %s\n", json->string, child->string); log_error_n("building %s contains unknown attribute %s", json->string, child->string);
} }
} }
} }
@ -112,7 +112,7 @@ void json_building(cJSON *json, building_type *bt) {
void json_ship(cJSON *json, ship_type *st) { void json_ship(cJSON *json, ship_type *st) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("ship %s is not a json object: %d\n", json->string, json->type); log_error_n("ship %s is not a json object: %d", json->string, json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -123,7 +123,7 @@ void json_ship(cJSON *json, ship_type *st) {
} }
break; break;
default: default:
log_error("ship %s contains unknown attribute %s\n", json->string, child->string); log_error_n("ship %s contains unknown attribute %s", json->string, child->string);
} }
} }
} }
@ -131,7 +131,7 @@ void json_ship(cJSON *json, ship_type *st) {
void json_race(cJSON *json, race *rc) { void json_race(cJSON *json, race *rc) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("race %s is not a json object: %d\n", json->string, json->type); log_error_n("race %s is not a json object: %d", json->string, json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -201,7 +201,7 @@ void json_race(cJSON *json, race *rc) {
void json_terrains(cJSON *json) { void json_terrains(cJSON *json) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("terrains is not a json object: %d\n", json->type); log_error_n("terrains is not a json object: %d", json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -212,7 +212,7 @@ void json_terrains(cJSON *json) {
void json_buildings(cJSON *json) { void json_buildings(cJSON *json) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("buildings is not a json object: %d\n", json->type); log_error_n("buildings is not a json object: %d", json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -223,7 +223,7 @@ void json_buildings(cJSON *json) {
void json_ships(cJSON *json) { void json_ships(cJSON *json) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("ships is not a json object: %d\n", json->type); log_error_n("ships is not a json object: %d", json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -234,7 +234,7 @@ void json_ships(cJSON *json) {
static void json_direction(cJSON *json, struct locale *lang) { static void json_direction(cJSON *json, struct locale *lang) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("directions for locale `%s` not a json object: %d\n", locale_name(lang), json->type); log_error_n("directions for locale `%s` not a json object: %d", locale_name(lang), json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -249,7 +249,7 @@ static void json_direction(cJSON *json, struct locale *lang) {
init_direction(lang, dir, entry->valuestring); init_direction(lang, dir, entry->valuestring);
} }
} else { } else {
log_error("invalid type %d for direction `%s`\n", child->type, child->string); log_error_n("invalid type %d for direction `%s`", child->type, child->string);
} }
} }
} }
@ -258,7 +258,7 @@ static void json_direction(cJSON *json, struct locale *lang) {
void json_directions(cJSON *json) { void json_directions(cJSON *json) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("directions is not a json object: %d\n", json->type); log_error_n("directions is not a json object: %d", json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -270,7 +270,7 @@ void json_directions(cJSON *json) {
static void json_keyword(cJSON *json, struct locale *lang) { static void json_keyword(cJSON *json, struct locale *lang) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("keywords for locale `%s` not a json object: %d\n", locale_name(lang), json->type); log_error_n("keywords for locale `%s` not a json object: %d", locale_name(lang), json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -285,8 +285,10 @@ static void json_keyword(cJSON *json, struct locale *lang) {
init_keyword(lang, kwd, entry->valuestring); init_keyword(lang, kwd, entry->valuestring);
} }
} else { } else {
log_error("invalid type %d for keyword `%s`\n", child->type, child->string); log_error_n("invalid type %d for keyword `%s`", child->type, child->string);
} }
} else {
log_error_n("unknown keyword `%s` for locale `%s`", child->string, locale_name(lang));
} }
} }
} }
@ -294,7 +296,7 @@ static void json_keyword(cJSON *json, struct locale *lang) {
void json_keywords(cJSON *json) { void json_keywords(cJSON *json) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("keywords is not a json object: %d\n", json->type); log_error_n("keywords is not a json object: %d", json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -306,7 +308,7 @@ void json_keywords(cJSON *json) {
void json_races(cJSON *json) { void json_races(cJSON *json) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("races is not a json object: %d\n", json->type); log_error_n("races is not a json object: %d", json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -317,7 +319,7 @@ void json_races(cJSON *json) {
void json_config(cJSON *json) { void json_config(cJSON *json) {
cJSON *child; cJSON *child;
if (json->type!=cJSON_Object) { if (json->type!=cJSON_Object) {
log_error("config is not a json object: %d\n", json->type); log_error_n("config is not a json object: %d", json->type);
return; return;
} }
for (child=json->child;child;child=child->next) { for (child=json->child;child;child=child->next) {
@ -339,7 +341,7 @@ void json_config(cJSON *json) {
else if (strcmp(child->string, "terrains")==0) { else if (strcmp(child->string, "terrains")==0) {
json_terrains(child); json_terrains(child);
} else { } else {
log_error("config contains unknown attribute %s\n", child->string); log_error_n("config contains unknown attribute %s", child->string);
} }
} }
} }

2
src/kernel/jsonconf.test.c
View File

@ -169,7 +169,7 @@ static void test_directions(CuTest * tc)
static void test_keywords(CuTest * tc) static void test_keywords(CuTest * tc)
{ {
const char * data = "{\"keywords\": { \"de\" : { \"NACH\" : \"nach\", \"LERNEN\" : \"lernen\" }}}"; const char * data = "{\"keywords\": { \"de\" : { \"move\" : \"nach\", \"study\" : \"lernen\" }}}";
const struct locale * lang; const struct locale * lang;
cJSON *json = cJSON_Parse(data); cJSON *json = cJSON_Parse(data);

112
src/keyword.c
View File

@ -77,62 +77,62 @@ bool keyword_disabled(keyword_t kwd) {
const char *keywords[MAXKEYWORDS] = { const char *keywords[MAXKEYWORDS] = {
"//", "//",
"BANNER", "banner",
"work", "work",
"ATTACKIEREN", "attack",
"BEKLAUEN", "steal",
"BELAGERE", "besiege",
"BENENNEN", "name",
"BENUTZEN", "use",
"BESCHREIBEN", "describe",
"BETRETEN", "enter",
"BEWACHEN", "guard",
"BOTSCHAFT", "message",
"ENDE", "end",
"FAHREN", "ride",
"NUMMER", "number",
"FOLGEN", "follow",
"FORSCHEN", "research",
"GIB", "give",
"HELFEN", "help",
"KAEMPFEN", "fight",
"KAMPFZAUBER", "ready",
"KAUFEN", "buy",
"KONTAKTIEREN", "contact",
"LEHREN", "teach",
"LERNEN", "study",
"MACHEN", "make",
"NACH", "move",
"PASSWORT", "password",
"REKRUTIEREN", "recruit",
"RESERVIEREN", "reserve",
"ROUTE", "route",
"SABOTIEREN", "sabotage",
"OPTION", "option",
"SPIONIEREN", "spy",
"STIRB", "quit",
"TARNEN", "hide",
"TRANSPORTIEREN", "carry",
"TREIBEN", "tax",
"UNTERHALTEN", "entertain",
"VERKAUFEN", "sell",
"VERLASSEN", "leave",
"VERGESSEN", "forget",
"ZAUBERE", "cast",
"ZEIGEN", "show",
"ZERSTOEREN", "destroy",
"ZUECHTEN", "grow",
"DEFAULT", "default",
"URSPRUNG", "origin",
"EMAIL", "email",
"PIRATERIE", "piracy",
"GRUPPE", "group",
"SORTIEREN", "sort",
"PRAEFIX", "prefix",
"PFLANZEN", "plant",
"ALLIANZ", "alliance",
"BEANSPRUCHEN", "claim",
"PROMOTION", "promote",
"BEZAHLEN", "pay",
}; };

18
src/keyword.test.c
View File

@ -11,7 +11,7 @@ static void test_init_keywords(CuTest *tc) {
test_cleanup(); test_cleanup();
lang = get_or_create_locale("en"); lang = get_or_create_locale("en");
locale_setstring(lang, "keyword::NACH", "MOVE"); locale_setstring(lang, "keyword::move", "MOVE");
init_keywords(lang); init_keywords(lang);
CuAssertIntEquals(tc, K_MOVE, get_keyword("move", lang)); CuAssertIntEquals(tc, K_MOVE, get_keyword("move", lang));
test_cleanup(); test_cleanup();
@ -22,20 +22,22 @@ static void test_init_keyword(CuTest *tc) {
test_cleanup(); test_cleanup();
lang = get_or_create_locale("de"); lang = get_or_create_locale("de");
init_keyword(lang, K_MOVE, "nach"); init_keyword(lang, K_MOVE, "NACH");
init_keyword(lang, K_STUDY, "lernen"); init_keyword(lang, K_STUDY, "LERNEN");
init_keyword(lang, K_DESTROY, "ZERSTOEREN"); init_keyword(lang, K_DESTROY, "ZERSTOEREN");
CuAssertIntEquals(tc, K_MOVE, get_keyword("nach", lang)); CuAssertIntEquals(tc, K_MOVE, get_keyword("nach", lang));
CuAssertIntEquals(tc, K_STUDY, get_keyword("LERN", lang));
CuAssertIntEquals(tc, K_STUDY, get_keyword("LERNEN", lang));
CuAssertIntEquals(tc, K_STUDY, get_keyword("lerne", lang)); CuAssertIntEquals(tc, K_STUDY, get_keyword("lerne", lang));
CuAssertIntEquals(tc, K_DESTROY, get_keyword("ZERSTÖREN", lang)); CuAssertIntEquals(tc, K_DESTROY, get_keyword("zerst\xC3\xB6ren", lang));
CuAssertIntEquals(tc, NOKEYWORD, get_keyword("potato", lang)); CuAssertIntEquals(tc, NOKEYWORD, get_keyword("potato", lang));
test_cleanup(); test_cleanup();
} }
static void test_findkeyword(CuTest *tc) { static void test_findkeyword(CuTest *tc) {
test_cleanup(); test_cleanup();
CuAssertIntEquals(tc, K_MOVE, findkeyword("NACH")); CuAssertIntEquals(tc, K_MOVE, findkeyword("move"));
CuAssertIntEquals(tc, K_STUDY, findkeyword("LERNEN")); CuAssertIntEquals(tc, K_STUDY, findkeyword("study"));
CuAssertIntEquals(tc, NOKEYWORD, findkeyword("")); CuAssertIntEquals(tc, NOKEYWORD, findkeyword(""));
CuAssertIntEquals(tc, NOKEYWORD, findkeyword("potato")); CuAssertIntEquals(tc, NOKEYWORD, findkeyword("potato"));
} }
@ -45,8 +47,8 @@ static void test_get_keyword_default(CuTest *tc) {
test_cleanup(); test_cleanup();
lang = get_or_create_locale("en"); lang = get_or_create_locale("en");
CuAssertIntEquals(tc, NOKEYWORD, get_keyword("potato", lang)); CuAssertIntEquals(tc, NOKEYWORD, get_keyword("potato", lang));
CuAssertIntEquals(tc, K_MOVE, get_keyword("NACH", lang)); CuAssertIntEquals(tc, K_MOVE, get_keyword("move", lang));
CuAssertIntEquals(tc, K_STUDY, get_keyword("LERNEN", lang)); CuAssertIntEquals(tc, K_STUDY, get_keyword("study", lang));
} }
#define SUITE_DISABLE_TEST(suite, test) (void)test #define SUITE_DISABLE_TEST(suite, test) (void)test

29
src/util/log.c
View File

@ -225,6 +225,35 @@ void log_warning(const char *format, ...)
} }
} }
void log_error_n(const char *format, ...)
{
const char * prefix = "ERROR";
const int mask = LOG_CPERROR;
/* write to the logfile, always */
if (logfile && (log_flags & mask)) {
va_list args;
va_start(args, format);
_log_write(logfile, 0, prefix, format, args);
va_end(args);
}
/* write to stderr, if that's not the logfile already */
if (logfile!=stderr && (log_stderr & mask)) {
int dupe = check_dupe(format, prefix);
if (!dupe) {
va_list args;
va_start(args, format);
_log_write(stderr, stdio_codepage, prefix, format, args);
fputc('\n', logfile);
va_end(args);
}
}
if (log_flags & LOG_FLUSH) {
log_flush();
}
}
void log_error(const char *format, ...) void log_error(const char *format, ...)
{ {
const char * prefix = "ERROR"; const char * prefix = "ERROR";

1
src/util/log.h
View File

@ -22,6 +22,7 @@ extern "C" {
/* use macros above instead of these: */ /* use macros above instead of these: */
extern void log_warning(const char *format, ...); extern void log_warning(const char *format, ...);
extern void log_error(const char *format, ...); extern void log_error(const char *format, ...);
extern void log_error_n(const char *format, ...);
extern void log_debug(const char *format, ...); extern void log_debug(const char *format, ...);
extern void log_info(const char *format, ...); extern void log_info(const char *format, ...);
extern void log_printf(FILE * ios, const char *format, ...); extern void log_printf(FILE * ios, const char *format, ...);