From 11a558cd204857c270f7fae1b5d66eda2abf0885 Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Wed, 22 Jan 2014 21:42:48 +0100
Subject: [PATCH 01/17] Update challenge-box.jade

---
 views/options/social/challenge-box.jade | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/views/options/social/challenge-box.jade b/views/options/social/challenge-box.jade
index 09d545635b..7f36ec2014 100644
--- a/views/options/social/challenge-box.jade
+++ b/views/options/social/challenge-box.jade
@@ -1,8 +1,7 @@
 // ------ Challenges -------
 .modal(style='position: relative;top: auto;left: auto;right: auto;margin: 0 auto 20px;z-index: 1;max-width: 100%;')
   .modal-header
-    h3
-      | Challenges
+    h3=env.t('challenges')
       a.pull-right(target='_blank', href='https://trello.com/card/challenges-individual-party-guild-public/50e5d3684fe3a7266b0036d6/58')
         i.icon-question-sign
   .modal-body(bindonce='group.challenges')
@@ -13,4 +12,4 @@
             a(ui-sref='options.social.challenges.detail({cid:challenge._id})') {{challenge.name}}
     div(ng-if='group.challenges.length == 0')
       p.
-        No challenges yet, visit <a class='label' ui-sref='options.social.challenges'><i class=icon-bullhorn></i> Challenges</a> to create one.
\ No newline at end of file
+        =env.t('noChallenges') + '<a class='label' ui-sref='options.social.challenges'><i class=icon-bullhorn></i>' + =env.t('challenges') + '</a>' + =env.t('toCreate')

From 7540f6acc9fc6da07faa2c284bf37d762d096bbd Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Wed, 22 Jan 2014 22:16:54 +0100
Subject: [PATCH 02/17] Update challenges.jade

---
 views/options/social/challenges.jade | 76 ++++++++++++++--------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/views/options/social/challenges.jade b/views/options/social/challenges.jade
index f17f275665..c59db7b5b1 100644
--- a/views/options/social/challenges.jade
+++ b/views/options/social/challenges.jade
@@ -1,10 +1,10 @@
 script(type='text/ng-template', id='partials/options.social.challenges.detail.close.html')
-  a.btn.btn-small.btn-danger(ng-click="delete(closingChal)") Delete
-  h5 - Or -
-  small Select a winner and close the challenge:
+  a.btn.btn-small.btn-danger(ng-click="delete(closingChal)")=env.t('delete')
+  h5=env.t('minusOr')
+  small=env.t('selectWinner')
   select(ng-model='closingChal.winner', name='Winner', ng-options='u._id as u.profile.name for u in closingChal.members', ng-change='selectWinner(closingChal)')
   small.pull-right
-    a(ng-click='cancelClosing(closingChal)') cancel
+    a(ng-click='cancelClosing(closingChal)')=env.t('cancel')
 
 script(type='text/ng-template', id='partials/options.social.challenges.detail.member.html')
   .modal.wide-modal
@@ -14,42 +14,42 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.me
     .modal-body
       habitrpg-tasks(main=false)
     .modal-footer
-      a.btn(ng-click='$state.go("^")') Close
+      a.btn(ng-click='$state.go("^")')=env.t('close')
 
 script(type='text/ng-template', id='partials/options.social.challenges.detail.html')
   // Edit button
   div(bindonce='challenge', ng-if='challenge.leader==user._id')
     ul.unstyled
       li(ng-hide='challenge._locked==false')
-        button.btn.btn-small.btn-default(ng-click='challenge._locked = false') Edit
-        button.btn.btn-small.btn-warning(ng-click='close(challenge, $event)', tooltip='Delete or select winner') End Challenge
+        button.btn.btn-small.btn-default(ng-click='challenge._locked = false')=env.t('edit')
+        button.btn.btn-small.btn-warning(ng-click='close(challenge, $event)', tooltip=env.t('deleteOrSelect'))=env.t('endChallenge')
       li(ng-show='challenge._locked==false')
-        button.btn.btn-small.btn-primary(ng-click='save(challenge)') Save
-        button.btn.btn-small.btn-default(ng-click='challenge._locked=true') Cancel
+        button.btn.btn-small.btn-primary(ng-click='save(challenge)')=env.t('save')
+        button.btn.btn-small.btn-default(ng-click='challenge._locked=true')=env.t('cancel')
 
     div(ng-show='challenge._locked==false')
       .-options
         input.option-content(type='text', ng-model='challenge.name')
         .option-medium
-          input.option-content(type='text', minlength="3", maxlength="16", ng-model='challenge.shortName', placeholder='Tag Name', required)
-        textarea.option-content(cols='3', placeholder='Description', ng-model='challenge.description')
+          input.option-content(type='text', minlength="3", maxlength="16", ng-model='challenge.shortName', placeholder=env.t('challengeTag'), required)
+        textarea.option-content(cols='3', placeholder=env.t('challengeDescr'), ng-model='challenge.description')
     hr
 
   .well(bindonce='challenge', ng-if='challenge.description')
     markdown(ng-model='challenge.description')
-  i.icon-question-sign(popover="These are the challenge's tasks. As users participate, they will change color and gain graphs to show you the overall progress of the group.", popover-trigger='mouseenter', popover-placement='right')
+  i.icon-question-sign(popover=env.t('challengeDiscription'), popover-trigger='mouseenter', popover-placement='right')
   habitrpg-tasks(obj='challenge', main=false)
 
   // Member List
   div(bindonce='challenge', ng-if='challenge.members.length > 0')
-    h3 How's Everyone Doing?
+    h3=env.t('hows')
     menu
       button.customize-option(ng-repeat='member in challenge.members', ng-click='toggleMember(challenge._id, member._id)') {{member.profile.name}}
   div(ui-view)
 
   // Accordion version if we choose that instead
   //- div(ng-if='challenge.members')
-    h4 How's Everyone Doing?
+    h4=env.t('hows')
     .accordion-group(bindonce='challenge.members', ng-repeat='member in challenge.members')
       .accordion-heading
         a.accordion-toggle(ng-click='toggleMember(challenge._id, member._id)') {{member.profile.name}}
@@ -60,28 +60,28 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht
 script(type='text/ng-template', id='partials/options.social.challenges.html')
   .row-fluid
     .span2.well#challenges-filters
-      h3 Filter:
-      h4 Groups
+      h3=env.t('filter') + ':'
+      h4=env.t('groups')
       ul.unstyled
-        a.btn.btn-mini.pull-left(ng-click='selectAll()') All
-        a.btn.btn-mini(ng-click='selectNone()') None
+        a.btn.btn-mini.pull-left(ng-click='selectAll()')=env.t('all')
+        a.btn.btn-mini(ng-click='selectNone()')=env.t('noNone')
       br
       label.checkbox(ng-repeat='group in groupsFilter')
         input(type='checkbox', ng-model='search.group[group._id]')
         | {{group.name}}
-      h4 Membership
+      h4=env.t('membership')
       label.radio
         input(type='radio', name='search-participation-radio', ng-click='search._isMember = true')
-        | Participating
+        =env.t('participating')
       label.radio
         input(type='radio', name='search-participation-radio', ng-click='search._isMember = false')
-        | Not Participating
+        =env.t('notParticipating')
       label.radio
         input(type='radio', name='search-participation-radio', ng-click='search._isMember = undefined', checked='checked')
-        | Either
+        =env.t('either')
     .span10
       // Creation form
-      button.btn.btn-success#create-challenge-btn(ng-click='create()', ng-hide='newChallenge') Create Challenge
+      button.btn.btn-success#create-challenge-btn(ng-click='create()', ng-hide='newChallenge')=env.t('createChallenge')
       .create-challenge-from.well(ng-if='newChallenge')
         form(ng-submit='save(newChallenge)')
           div
@@ -89,30 +89,30 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
             input.btn.btn-danger(type='button', ng-click='discard()', value='Discard')
             select(ng-model='newChallenge.group', ng-required='required', name='Group', ng-options='g._id as g.name for g in groups')
           .challenge-options
-            input.option-content(type='text', ng-model='newChallenge.name', placeholder='Challenge Title', required='required')
+            input.option-content(type='text', ng-model='newChallenge.name', placeholder=env.t('ChallengeTitle'), required='required')
 
             .option-medium
-              input.option-content(type='text', minlength="3", maxlength="16", ng-model='newChallenge.shortName', placeholder='Tag Name', required)
+              input.option-content(type='text', minlength="3", maxlength="16", ng-model='newChallenge.shortName', placeholder=env.t('challengeTag'), required)
               a(target='_blank', href='http://habitrpg.wikia.com/wiki/Tags')
-                i.icon-question-sign(popover="Challenges appear on tag-lists & task-tooltips. So while you'll want a descriptive title above, you'll also need a 'short name'. Eg, 'Lose 10 pounds in 3 months' might become '-10lb' (Click the '?' for more info).", popover-trigger='mouseenter', popover-placement='right')
+                i.icon-question-sign(popover=env.t('challengeTagPop'), popover-trigger='mouseenter', popover-placement='right')
 
-            textarea.option-content(cols='3', placeholder='Description', ng-model='newChallenge.description')
+            textarea.option-content(cols='3', placeholder=env.t('challengeDescr'), ng-model='newChallenge.description')
 
             //- what's going on here?
             br
             br
 
             .option-medium
-              input.option-content(type='number', min="{{newChallenge.group=='habitrpg' ? 1 : 0}}", max="{{maxPrize}}", ng-model='newChallenge.prize', placeholder='Prize')
+              input.option-content(type='number', min="{{newChallenge.group=='habitrpg' ? 1 : 0}}", max="{{maxPrize}}", ng-model='newChallenge.prize', placeholder=env.t('prize'))
               span.input-suffix.Pet_Currency_Gem1x.inline-gems
-              i.icon-question-sign(popover="If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.", popover-trigger='mouseenter', popover-placement='right')
+              i.icon-question-sign(popover="env.t('prizePop'), popover-trigger='mouseenter', popover-placement='right')
               span(ng-show='newChallenge.group=="habitrpg"').
-                &nbsp;Minimum 1 Gem for <strong>public challenges</strong> (helps prevent spam, it really does).
+                =env.t('min1Gem') + '<strong>' + =env.t('publicChallenges') + '</strong>' + =env.t('helpsPrevent')
 
             .option-medium(ng-if='user.contributor.admin')
               label.checkbox
                 input(type='checkbox', ng-model='newChallenge.official')
-                | Official HabitRPG Challenge
+                =env.t('officialChallenge')
 
         habitrpg-tasks(main=false, obj='newChallenge')
 
@@ -121,12 +121,12 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
         .accordion-heading
           ul.pull-right.challenge-accordion-header-specs
             li(ng-if='challenge.official')
-              span.label.label-success Official HabitRPG Challenge
+              span.label.label-success =env.t('officialChallenge')
             li {{challenge.group.name}}
             li
-              | by&nbsp;
+              =env.t('by')
               strong {{challenge.leader.profile.name}}
-            li {{challenge.memberCount}} Participants
+            li {{challenge.memberCount}} =env.t('participants')
             li(ng-show='challenge.prize')
               // prize
               table(ng-show='challenge.prize')
@@ -134,16 +134,16 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
                   td {{challenge.prize}}
                   td
                     .Pet_Currency_Gem1x(style='margin-left:0px')
-                  td  Prize
+                  td  =env.t('prize')
             li
               // leave / join
               a.btn.btn-small.btn-danger(ng-show='challenge._isMember', ng-click='clickLeave(challenge, $event)')
                 i.icon-ban-circle
-                | Leave
+                =env.t('leave')
               a.btn.btn-small.btn-success(ng-hide='challenge._isMember', ng-click='join(challenge)')
                 i.icon-ok
-                | Join
+                =env.t('join')
           a.accordion-toggle(ng-click='toggle(challenge._id)') {{challenge.name}}
         .accordion-body(ng-class='{collapse: !$stateParams.cid == challenge._id}')
           .accordion-inner(ng-if='$stateParams.cid == challenge._id')
-            div(ui-view)
\ No newline at end of file
+            div(ui-view)

From 39eb590299f60f39adae943cb62b610c5323483a Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Wed, 22 Jan 2014 22:51:57 +0100
Subject: [PATCH 03/17] Update create-group.jade

---
 views/options/social/create-group.jade | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/views/options/social/create-group.jade b/views/options/social/create-group.jade
index 1e8d48c96f..be8541558c 100644
--- a/views/options/social/create-group.jade
+++ b/views/options/social/create-group.jade
@@ -5,22 +5,21 @@ form.form-horizontal(ng-submit='create(newGroup)')
       .controls
         input#new-group-name.input-medium.option-content(required, type='text', placeholder='{{text}} Name', ng-model='newGroup.name')
     .control-group
-      label.control-label(for='new-group-description') Description
+      label.control-label(for='new-group-description')=env.t('description')
       .controls
-        textarea#new-group-description.option-content(cols='3', placeholder='Description', ng-model='newGroup.description')
+        textarea#new-group-description.option-content(cols='3', placeholder=env.t('description'), ng-model='newGroup.description')
     .control-group(ng-show='type=="guild"')
       .controls
         label.radio
           input(type='radio', name='new-group-privacy', value='public', ng-model='newGroup.privacy')
-          | Public
+          =env.t('public')
         label.radio
           input(type='radio', name='new-group-privacy', value='private', ng-model='newGroup.privacy')
-          | Invite Only
-        input.btn(type='submit', ng-disabled='!newGroup.privacy && !newGroup.name', value='Create')
-        span.gem-cost 4 Gems
+          =env.t('inviteOnly')
+        input.btn(type='submit', ng-disabled='!newGroup.privacy && !newGroup.name', value=env.t('create'))
+        span.gem-cost '4' + =env.t('gems')
         p
-          small
-            | The Gem cost promotes high quality Guilds, and is transferred into your Guild's bank for use as prizes in Guild Challenges!
+          small=env.t('gemcost')
     .control-group(ng-show='type=="party"')
       .controls
-        input.btn(type='submit', value='Create')
+        input.btn(type='submit', value=env.t('create'))

From 098247233f55d3f7566b82d2d2c750ad287f10d1 Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Wed, 22 Jan 2014 23:21:19 +0100
Subject: [PATCH 04/17] Update group.jade

line 133 problem
---
 views/options/social/group.jade | 65 +++++++++++++++++----------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/views/options/social/group.jade b/views/options/social/group.jade
index a839e8e09d..2ad5290ac9 100644
--- a/views/options/social/group.jade
+++ b/views/options/social/group.jade
@@ -1,8 +1,9 @@
-a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank', popover='Gems which your guild leader can use for challenge prizes.', popover-placement='left', popover-html='true')
+a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guildBankPop1'), popover=env.t('guildBankPop2'), popover-placement='left', popover-html='true')
   // <span class="task-action-btn tile flush bright add-gems-btn">＋</span>
   span.task-action-btn.tile.flush.neutral
     .Pet_Currency_Gem2x.Gems
-    | {{group.balance * 4 | number:0 }} Guild Gems
+    | {{group.balance * 4 | number:0 }}
+    =env.t('guildGems')
 .row-fluid
   .span4
 
@@ -10,18 +11,18 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
     // ------ Bosses -------
     .modal.inline-modal(bindonce='group', ng-if='group.type==="party" && group.quest.key')
       .modal-header
-        h3(ng-if='group.quest.active==false') Quest Invitation: {{Content.quests[group.quest.key].text}}
+        h3(ng-if='group.quest.active==false')=env.t('questInv') + '{{Content.quests[group.quest.key].text}}'
         h3(ng-if='group.quest.active==true') {{Content.quests[group.quest.key].text}}
       .modal-body
         div(ng-if='group.quest.active==false')
           table.table.table-striped
             tr(ng-repeat='member in group.members')
               td {{member.profile.name}}
-              td {{group.quest.members[member._id] === true ? 'Accepted' : group.quest.members[member._id] === false ? 'Rejected' : 'Pending'}}
+              td {{group.quest.members[member._id] === true ? =env.t('accepted') : group.quest.members[member._id] === false ? =env.t('rejected') : =env.t('pending')}}
           hr
           .npc_ian.pull-left
-          p Once all members have either accepted or rejected, the quest begins. Only those that clicked "accept" will be able to participate in the quest and recieve the drops. If members are pending too long (inactive?), you can start without them by clicking "Begin".
-          button.btn.btn-small.btn-warning(ng-if='!group.quest.leader || group.quest.leader==user._id', ng-click='party.$questAccept({"force":true})') Begin
+          p =env.t('queststart')
+          button.btn.btn-small.btn-warning(ng-if='!group.quest.leader || group.quest.leader==user._id', ng-click='party.$questAccept({"force":true})')=env.t('begin')
           //-TODO Cancel button
           //-TODO Both force-start & cancel should only be available to quest-initiator
 
@@ -35,14 +36,14 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
                 i.icon-heart
                 | {{group.quest.hp | number:0}} / {{Content.quests[group.quest.key].hp}}
             .hero-stats
-              .meter.health(title='Boss Health')
+              .meter.health(title=env.t('bossHP'))
                 .bar(style='width: {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp)}}%;')
                 span.meter-text
                   i.icon-heart
                   | {{group.quest.progress.hp | number:0}} / {{Content.quests[group.quest.key].boss.hp}}
 
           div(ng-if='Content.quests[group.quest.key].collect')
-            h4 Collected:
+            h4=env.t('collected') + ':'
             table.table.table-striped
               tr(ng-repeat='(k,v) in group.quest.progress.collect')
                 td
@@ -52,7 +53,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
 
           p {{Content.quests[group.quest.key].notes}}
           hr
-          h5 Participants
+          h5=env.t('participants')
           table.table.table-striped
             tr(ng-repeat='(k,v) in group.members', ng-show='group.quest.members[v._id]')
               td {{v.profile.name}}
@@ -60,39 +61,39 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
 
           div(ng-if='Content.quests[group.quest.key].boss')
             .npc_ian.pull-left
-            p To hurt a boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Wizard spells, Warrior attacks, etc). The boss will deal damage to the party for every Daily you've missed (multiplied by the boss's Strength), so help your friends by completing your dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>
+            p =env.t('bossDmg1') '<strong>' + =env.t('bossDmg2') + '</strong>'
             br
-            p Only participants will fight the boss and share in the quest loot. If you die during a boss-battle, you get booted from the battle. If everyone dies once, the quest fails.
+            p =env.t('bossDmg3')
 
           div(ng-if='Content.quests[group.quest.key].collect')
             .npc_ian.pull-left
-            p To collect items, do your positive tasks. Quest items drop just like normal items; however, you won't see the drops until the next day, then everything you've found will be tallied up and contributed to the pile.
+            p =env.t('bossColl1')
             br
-            p Only participants can collect items and share in the quest loot. If you die during a quest, you get booted from the quest. If everyone dies once, the quest fails.
+            p =env.t('bossColl2')
 
 
-          button.btn.btn-mini.btn-danger(ng-if='!group.quest.leader || group.quest.leader==user._id', ng-click='questAbort()') Abort
+          button.btn.btn-mini.btn-danger(ng-if='!group.quest.leader || group.quest.leader==user._id', ng-click='questAbort()')=env.t('abort')
 
     // ------ Information -------
     .modal.inline-modal
       .modal-header(bindonce='group')
         span(ng-if='group.leader == user.id')
-          button.btn.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing') Save
-          button.btn.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing') Edit Group
+          button.btn.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing')=env.t('save')
+          button.btn.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing')=env.t('editGroup')
         h3 {{group.name}}
       .modal-body
         div.whatever-options(ng-show='group._editing')
           .control-group.option-large
-            label.control-label Group Name
-            input.option-content(type='text', ng-model='group.name', placeholder='Group Name')
+            label.control-label =env.t('groupName')
+            input.option-content(type='text', ng-model='group.name', placeholder=env.t('groupName'))
           .control-group.option-large
-            label.control-label Description
-            textarea.option-content(style='height:15em;', placeholder='Description shown in public Guilds list (Markdown OK)', ng-model='group.description')
+            label.control-label =env.t('description')
+            textarea.option-content(style='height:15em;', placeholder=env.t('groupdescr'), ng-model='group.description')
           .control-group.option-large
-            label.control-label Logo URL
-            input.option-content(type='url', placeholder='Logo URL', ng-model='group.logo')
+            label.control-label =env.t('logoUrl')
+            input.option-content(type='url', placeholder=env.t('logoUrl'), ng-model='group.logo')
 
-          h4 Assign Group Leader
+          h4=env.t('assignLeader')
           select#group-leader-selection(ng-model='group._newLeader', ng-options='member.profile.name for member in group.members')
 
         div(ng-show='!group._editing')
@@ -106,10 +107,10 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
     // ------ Members -------
     .modal.inline-modal
       .modal-header
-        h3 Members
+        h3=env.t('members')
       .modal-body
         span
-          | Party Members list ordering
+          =env.t('partyList')
         select#partyOrder(
           style='width:140px',
           ng-model='user.party.order',
@@ -123,15 +124,15 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
               // allow leaders to ban members
               div(ng-show='group.leader == user.id && user.id!=member._id')
                 a(ng-click='removeMember(group, member, true)')
-                  i.icon-ban-circle(tooltip='Boot Member')
+                  i.icon-ban-circle(tooltip=env.t('banTip'))
               a
                 span(ng-class='{"badge badge-info": group.leader==member._id}', ng-click='clickMember(member._id, true)')
                   | {{member.profile.name}}
           tr(ng-if='group.memberCount > group.members.length')
             td.
-             <span class='badge'>{{group.memberCount - group.members.length}} more members</span>
+             <span class='badge'>{{group.memberCount - group.members.length}} =env.t('moremembers')</span>
 
-        h4(ng-show='group.invites.length > 0') Invited
+        h4 '(ng-show='group.invites.length > 0')' + =env.t('invited')
         table.table.table-striped
           tr(ng-repeat='invite in group.invites')
             td
@@ -146,16 +147,16 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
         form.form-inline(ng-submit='invite(group)')
           //.alert.alert-danger(ng-show='_groupError') {{_groupError}}
           .control-group.option-large
-            input.option-content(type='text', placeholder='User Id', ng-model='group.invitee')
-            input.btn(type='submit', value='Invite')
+            input.option-content(type='text', placeholder=env.t('userId'), ng-model='group.invitee')
+            input.btn(type='submit', value=env.t('invite'))
 
 
-    a.btn.btn-danger(data-id='{{group.id}}', ng-click='clickLeave(group, $event)') Leave
+    a.btn.btn-danger(data-id='{{group.id}}', ng-click='clickLeave(group, $event)')=env.t('leave')
 
   .span8
     div.blah-options(ng-show='group._editing')
       .option-large
-        textarea.option-content(style='height:15em;', placeholder='Message from group leader (Markdown OK)', ng-model='group.leaderMessage')
+        textarea.option-content(style='height:15em;', placeholder=env.t('leaderMsg'), ng-model='group.leaderMessage')
     table(ng-show='group.leaderMessage')
       tr
         td

From 9f56426472b30b9ff7d583e26b889f2fff0e8ff1 Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Wed, 22 Jan 2014 23:34:06 +0100
Subject: [PATCH 05/17] Update hall.jade

line 47!
---
 views/options/social/hall.jade | 48 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/views/options/social/hall.jade b/views/options/social/hall.jade
index 99ccbe5e60..cfee165578 100644
--- a/views/options/social/hall.jade
+++ b/views/options/social/hall.jade
@@ -2,10 +2,10 @@ script(type='text/ng-template', id='partials/options.social.hall.html')
   ul.nav.nav-tabs
     li(ng-class="{ active: $state.includes('options.social.hall.heroes') }")
       a(ui-sref='options.social.hall.heroes')
-        | Hall of Heroes
+        =env.t('hallHeroes')
     li(ng-class="{ active: $state.includes('options.social.hall.patrons') }")
       a(ui-sref='options.social.hall.patrons')
-        | Hall of Patrons
+        =env.t('hallPatrons')
 
   .tab-content
     .tab-pane.active
@@ -13,30 +13,30 @@ script(type='text/ng-template', id='partials/options.social.hall.html')
 
 script(type='text/ng-template', id='partials/options.social.hall.heroes.html')
   div.well(ng-if='user.contributor.admin')
-    h2 Reward User
+    h2=env.t('rewardUser')
     form.form-horizontal(ng-submit='loadHero(_heroID)')
       .-options
         .option-group.option-large
-          input.option-content(type='text', ng-model='_heroID', placeholder='UUID')
-          button.btn(type='submit') Load User
+          input.option-content(type='text', ng-model='_heroID', placeholder=env.t('UUID'))
+          button.btn(type='submit')=env.t('loadUser')
     form.form-horizontal(ng-show='hero', ng-submit='saveHero(hero)')
       h3 {{hero.profile.name}}
       .-options
         .control-group.option-large
-          input.option-content(type='text', ng-model='hero.contributor.text', placeholder='Contributor Title (eg, "Blacksmith")')
+          input.option-content(type='text', ng-model='hero.contributor.text', placeholder=env.t('conTitle'))
         .control-group.option-medium
           input.option-content(type='number', step="any", ng-model='hero.contributor.level')
-          span.input-suffix Contrib Level
+          span.input-suffix =env.t('conLevel')
           br
-          small [1-7] this determines which items, pets, and mounts are available. Also determines name-tag coloring.&nbsp;
-          a(target='_blank', href='https://trello.com/c/wkFzONhE/277-contributor-gear') More details.
+          small=env.t('conText')
+          a(target='_blank', href='https://trello.com/c/wkFzONhE/277-contributor-gear')=env.t('moreDetails')
         .control-group.option-large
-          textarea.option-content(style='height:15em;', placeholder='Contributions', ng-model='hero.contributor.contributions')
+          textarea.option-content(style='height:15em;', placeholder=env.t('contributions'), ng-model='hero.contributor.contributions')
           //-include ../../shared/formatting-help
         .control-group.option-medium
           label.checkbox
             input(type='checkbox', ng-model='hero.contributor.admin')
-            | Admin
+            =env.t('admin')
 
         hr
 
@@ -44,30 +44,30 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html')
           input.option-content(type='number', step="any", ng-model='hero.balance')
           span.input-suffix Balance
           p
-            small `user.balance` is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor levels. Contrib levels will automatically add 2G/lvl.
+            small `user.balance` + =env.t('USD1') + '<em>' + =env.t('not') + '</em>' =env.t('USD2')
 
         .control-group.option-medium
           label.checkbox
             input(type='checkbox', ng-model='hero.purchased.ads')
-            | Hide Ads
+            =env.t('hideads')
 
       // h4 Backer Status
       // Add backer stuff like tier, disable adds, etcs
-      button.btn-primary(type='submit') Save
+      button.btn-primary(type='submit')=env.t('save')
 
 
   table.table.table-striped
     tr
       thead
         tr
-          th Name
-          th(ng-if='user.contributor.admin') UUID
-          th Contrib Level
-          th Title
-          th Contributions
+          th =env.t('name')
+          th(ng-if='user.contributor.admin')=env.t('UUID')
+          th =env.t('conLevel')
+          th =env.t('title')
+          th =env.t('contributions')
     tr(ng-repeat='hero in heroes')
       td
-        span(ng-if='hero.contributor.admin',popover='Game Master',popover-trigger='mouseenter',popover-placement='right')
+        span(ng-if='hero.contributor.admin',popover=env.t('gamemaster'),popover-trigger='mouseenter',popover-placement='right')
           a.label(class='label-contributor-{{hero.contributor.level}}', ng-class='{"label-npc": hero.backer.npc}', ng-click='clickMember(hero._id, true)')
             | {{hero.profile.name}}&nbsp;
             i.icon-star.icon-white
@@ -84,11 +84,11 @@ script(type='text/ng-template', id='partials/options.social.hall.patrons.html')
     tr
       thead
         tr
-          th Name
-          th(ng-if='user.contributor.admin') UUID
-          th Backer Tier
+          th =env.t('name')
+          th(ng-if='user.contributor.admin')=env.t('UUID')
+          th =env.t('backertier')
     tr(ng-repeat='patron in patrons')
       td
         a.label(class='label-contributor-{{patron.contributor.level}}', ng-class='{"label-npc": patron.backer.npc}', ng-click='clickMember(patron._id, true)') {{patron.profile.name}}
       td(ng-if='user.contributor.admin') {{patron._id}}
-      td {{patron.backer.tier}}
\ No newline at end of file
+      td {{patron.backer.tier}}

From 13503986fb1ae1b4c6932cc57e89136cce6cb9fd Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Wed, 22 Jan 2014 23:43:58 +0100
Subject: [PATCH 06/17] Update index.jade

line 39
---
 views/options/social/index.jade | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/views/options/social/index.jade b/views/options/social/index.jade
index 4884c8a5fc..94f89a5912 100644
--- a/views/options/social/index.jade
+++ b/views/options/social/index.jade
@@ -14,37 +14,37 @@ script(type='text/ng-template', id='partials/options.social.party.html')
   div(ng-hide='group._id')
     div(ng-show='user.invitations.party.id')
       h2 You're Invited To {{user.invitations.party.name}}
-      a.btn.btn-success(data-type='party', ng-click='join(user.invitations.party)') Accept
-      a.btn.btn-danger(ng-click='reject()') Reject
+      a.btn.btn-success(data-type='party', ng-click='join(user.invitations.party)')=env.t('accept')
+      a.btn.btn-danger(ng-click='reject()')=env.t('reject')
     div(ng-hide='user.invitations.party.id')
-      h2 Create A Party
+      h2=env.t('createAParty')
       p
-        | You are not in a party. You can either create one and invite friends, or if you want to join an existing party, have them enter:
+        =env.t('noPartyText')
       pre.prettyprint.
         {{user.id}}
       include ./create-group
 
 script(type='text/ng-template', id='partials/options.social.guilds.public.html')
   div(ng-repeat='invitation in user.invitations.guilds')
-    h3 You're Invited To {{invitation.name}}
-    a.btn.btn-success(data-type='guild', ng-click='join(invitation)') Accept
-    a.btn.btn-danger(ng-click='reject(invitation)') Reject
+    h3=env.t('invitedTo') + '{{invitation.name}}'
+    a.btn.btn-success(data-type='guild', ng-click='join(invitation)')=env.t('accept')
+    a.btn.btn-danger(ng-click='reject(invitation)')=env.t('reject')
   // Public Groups
   .options-group.option-large.whatever-options
-    input.option-content(type='text',ng-model='guildSearch', placeholder='Search')
+    input.option-content(type='text',ng-model='guildSearch', placeholder=env.t('search'))
   table.table.table-striped
     tr(ng-repeat='group in groups.public | filter:guildSearch')
       td
         ul.pull-right.challenge-accordion-header-specs
-          li {{group.memberCount}} member(s)
+          li '{{group.memberCount}}' + =env.t('memberss')
           li
             // join / leave
             a.btn.btn-small.btn-danger(ng-show='group._isMember', ng-click='clickLeave(group, $event)')
               i.icon-ban-circle
-              | Leave
+              =env.t('leave')
             a.btn.btn-small.btn-success(ng-hide='group._isMember', ng-click='join(group)')
               i.icon-ok
-              | Join
+              =env.t('join')
         h4 {{group.name}}
         p {{group.description}}
 
@@ -58,13 +58,13 @@ script(type='text/ng-template', id='partials/options.social.guilds.html')
   ul.nav.nav-tabs
     li(ng-class="{ active: $state.includes('options.social.guilds.public') }")
       a(ui-sref='options.social.guilds.public')
-        | Public Guilds
+        =env.t('publicGuilds')
     li(ng-class="{ active: $stateParams.gid == group._id }", ng-repeat='group in groups.guilds')
       a(ui-sref="options.social.guilds.detail({gid:group._id})")
         | {{group.name}}
     li(ng-class="{ active: $state.includes('options.social.guilds.create') }")
       a(ui-sref='options.social.guilds.create')
-        | Create Guild
+        =env.t('createGuild')
 
   .tab-content
     .tab-pane.active
@@ -75,22 +75,22 @@ script(type='text/ng-template', id='partials/options.social.html')
     li(ng-class="{ active: $state.includes('options.social.tavern') }")
       a(ui-sref='options.social.tavern')
         i.icon-eye-close
-        | Tavern
+        =env.t('tavern')
     li(ng-class="{ active: $state.includes('options.social.party') }")
       a(ui-sref='options.social.party')
-        | Party
+        =env.t('party')
     li(ng-class="{ active: $state.includes('options.social.guilds') }")
       a(ui-sref='options.social.guilds')
-        | Guilds
+        =env.t('guilds')
     li(ng-class="{ active: $state.includes('options.social.challenges') }")
       a(ui-sref='options.social.challenges')
         i.icon-bullhorn
-        | Challenges
+        =env.t('challenges')
     li(ng-class="{ active: $state.includes('options.social.hall') }")
       a(ui-sref='options.social.hall')
         i.icon-flag
-        | Hall
+        =env.t('hall')
 
   .tab-content
     .tab-pane.active
-      div(ui-view)
\ No newline at end of file
+      div(ui-view)

From 0fb8ec9a8beec2428386b85d101c15dcca6394e0 Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Thu, 23 Jan 2014 00:04:17 +0100
Subject: [PATCH 07/17] Update tavern.jade

line 68 and following after confirmation
---
 views/options/social/tavern.jade | 44 ++++++++++++++++----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade
index 3a184fe441..8ed708ddb7 100644
--- a/views/options/social/tavern.jade
+++ b/views/options/social/tavern.jade
@@ -9,60 +9,60 @@
             .popover.static-popover.fade.right.in
               .arrow
               h3.popover-title
-                a(target='_blank', href='http://www.kickstarter.com/profile/2014640723') Daniel
+                a(target='_blank', href='http://www.kickstarter.com/profile/2014640723')=env.t('daniel')
               .popover-content
-                | Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (going on vacation? sudden illness?), I'll set you up at the inn - Dailies won't hurt you while you're resting.
+                =env.t('danielText')
                 div
                   button.btn.btn-large.btn-success(ng-class='{active: user.preferences.sleep}', ng-click='User.user.ops.sleep({})')
-                    span(ng-show='user.preferences.sleep') Check Out of Inn
-                    span(ng-hide='user.preferences.sleep') Rest in the Inn
+                    span(ng-show='user.preferences.sleep')=env.t('innCheckOut')
+                    span(ng-hide='user.preferences.sleep')=env.t('innCheckIn')
     .alert.alert-info(ng-show='user.preferences.sleep')
-      | Whilst resting, your dailies are saved and aren't affected by day turn-over. Whether you check out tomorrow or in a week's time, you'll continue in the same state as when you checked in. Beware, though: if you are in a Quest, Bosses will still punish you for your fellow party members' mistakes!
+      =env.t('innText')
 
     // Resources
     .modal(style='position: relative;top: auto;left: auto;right: auto;margin: 0 auto 20px;z-index: 1;max-width: 100%;')
       .modal-header
-        h3 Resources
+        h3=env.t('ressources')
       .modal-body
         table.table.table-striped
           tr
             td
-              a(target='_blank', href='http://habitrpg.wikia.com/wiki/Board:Looking_for_a_Group_(LFG)') Looking for Group (Party Wanted) Posts
+              a(target='_blank', href='http://habitrpg.wikia.com/wiki/Board:Looking_for_a_Group_(LFG)')=env.t('lfgPosts')
           tr
             td
-              a(target='_blank', href='https://vimeo.com/57654086') Tutorial
+              a(target='_blank', href='https://vimeo.com/57654086')=env.t('tutorial')
           tr
             td
-              a(target='_blank', href='http://habitrpg.wikia.com/wiki/FAQ') FAQ
+              a(target='_blank', href='http://habitrpg.wikia.com/wiki/FAQ')=env.t('FAQ')
           tr
             td
-              a(target='_blank', href='http://habitrpg.wikia.com/wiki/Glossary') Glossary
+              a(target='_blank', href='http://habitrpg.wikia.com/wiki/Glossary')=env.t('glossary')
           tr
             td
-              a(target='_blank', href='https://github.com/HabitRPG/habitrpg/issues') Report a Problem
+              a(target='_blank', href='https://github.com/HabitRPG/habitrpg/issues')=env.t('reportAP')
           tr
             td
-              a(target='_blank', href='https://trello.com/c/8gzGlle8') Request a Feature
+              a(target='_blank', href='https://trello.com/c/8gzGlle8')=env.t('requestAF')
           tr
             td
-              a(target='_blank', href='http://habitrpg.wikia.com/wiki/Special:Forum') Community Forum
+              a(target='_blank', href='http://habitrpg.wikia.com/wiki/Special:Forum')=env.t('community')
 
     // Player Tiers
-    .modal(style='position: relative;top: auto;left: auto;right: auto;margin: 0 auto 20px;z-index: 1;max-width: 100%;', popover="Click tier labels for details.", popover-trigger="mouseenter", popover-placement="right")
+    .modal(style='position: relative;top: auto;left: auto;right: auto;margin: 0 auto 20px;z-index: 1;max-width: 100%;', popover=env.t('tierPop'), popover-trigger="mouseenter", popover-placement="right")
       .modal-header
-        h3 Player Tiers
+        h3=env.t('playerTiers')
       .modal-body
         small.
-          <a href='/#/options/groups/hall'>Visit the Hall of Heroes (contributors and backers)</a> <br />
-          <a href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank'>Learn more about contributor rewards</a> <br />
-          <a href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG' target='_blank'>Learn how to contribute to HabitRPG</a>
+          <a href='/#/options/groups/hall'>=env.t('visitHeroes')</a> <br />
+          <a href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank'>=env.t('conLearn')</a> <br />
+          <a href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG' target='_blank'>=env.t('conLearnHow')</a>
         table.table.table-striped
           tr
             td
-              a.label.label-contributor-1(ng-click='toggleUserTier($event)') Friend (1-2)
+              a.label.label-contributor-1(ng-click='toggleUserTier($event)')=env.t('friend1')
               div(style='display:none;')
                 p.
-                  <span class='achievement achievement-firefox'></span> When your <strong>first</strong> submission is deployed, you will receive the HabitRPG Contributor's badge. Your name in Tavern chat will proudly display that you are a contributor. As a bounty for your work, you will also receive <strong>2 Gems</strong>.
+                  <span class='achievement achievement-firefox'></span> =env.t('friendtext1') + '<strong>' + =env.t('friend1text1') + '</strong> =env.t('friends1text2') + '<strong>' + =env.t('2gems') + '</strong>'.
                 hr
                 p.
                   <span class='shop_armor_special_1 shop-sprite item-img'></span> When your <strong>second</strong> submission is deployed, the <strong>Crystal Armor</strong> will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive <strong>2 Gems</strong>.
@@ -105,12 +105,12 @@
     include ./challenge-box
 
   .span8(ng-controller='ChatCtrl')
-    h3 Tavern Talk
+    h3=env.t('taverntalk')
         include ./chat-box
         small(style='position: relative; top: -20px; left: 25px;')
             include ../../shared/formatting-help
         small(style='position: relative; top: 18px; left: 0px')
             alert.alert-info.
-                Note: if you're reporting a bug, the developers won't see it here. Please <a href='https://github.com/HabitRPG/habitrpg/issues' target='_blank'>use Github instead</a>.
+                =env.t('tavernalert1')+ '<a href='https://github.com/HabitRPG/habitrpg/issues' target='_blank'>' =env.t('tavernalert2') + '</a>'.
     ul.unstyled.tavern-chat
       include ./chat-message

From c4a230d73c6a8a31082eac2884b9c323cf73962f Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Thu, 23 Jan 2014 00:19:42 +0100
Subject: [PATCH 08/17] Update avatar.jade

---
 views/shared/header/avatar.jade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade
index eb90fa239a..1478ff550e 100644
--- a/views/shared/header/avatar.jade
+++ b/views/shared/header/avatar.jade
@@ -45,5 +45,6 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember(
     span.current-pet(class='Pet-{{profile.items.currentPet}}', ng-show='profile.items.currentPet && !minimal')
   .avatar-level(ng-class='userLevelStyle(profile,"label")')
     i.icon-circle-arrow-up.icon-white(ng-show='profile.stats.buffs.str || profile.stats.buffs.per || profile.stats.buffs.con || profile.stats.buffs.int || profile.stats.buffs.stealth', tooltip='Buffed', style='margin-right:5px;')
-    | Lvl {{profile.stats.lvl}}
+    =env.t('lvl') 
+    | {{profile.stats.lvl}}
     i.icon-plus-sign.icon-white(ng-show='profile.achievements.rebirths', tooltip='Reborn, max level {{profile.achievements.rebirthLevel}}', style='margin-left:5px')

From 077e23519c2435e9756d9b4133956f18c30dcf4e Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Thu, 23 Jan 2014 00:24:15 +0100
Subject: [PATCH 09/17] Update avatar.jade

---
 views/shared/header/avatar.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade
index 1478ff550e..0c11e8f0c2 100644
--- a/views/shared/header/avatar.jade
+++ b/views/shared/header/avatar.jade
@@ -44,7 +44,7 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember(
     // FIXME handle @minimal, this might have to be a directive
     span.current-pet(class='Pet-{{profile.items.currentPet}}', ng-show='profile.items.currentPet && !minimal')
   .avatar-level(ng-class='userLevelStyle(profile,"label")')
-    i.icon-circle-arrow-up.icon-white(ng-show='profile.stats.buffs.str || profile.stats.buffs.per || profile.stats.buffs.con || profile.stats.buffs.int || profile.stats.buffs.stealth', tooltip='Buffed', style='margin-right:5px;')
+    i.icon-circle-arrow-up.icon-white(ng-show='profile.stats.buffs.str || profile.stats.buffs.per || profile.stats.buffs.con || profile.stats.buffs.int || profile.stats.buffs.stealth', tooltip=env.t('buffed'), style='margin-right:5px;')
     =env.t('lvl') 
     | {{profile.stats.lvl}}
-    i.icon-plus-sign.icon-white(ng-show='profile.achievements.rebirths', tooltip='Reborn, max level {{profile.achievements.rebirthLevel}}', style='margin-left:5px')
+    i.icon-plus-sign.icon-white(ng-show='profile.achievements.rebirths', tooltip=env.t('reborn') + '{{profile.achievements.rebirthLevel}}', style='margin-left:5px')

From 2282e36bac74d54d2a9ab82458a407519d1eb51a Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Thu, 23 Jan 2014 09:31:33 +0100
Subject: [PATCH 10/17] Update challenges.jade

---
 views/options/social/challenges.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/options/social/challenges.jade b/views/options/social/challenges.jade
index c59db7b5b1..179c371d2e 100644
--- a/views/options/social/challenges.jade
+++ b/views/options/social/challenges.jade
@@ -85,8 +85,8 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
       .create-challenge-from.well(ng-if='newChallenge')
         form(ng-submit='save(newChallenge)')
           div
-            input.btn.btn-success(type='submit', value='Save')
-            input.btn.btn-danger(type='button', ng-click='discard()', value='Discard')
+            input.btn.btn-success(type='submit', value=env.t('save'))
+            input.btn.btn-danger(type='button', ng-click='discard()', value=env.t('discard'))
             select(ng-model='newChallenge.group', ng-required='required', name='Group', ng-options='g._id as g.name for g in groups')
           .challenge-options
             input.option-content(type='text', ng-model='newChallenge.name', placeholder=env.t('ChallengeTitle'), required='required')

From 34fe364fea10d89d9be9c0f2521f637e3f268e09 Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Thu, 23 Jan 2014 09:33:41 +0100
Subject: [PATCH 11/17] Update chat-box.jade

---
 views/options/social/chat-box.jade | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/options/social/chat-box.jade b/views/options/social/chat-box.jade
index aeaf95c742..e2abc37737 100644
--- a/views/options/social/chat-box.jade
+++ b/views/options/social/chat-box.jade
@@ -10,7 +10,7 @@ form.chat-form(ng-submit='postChat(group,message.content)')
     table.pull-right
       tr
         td
-          input.btn.chat-btn(type='submit', value='Send Chat', ng-class='{disabled: _sending == true}')
+          input.btn.chat-btn(type='submit', value=env.t('sendChat'), ng-class='{disabled: _sending == true}')
         td
-          button.btn(type="button", ng-click='sync(group)', tooltip='Fetch Recent Messages')
-            i(class='pull-right icon-refresh')
\ No newline at end of file
+          button.btn(type="button", ng-click='sync(group)', tooltip=env.t('toolTipMsg'))
+            i(class='pull-right icon-refresh')

From 6fb88ee1b51647279c4c3172a1b07cf5da71ca15 Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Thu, 23 Jan 2014 09:35:18 +0100
Subject: [PATCH 12/17] Update chat-message.jade

---
 views/options/social/chat-message.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/options/social/chat-message.jade b/views/options/social/chat-message.jade
index 8bc40630c3..6aab142028 100644
--- a/views/options/social/chat-message.jade
+++ b/views/options/social/chat-message.jade
@@ -9,6 +9,6 @@ li.chat-message(bindonce='group.chat', ng-repeat='message in group.chat', bo-cla
       a.label(ng-show='countExists(message.likes)',ng-class='{"label-success":message.likes[user._id]}',ng-click='likeChatMessage(group,message)') +{{countExists(message.likes)}}
       a.chat-plus-one.muted(ng-show='!countExists(message.likes)',ng-click='likeChatMessage(group,message)',style='background-color:#eee;padding:3px 3px 0px 3px') +1
     a(bo-show='user.contributor.admin || message.uuid == user.id', ng-click='deleteChatMessage(group, message)',style='padding: 0px 3px')
-      i.icon-trash(tooltip='Delete')
+      i.icon-trash(tooltip=env.t('delete'))
   a.label.chat-message(bo-show='message.user', class='float-label', bo-class='{"label-npc": message.backer.npc, "label-contributor-{{message.contributor.level}}":message.contributor.level}', ng-click='clickMember(message.uuid, true)')
-      span(tooltip='{{contribText(message.contributor, message.backer)}}') {{message.user}}&nbsp;
\ No newline at end of file
+      span(tooltip='{{contribText(message.contributor, message.backer)}}') {{message.user}}&nbsp;

From ed180692e3fb9862667a44797a135097a4930d65 Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Thu, 23 Jan 2014 09:36:32 +0100
Subject: [PATCH 13/17] Update create-group.jade

---
 views/options/social/create-group.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/options/social/create-group.jade b/views/options/social/create-group.jade
index be8541558c..1238b4c9c7 100644
--- a/views/options/social/create-group.jade
+++ b/views/options/social/create-group.jade
@@ -19,7 +19,7 @@ form.form-horizontal(ng-submit='create(newGroup)')
         input.btn(type='submit', ng-disabled='!newGroup.privacy && !newGroup.name', value=env.t('create'))
         span.gem-cost '4' + =env.t('gems')
         p
-          small=env.t('gemcost')
+          small=env.t('gemCost')
     .control-group(ng-show='type=="party"')
       .controls
         input.btn(type='submit', value=env.t('create'))

From ab8421983515178d9a3d8740ddf04ae8adac8453 Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Thu, 23 Jan 2014 09:40:31 +0100
Subject: [PATCH 14/17] Update group.jade

---
 views/options/social/group.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/options/social/group.jade b/views/options/social/group.jade
index 2ad5290ac9..a3101f52ab 100644
--- a/views/options/social/group.jade
+++ b/views/options/social/group.jade
@@ -21,7 +21,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild
               td {{group.quest.members[member._id] === true ? =env.t('accepted') : group.quest.members[member._id] === false ? =env.t('rejected') : =env.t('pending')}}
           hr
           .npc_ian.pull-left
-          p =env.t('queststart')
+          p =env.t('questStart')
           button.btn.btn-small.btn-warning(ng-if='!group.quest.leader || group.quest.leader==user._id', ng-click='party.$questAccept({"force":true})')=env.t('begin')
           //-TODO Cancel button
           //-TODO Both force-start & cancel should only be available to quest-initiator

From 50f992b63cbf7dc2b3fec008e03bec6e84d683c6 Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Thu, 23 Jan 2014 09:43:17 +0100
Subject: [PATCH 15/17] Update hall.jade

---
 views/options/social/hall.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/options/social/hall.jade b/views/options/social/hall.jade
index cfee165578..b69ced299c 100644
--- a/views/options/social/hall.jade
+++ b/views/options/social/hall.jade
@@ -49,7 +49,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html')
         .control-group.option-medium
           label.checkbox
             input(type='checkbox', ng-model='hero.purchased.ads')
-            =env.t('hideads')
+            =env.t('hideAds')
 
       // h4 Backer Status
       // Add backer stuff like tier, disable adds, etcs
@@ -86,7 +86,7 @@ script(type='text/ng-template', id='partials/options.social.hall.patrons.html')
         tr
           th =env.t('name')
           th(ng-if='user.contributor.admin')=env.t('UUID')
-          th =env.t('backertier')
+          th =env.t('backerTier')
     tr(ng-repeat='patron in patrons')
       td
         a.label(class='label-contributor-{{patron.contributor.level}}', ng-class='{"label-npc": patron.backer.npc}', ng-click='clickMember(patron._id, true)') {{patron.profile.name}}

From 669789df67f890b02b6008f58468c056df434865 Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Thu, 23 Jan 2014 09:45:34 +0100
Subject: [PATCH 16/17] Update index.jade

---
 views/options/social/index.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/options/social/index.jade b/views/options/social/index.jade
index 94f89a5912..a3e26f93a7 100644
--- a/views/options/social/index.jade
+++ b/views/options/social/index.jade
@@ -13,7 +13,7 @@ script(type='text/ng-template', id='partials/options.social.party.html')
     include ./group
   div(ng-hide='group._id')
     div(ng-show='user.invitations.party.id')
-      h2 You're Invited To {{user.invitations.party.name}}
+      h2=env.t('invitedTo') + '{{user.invitations.party.name}}'
       a.btn.btn-success(data-type='party', ng-click='join(user.invitations.party)')=env.t('accept')
       a.btn.btn-danger(ng-click='reject()')=env.t('reject')
     div(ng-hide='user.invitations.party.id')

From 6f3229c679c64820be6c6fdbbb43e27321d96ee0 Mon Sep 17 00:00:00 2001
From: Luveluen <Luveluen@gmx.de>
Date: Thu, 23 Jan 2014 10:16:32 +0100
Subject: [PATCH 17/17] Update tavern.jade

---
 views/options/social/tavern.jade | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade
index 8ed708ddb7..8ed7d92158 100644
--- a/views/options/social/tavern.jade
+++ b/views/options/social/tavern.jade
@@ -59,48 +59,48 @@
         table.table.table-striped
           tr
             td
-              a.label.label-contributor-1(ng-click='toggleUserTier($event)')=env.t('friend1')
+              a.label.label-contributor-1(ng-click='toggleUserTier($event)')=env.t('friendBadge')
               div(style='display:none;')
                 p.
-                  <span class='achievement achievement-firefox'></span> =env.t('friendtext1') + '<strong>' + =env.t('friend1text1') + '</strong> =env.t('friends1text2') + '<strong>' + =env.t('2gems') + '</strong>'.
+                  <span class='achievement achievement-firefox'></span> =env.t('friendText') + '<strong>' + =env.t('first') + '</strong> =env.t('friends1Text') + '<strong>' + =env.t('2gems') + '</strong>' + '.'
                 hr
                 p.
-                  <span class='shop_armor_special_1 shop-sprite item-img'></span> When your <strong>second</strong> submission is deployed, the <strong>Crystal Armor</strong> will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive <strong>2 Gems</strong>.
+                  <span class='shop_armor_special_1 shop-sprite item-img'></span> =env.t('friendText') + '<strong>' + =env.t('second') + '</strong>' + =env.t('friendsText2') + '<strong>' + =env.t('crystalArmor') + '</strong>' + =env.t('friendText3') + '<strong>' + =env.t('2gems') + '</strong>' + '.'
           tr
             td
-              a.label.label-contributor-3(ng-click='toggleUserTier($event)') Elite (3-4)
+              a.label.label-contributor-3(ng-click='toggleUserTier($event)')=env.t('eliteBadge')
               div(style='display:none;')
                 p.
-                 <span class='shop_head_special_1 shop-sprite item-img'></span> When your <strong>third</strong> submission is deployed, the <strong>Crystal Helmet</strong> will be available for purchase in the Rewards shop. As a bounty for your great work, you will also receive <strong>2 Gems</strong>.
+                 <span class='shop_head_special_1 shop-sprite item-img'></span> =env.t('friendText') + '<strong>' + =env.t('third') + '</strong>' =env.t('friendText2') + '<strong>' + =env.t('crystalHelmet') + '</strong>' + =env.t('friendText3') + '<strong>' + =env.t('2gems') + '</strong>' + '.'
                 hr
                 p.
-                  <span class='shop_weapon_special_1 shop-sprite item-img'></span> When your <strong>fourth</strong> submission is deployed, the <strong>Crystal Sword</strong> will be available for purchase in the Rewards shop. You will once again receive a bounty of <strong>2 Gems</strong>.
+                  <span class='shop_weapon_special_1 shop-sprite item-img'></span> =env.t('friendText') + '<strong>' + =env.t('fourth') + '</strong>' + =env.t('friendText2') + '<strong>' + env.t('crystalSword') + '</strong>' + =env.t('friendText3') + '<strong>' + =env.t('2gems') + '</strong>' + '.'
 
           tr
             td
-              a.label.label-contributor-5(ng-click='toggleUserTier($event)') Champion (5-6)
+              a.label.label-contributor-5(ng-click='toggleUserTier($event)')=env.t('championBadge')
               div(style='display:none;')
                 p.
-                  <span class='shop_shield_special_1 shop-sprite item-img'></span> When your <em>fifth</em> submission is deployed, the <strong>Crystal Shield</strong> will be available for purchase in the Rewards shop. You will also receive <strong>2 Gems</strong>.
+                  <span class='shop_shield_special_1 shop-sprite item-img'></span> =env.t('friendText') + '<em>' + env.t('fifth') + '</em>' + =env.t('friendText2') + '<strong>' + =env.t('crystalShield') + '</strong>' + =env.t('friendText3') + '<strong>' + =env.t('2gems') + '</strong>' + '.'
                 hr
                 p.
-                 <div class='Pet-Dragon-Hydra pull-left'></div> When your <em>sixth</em> submission is deployed, you will receive a <strong>Hydra Pet</strong>. You will also receive <strong>2 Gems</strong>.
+                 <div class='Pet-Dragon-Hydra pull-left'></div> =env.t('friendText') + '<em>' + =env.t('sixth') + '</em>' + =env.t('friendText2b') + '<strong>' + =env.t('hydraPet') + '</strong>' + =env.t('friendText3b') + '<strong>' + =env.t('2gems') + '</strong>' + '.'
           tr
             td
-              a.label.label-contributor-7(ng-click='toggleUserTier($event)') Legendary (7)
+              a.label.label-contributor-7(ng-click='toggleUserTier($event)')=env.t('legendaryBadge')
               div(style='display:none;')
                 p.
-                  When your <em>seventh</em> submission is deployed, you will receive <strong>2 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your level, but you may continue to earn Gem bounties and titles.
+                  =env.t('friendText') + '<em>' + =env.t('seventh') + '</em>' + =env.t('friendText2c') + '<strong>' + =env.t('2gems') + '</strong>' + =env.t('friendsText3c')
           tr
             td
-              a.label.label-contributor-8(ng-click='toggleUserTier($event)') Heroic
+              a.label.label-contributor-8(ng-click='toggleUserTier($event)')=env.t('heroicBadge')
               div(style='display:none;')
-                p The Heroic level contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).
+                p=env.t('heroicText') 
           tr
             td
-              a.label.label-npc(ng-click='toggleUserTier($event)') NPC
+              a.label.label-npc(ng-click='toggleUserTier($event)')=env.t('npcBadge')
               div(style='display:none;')
-                p NPCs backed HabitRPG's Kickstarter at the highest tier. You can find their avatars watching over site features!
+                p=env.t('npcText')
 
     include ./challenge-box