EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 07:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:mcMMO-Dev/mcMMO

Browse Source 
Conflicts:
	src/main/java/com/gmail/nossr50/locale/mcLocale.java
This commit is contained in:
nossr50 2012-04-26 11:54:45 -07:00
commit b8e128e0a9
16 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/locale/mcLocale.java
View File

@ -28,9 +28,8 @@ public class mcLocale {
try {
if (RESOURCE_BUNDLE == null) {
Locale.setDefault(new Locale("en", "US"));
String[] myLocale = Config.getLocale().split("[-_ ]");
Locale locale = null;
String[] myLocale = Config.getLocale().split("[-_ ]");
if (myLocale.length == 1) {
locale = new Locale(myLocale[0]);

2
src/main/resources/locale/locale_da.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger

2
src/main/resources/locale/locale_de.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Umweltbewusst
Taming.Ability.Bonus.1=W\u00f6lfe vermeiden Gefahr

2
src/main/resources/locale/locale_en_US.properties
View File

@ -249,7 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
#TAMING

2
src/main/resources/locale/locale_es.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**ATAQUE DENTADO ACTIVADO**
Swords.Skills.SS.Refresh=[[GREEN]]\u00a1Tu habilidad de [[YELLOW]]Golpe Dentado [[GREEN]]fue refrescada!
Swords.Skills.SS.Other.Off=[[RED]]Ataque Dentado[[GREEN]] le ha expirado a [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]\u00a1{0}[[DARK_GREEN]] us\u00f3 [[RED]]Ataque Dentado!
Swords.SkillUp=[[YELLOW]]Habilidad de Espadas incrementada en {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Habilidad de Espadas incrementada en {0}. Total ({1})
Swords.SS.Length=[[RED]]Duraci\u00f3n del Ataque Dentado: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Consciente del Entorno
Taming.Ability.Bonus.1=Lobos evitan peligros

2
src/main/resources/locale/locale_fi.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger

2
src/main/resources/locale/locale_fr.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**ATTAQUE D\u00c9CHIRANTE ACTIV\u00c9E**
Swords.Skills.SS.Refresh=[[GREEN]]Votre comp\u00e9tence [[YELLOW]]Attaque d\u00e9chirante [[GREEN]]est pr\u00eate !
Swords.Skills.SS.Other.Off=[[RED]]Attaque d\u00e9chirante[[GREEN]] s\'est termin\u00e9 pour [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] a utilis\u00e9 [[RED]]Attaque d\u00e9chirante !
Swords.SkillUp=[[YELLOW]]Le talent \u00c9p\u00e9es augmente de {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Le talent \u00c9p\u00e9es augmente de {0}. Total ({1})
Swords.SS.Length=[[RED]]Dur\u00e9e d\'Attaque d\u00e9chirante : [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Attentif \u00e0 l\'environnement
Taming.Ability.Bonus.1=Les loups \u00e9vitent les dangers

2
src/main/resources/locale/locale_it.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger

2
src/main/resources/locale/locale_ko.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger

2
src/main/resources/locale/locale_lv.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger

2
src/main/resources/locale/locale_nl.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger

2
src/main/resources/locale/locale_no.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES AKTIVERT**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] har brukt [[RED]] Taggete Streik!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger

2
src/main/resources/locale/locale_pl.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger

2
src/main/resources/locale/locale_pt_BR.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger

2
src/main/resources/locale/locale_ru.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**\u0417\u0410\u0417\u0423\u0411\u0420\u0415\u041d\
Swords.Skills.SS.Refresh=[[GREEN]]\u0412\u0430\u0448\u0430 \u0441\u043f\u043e\u0441\u043e\u0431\u043d\u043e\u0441\u0442\u044c [[YELLOW]]\u0417\u0430\u0437\u0443\u0431\u0440\u0435\u043d\u043d\u044b\u0439 \u041c\u0435\u0447 [[GREEN]]\u0432\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043b [[RED]]\u0417\u0430\u0437\u0443\u0431\u0440\u0435\u043d\u043d\u044b\u0439 \u041c\u0435\u0447!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger

2
src/main/resources/locale/locale_sv.properties
View File

@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1})
Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s
Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger