Commit graph

155 commits

Author SHA1 Message Date
Tyler Renelle
4ca516b7bc Merge pull request #1817 from nafoster/develop
Many JP translations
2013-11-14 14:07:47 -08:00
Nicole Foster
af8ca6d5b0 Many JP translations 2013-11-14 16:34:36 -05:00
Matteo Pagliazzi
1631406a5e greek code set to "el" 2013-11-14 21:21:49 +01:00
Matteo Pagliazzi
41d8bc04cd Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-14 20:50:36 +01:00
Matteo Pagliazzi
7df04633e2 correct languageName for Ukrainian 2013-11-14 20:50:17 +01:00
Tyler Renelle
201b04f759 i18n: greek bug 2013-11-14 11:17:47 -08:00
Tyler Renelle
ffe8ae899b Merge pull request #1816 from phil230/greek_tr
contrib: Added Greek Language
2013-11-14 10:46:16 -08:00
Matteo Pagliazzi
68c9748619 armour -> armor 2013-11-14 19:23:35 +01:00
Filippos
fafa17c80d Removed clientSideStrings 2013-11-14 17:25:15 +02:00
Filippos
412c9efd60 Added Greek Language 2013-11-14 17:01:13 +02:00
Matteo Pagliazzi
0c40d44de7 remove clientSideStrings part, stringNotFound added to locales/en/app.json, should be added to other languages, readme updated, $rootscope.translations removed 2013-11-14 14:41:42 +01:00
Tyler Renelle
ddb73f806a translations: prep old app.json files for new setup 2013-11-14 01:27:11 -08:00
Nicole Foster
d44d6168bf JP: translated head, skin, and profile heading and half translated show helm 2013-11-14 00:51:05 -08:00
Tyler Renelle
8b33019b75 [#1813] add bg.original.json, since old bg file not compatible with new
json. will need to revisit
2013-11-14 00:35:00 -08:00
Tyler Renelle
5914848308 [#1813] restore lost PT translations (@DanielTheBard can you double check
this?)
2013-11-14 00:25:36 -08:00
Tyler Renelle
10e9c205e6 Merge branch 'translations' into develop
Conflicts:
	locales/bg/app.json
	locales/nl/app.json
2013-11-13 23:37:29 -08:00
Adrien Lemaire
153d1957a8 clean code from websites
Need review !
2013-11-14 15:20:35 +11:00
Tyler Renelle
1150de9d9d Merge pull request #1780 from Fandekasp/fix_armour
Issue #1149: armour → armor
2013-11-13 16:19:04 -08:00
Adrien Lemaire
c90248f817 update new armour → armor after rebase 2013-11-14 11:13:09 +11:00
Adrien Lemaire
1fab48f1db Issue #1149: armour → armor 2013-11-14 11:10:54 +11:00
Adrien Lemaire
9a8b0f91f2 review and fix fr typos 2013-11-14 10:54:41 +11:00
Tyler Renelle
ef9d423a49 Merge pull request #1799 from nafoster/ja_trans
JP: Translated avatar heading, website heading, and changed medium to above average
2013-11-13 15:47:17 -08:00
Daniel the Bard
7291e3c97c Update app.json
Skipped over lines 28-46 for now. Will come back to look over them.

- Line 56 - História makes more sense than Histórica I believe. Unless it's the history of a masculine object, such as histórico de crédito, história should be the go-to I believe.
- Line 4 - Originally put enquanto, switched to quando. Returned HP to pontos de vida. HP should make sense but might not to a Portuguese non-gamer.
- Line 60 - Changed from Logar-se / Inscrever-se to Iniciar sessão / Regista-se.
- Line 68 - Grupo to Partido
- Line 86 - Deletar to Eliminar
- Line 112 - Limpar (clean) to Eliminar
- A few other minor changes
2013-11-13 15:36:51 -08:00
Daniel the Bard
0a0a8bc1a0 Portuguese Translation Fixes
Checked through lines 1-24:

- Fixed general verb and noun mistakes
- Fixed a few words that were still in English
- Kept role-playing game in English. RPG's should be understood by Portuguese-speakers. 
- Pretty sure como makes more sense than conforme.
- Believe I fixed some improper use of the imperative form. Correct me if I'm wrong.
- Pluralized recompensas
- Changed Bem vindo to boas-vindas. Bem-vindo may be accurate though?
- Other general fixes that escape me.

Plan to do more.
2013-11-13 15:36:51 -08:00
Daniel the Bard
2aa9c0ed56 Update app.json
Did some edits to lines 1-16. Will continue.
2013-11-13 15:36:51 -08:00
Tyler Renelle
af20b91473 Merge pull request #1784 from Fandekasp/ja_trans
start japanese translations
2013-11-13 15:30:28 -08:00
Guillaume Piolle
b0a8e75893 Rephrasing proposals 2013-11-13 15:27:27 -08:00
Guillaume Piolle
07433b707a Correcting typos 2013-11-13 15:27:27 -08:00
Tyler Renelle
2506e7b86c Merge pull request #1595 from Arcklo/translations
Added Portuguese Translation
2013-11-13 15:24:06 -08:00
Tyler Renelle
0131b8dc93 Merge remote-tracking branch 'lolole13/translations' into translations
Conflicts:
	locales/fr/app.json
2013-11-13 15:21:41 -08:00
Tyler Renelle
78c01d226c Merge remote-tracking branch 'bennyp123/master' into translations
Conflicts:
	locales/he/app.json
2013-11-13 15:18:27 -08:00
Tyler Renelle
1706c29df7 Merge remote-tracking branch 'blixhavn/master' into translations
Conflicts:
	locales/no/app.json
2013-11-13 15:10:03 -08:00
Tyler Renelle
7eb7669cce Merge pull request #1111 from Noeska/translations
Dutch Translations
2013-11-13 15:00:04 -08:00
Tyler Renelle
20bb49253d translations: temporarily swap locales_old/locales so we can merge all
the PRs (will put back to normal after)
2013-11-13 14:54:17 -08:00
Matteo Pagliazzi
22267805ee add support for getting strings under clientSideStrings and update sample 2013-11-12 22:23:47 +01:00
Matteo Pagliazzi
be2010b0a2 add sample app.json for new translations, send client side strings to the browser, send languages to the browser with a language name and code 2013-11-12 22:01:27 +01:00
Matteo Pagliazzi
7351697cbb moves locales to locales_old 2013-11-12 21:18:40 +01:00
Nicole Foster
2318243ebd Translated medium to above average, avatar heading, and website heading 2013-11-12 10:56:06 -05:00
Adrien Lemaire
4a42aaba42 more translations done 2013-11-12 16:39:10 +11:00
Matteo Pagliazzi
687ed0978a fix some json and rename a file to match the locales/lang/app.json format 2013-11-11 22:11:17 +01:00
Matteo Pagliazzi
d0b35cf067 solve conflicts 2013-11-11 21:36:59 +01:00
Matteo Pagliazzi
a1f9bf60fb try 2013-11-11 21:20:12 +01:00
Adrien Lemaire
9ad61da439 start japanese translations 2013-11-10 18:05:49 +11:00
SamuraiEtti
822b912c0d No he revisado todo, pero he corregido algunos elementos
889cb42c-9552-4653-a05f-61d829b46c1c
2013-10-09 17:25:23 +02:00
SamuraiEtti
70497867eb Update app.json 2013-10-09 15:59:30 +02:00
Arcklo
a3ed609b5a Added Portuguese Translation
I am Arcklo, my UID is 6bb9d67a-675a-4391-bf0f-381f2749b764
A few comments:
Plate, directly translated, is hardly used. I did so anyways, but personally i think "Heavy Armor", "Heavy Helmet" and so on would sound better in portuguese.
The part where the code stated "Panda Egg" had "Wolf Cub" written on it. I translated as "Panda Cub", but if it was intended, i'll correct it.
Town crier was particularly hard to translate. I went with "arauto". If any other translators want to have at it, be my guests.
2013-10-04 17:45:29 -03:00
Arcklo
c979e04bbf Update app.json 2013-10-04 17:31:37 -03:00
Benny Powers
e7dbd2f9cb Acheivements and Other Items 2013-09-09 09:38:45 +02:00
Lolo le 13
cc732c53a7 Update app.json 2013-09-09 01:58:44 +02:00
Benny Powers
051d08f2a8 NPCs and Hatching Potions 2013-08-07 09:59:47 +03:00