Merge pull request #2583 from Sinza-/split-main-json

Split main.json

views/options/social/group.jade

@@ -2,7 +2,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild
   // <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 }}
+    | {{group.balance * 4 | number:0 }} 
     =env.t('guildGems')
 .row-fluid
   .span4

views/options/social/hall.jade

@@ -23,12 +23,12 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html')
       h3 {{hero.profile.name}}
       .-options
         .control-group.option-large
-          input.option-content(type='text', ng-model='hero.contributor.text', placeholder=env.t('conTitle'))
+          input.option-content(type='text', ng-model='hero.contributor.text', placeholder=env.t('contribTitle'))
         .control-group.option-medium
           input.option-content(type='number', step="any", ng-model='hero.contributor.level')
-          span.input-suffix=env.t('conLevel')
+          span.input-suffix=env.t('contribLevel')
           br
-          small=env.t('conText')
+          small=env.t('contribHallText')
           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=env.t('contributions'), ng-model='hero.contributor.contributions')
@@ -62,7 +62,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html')
         tr
           th=env.t('name')
           th(ng-if='user.contributor.admin')=env.t('UUID')
-          th=env.t('conLevel')
+          th=env.t('contribLevel')
           th=env.t('title')
           th=env.t('contributions')
     tr(ng-repeat='hero in heroes')

views/options/social/tavern.jade

@@ -104,7 +104,7 @@
                 p=env.t('heroicText') 
           tr
             td
-              a.label.label-npc(ng-click='toggleUserTier($event)')=env.t('npcBadge')
+              a.label.label-npc(ng-click='toggleUserTier($event)')=env.t('npc')
               div(style='display:none;')
                 p=env.t('npcText')
 

views/shared/footer.jade

@@ -23,7 +23,7 @@ footer.footer(ng-controller='FooterCtrl')
           li
             a(href='/static/extensions')=env.t('companyExtensions')
           li
-            a(target='_blank', href='http://habitrpg.wikia.com/wiki/FAQ')=env.t('companyFAQ')
+            a(target='_blank', href='http://habitrpg.wikia.com/wiki/FAQ')=env.t('FAQ')
           li
             a(href='/static/privacy')=env.t('companyPrivacy')
           li
@@ -36,7 +36,7 @@ footer.footer(ng-controller='FooterCtrl')
           li
             a(target='_blank', href='https://trello.com/c/8gzGlle8')=env.t('communityFeature')
           li
-            a(target='_blank', href='https://github.com/lefnire/habitrpg/wiki/API')=env.t('communityAPI')
+            a(target='_blank', href='https://github.com/lefnire/habitrpg/wiki/API')=env.t('API')
           li
             a(href='/static/extensions')=env.t('communityExtensions')
           li