18n(merge): merge @Sinza- pr, @lefnire now it is ready

views/shared/header/avatar.jade

@@ -47,4 +47,4 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember(
     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=env.t('reborn') + '{{profile.achievements.rebirthLevel}}', style='margin-left:5px')
+    i.icon-plus-sign.icon-white(ng-show='profile.achievements.rebirths', tooltip=env.t('reborn', {reLevel: "{{profile.achievements.rebirthLevel}}"}), style='margin-left:5px')

views/shared/modals/achievements.jade

@@ -36,11 +36,8 @@ div(modal='user.flags.contributor')
   .modal-body
     .npc_justin.float-left
     p
-      | {{user.profile.name}},
-      =env.t('contribText1')
-      | {{user.contributor.level}}
-      =env.t('contribText2')
-      a(href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribText3')
+      !=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"})
+      a(href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink')
   .modal-footer
     button.btn.btn-default.cancel(ng-click='set({"flags.contributor":false})')=env.t('ok')
 
@@ -50,10 +47,6 @@ div(modal='modals.achievements.rebirth')
     h3=env.t('modalAchievement')
   .modal-body
     .achievement.achievement-sun
-    =env.t('rebirthAchievement1')
-    | {{user.achievements.rebirths}}
-    =env.t('rebirthAchievement2')
-    | {{user.achievements.rebirthLevel}}.
-    =env.t('rebirthAchievement3')
+    =env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"})
   .modal-footer
     button.btn.btn-default.cancel(ng-click='modals.achievements.rebirth = false')=env.t('ok')

views/shared/modals/settings.jade

@@ -1,7 +1,7 @@
 div(ng-controller='SettingsCtrl')
   div(modal='modals.reset')
     .modal-header
-      h3=env.t('resetaccount')
+      h3=env.t('resetAccount')
     .modal-body
       p=env.t('resetText1')
       p=env.t('resetText2')
@@ -64,11 +64,9 @@ div(ng-controller='SettingsCtrl')
 
   div(modal='modals.delete')
     .modal-header
-      h3=env.t('deleteaccount')
+      h3=env.t('deleteAccount')
     .modal-body
-      p=env.t('deleteText1')
-        strong=env.t('deleteText2')
-        =env.t('deleteText3')
+      p!=env.t('deleteText')
       p
         input(type='text', ng-model='_deleteAccount')
     .modal-footer

views/shared/tasks/task.jade

@@ -93,9 +93,7 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s
             a(ng-click='unlink(task, "remove-all")')=env.t('removeThem')
         div(ng-if='task.challenge.broken=="CHALLENGE_CLOSED"')
           p
-            =env.t('challengeCompleted1')
-            span.badge {{task.challenge.winner}}
-            =env.t('challengeCompleted2')
+            !=env.t('challengeCompleted', {user: "{{task.challenge.winner}}"})
           p
             a(ng-click='unlink(task, "keep-all")')=env.t('keepThem')
             |  |