 Stan Lindsey
|
fc4c2bdbf0
|
Merge pull request #1073 from maggick/patch-3
minor change
|
2013-05-28 03:27:13 -07:00 |
|
|
Matthieu Keller
|
850ebc9f6a
|
minor change
|
2013-05-28 11:23:01 +03:00 |
|
|
Stan Lindsey
|
bf72b1e797
|
Merge pull request #1072 from maggick/patch-4
oeuf -> œuf
|
2013-05-28 01:08:25 -07:00 |
|
|
Stan Lindsey
|
1aa97cf5a0
|
Merge pull request #1065 from Czuken/translations
Update app.json
|
2013-05-28 00:54:17 -07:00 |
|
|
Matthieu Keller
|
b4861b2470
|
oeuf -> œuf
|
2013-05-28 07:49:08 +02:00 |
|
|
Czuken
|
6572cb1b9d
|
Update app.json
|
2013-05-28 00:55:21 +03:00 |
|
|
Stan Lindsey
|
df3693e6d6
|
Merge pull request #1056 from neameta/translations
Update of french translation
|
2013-05-27 12:49:33 -07:00 |
|
|
neameta
|
b5a7f1b4ba
|
Update of translation
Some words were badly chosen and some mistakes remained, so i review the entire text to change them.
|
2013-05-27 15:31:22 +02:00 |
|
|
Stan Lindsey
|
32c2605106
|
Update app.json
|
2013-05-21 11:28:40 +02:00 |
|
|
Stan Lindsey
|
cca6fc6d0e
|
Merge pull request #1009 from theyliveforever/translations
Spanish Translation
|
2013-05-21 02:25:57 -07:00 |
|
|
theyliveforever
|
25b4e057e7
|
Update app.json
|
2013-05-20 23:05:34 -03:00 |
|
|
Stan Lindsey
|
99985be20a
|
Merge pull request #1005 from LazuliKazeno/patch-1
Some minor changes
|
2013-05-20 14:26:49 -07:00 |
|
|
LazuliKazeno
|
9abed29386
|
double quote missing
thanks Elektro121!
|
2013-05-17 14:15:17 +02:00 |
|
|
LazuliKazeno
|
274f74e9bb
|
Small changes
|
2013-05-17 14:05:10 +03:00 |
|
|
Stan Lindsey
|
ed0bbb782e
|
Merge pull request #960 from LazuliKazeno/translations
French translation complete
|
2013-05-14 08:37:41 -07:00 |
|
|
Stan Lindsey
|
42056e6ed3
|
Merge pull request #955 from sorko/translations
Updated some Russian n Ukrainian Translations
|
2013-05-14 08:35:31 -07:00 |
|
|
sorko
|
96ebde3fa3
|
Update app.json
50%
|
2013-05-14 16:20:40 +03:00 |
|
|
LazuliKazeno
|
7f1527ed01
|
End of french translation
|
2013-05-14 14:17:55 +02:00 |
|
|
sorko
|
8e80c08dfe
|
Update app.json
|
2013-05-14 14:24:47 +03:00 |
|
|
Daniel Saewitz
|
dd6e090a1b
|
Merge pull request #953 from cleave29/translations
Added German translation
|
2013-05-14 00:45:02 -07:00 |
|
|
cleave29
|
36f391a828
|
Update app.json
|
2013-05-14 01:42:10 -06:00 |
|
|
Daniel Saewitz
|
5628287368
|
Merge pull request #951 from WielebnyB/translations
Added Polish Translation
|
2013-05-13 16:45:06 -07:00 |
|
|
WielebnyB
|
bcbbe4799b
|
Update app.json
|
2013-05-14 01:23:49 +02:00 |
|
|
WielebnyB
|
c7a68c5a2e
|
Update app.json
|
2013-05-14 00:33:42 +02:00 |
|
|
WielebnyB
|
cdcdc11849
|
Update app.json
|
2013-05-14 00:14:28 +03:00 |
|
|
LazuliKazeno
|
35fe5dc68d
|
Begin the french translation
From beginning to stable/tavern (i'm not convinced with my translation of "stable" yet)
|
2013-05-13 23:14:48 +03:00 |
|
|
Daniel Saewitz
|
90fca5c98a
|
Remove translate middleware
|
2013-05-13 15:44:21 -04:00 |
|
|
Daniel Saewitz
|
017999d544
|
Merge
|
2013-05-13 15:42:39 -04:00 |
|
|
Daniel Saewitz
|
28adcc5b30
|
Merge pull request #948 from lancemanfv/translations
Translations
|
2013-05-13 12:36:17 -07:00 |
|
|
lancemanfv
|
e98a9c7629
|
Update app.json
|
2013-05-13 21:07:13 +03:00 |
|
|
lancemanfv
|
02d13c5ddd
|
Update app.json
|
2013-05-13 20:50:36 +03:00 |
|
|
Stan Lindsey
|
c82e0651d1
|
Added other language folders with base json
|
2013-05-13 15:13:11 +01:00 |
|
|
Stan Lindsey
|
cf68e9d2a7
|
Update app.json
|
2013-05-13 15:58:56 +02:00 |
|
|
Slappybag
|
f781f644ab
|
Incorporation of translation variables
@switz - can't seem to access a i18n translate function publically. =/
|
2013-05-12 19:28:53 +01:00 |
|
|
Daniel Saewitz
|
b11df0a755
|
Merge branch 'locale/nl' of github.com:jbnicolai/habitrpg into develop
|
2013-05-12 14:20:11 -04:00 |
|
|
Joshua Boy Nicolai
|
27a3627fa0
|
Merge pull request #1 from xeross/locale/nl
Locale fixes/changes
|
2013-05-12 11:17:44 -07:00 |
|
|
Daniel Saewitz
|
ce6914f0c8
|
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
|
2013-05-12 14:00:33 -04:00 |
|
|
Daniel Saewitz
|
445a968a9b
|
Merge
|
2013-05-12 13:58:50 -04:00 |
|
|
Slappybag
|
367c860ac8
|
syntax error on my part
|
2013-05-12 14:34:49 +01:00 |
|
|
Slappybag
|
ae0dfa9ffe
|
Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop
|
2013-05-12 13:33:40 +01:00 |
|
|
Slappybag
|
1079d060fc
|
Final app.json english.
|
2013-05-12 13:32:41 +01:00 |
|
|
Tyler Renelle
|
bb1ea755f1
|
tasks / rewards.html - pass in the actual list, and whether booleans
@editable and @main, which will allow for challenges lists & mngr
accounts / public lists
|
2013-05-12 13:12:13 +01:00 |
|
|
Slappybag
|
a287160d3b
|
Changed Tavern message to be less threatening & simplier.
|
2013-05-12 12:41:00 +01:00 |
|
|
Tyler Renelle
|
f28a542aa4
|
small cleanup
|
2013-05-12 12:40:06 +01:00 |
|
|
Slappybag
|
7986464132
|
Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop
|
2013-05-12 12:30:34 +01:00 |
|
|
Tyler Renelle
|
912b716a28
|
fix the reroll buy-button bug
|
2013-05-12 12:29:00 +01:00 |
|
|
Tyler Renelle
|
dcc4d0c93e
|
update Dailys => Dailies (we use dailys throughout the code so we can
easly switch between singular/plural, but for actual text we want Dailies)
|
2013-05-12 11:36:56 +01:00 |
|
|
Tyler Renelle
|
4347ba52ba
|
overhaul tasks.html so we can start generalizing task-lists,
ground-work for challenges
|
2013-05-12 11:33:05 +01:00 |
|
|
Tyler Renelle
|
f7145bb951
|
cleanup of the show-completed / show-remaining. That context-dependant
/ display-context-for stuff was bugging me out, and wasn't using Derby
to it's potential. also some tags & habit-wide cleanup in helpers:taskClasses()
|
2013-05-12 10:52:32 +01:00 |
|
|
Tyler Renelle
|
a9d3348678
|
last of the tokens=>gems
|
2013-05-12 10:15:31 +01:00 |
|