From 7efb5948382fe792e7d753b155be64c6c7b72322 Mon Sep 17 00:00:00 2001 From: Sphinx Date: Sat, 1 Mar 2014 20:07:05 +0500 Subject: [PATCH] Pulling in commits from shared repo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Additional changes to other languages are required before merging! https://trello.com/c/SvTsLdRF/12-translations "0leg It would be great if we could have "%number_of% Participants" instead of just "Participants" in the source language so that we could translate it as "участников: %number_of%" which is the only correct way to translate it into Russian without grammatical mistakes. (This example is from Challenges tab.)" Conflicts: locales/en/challenge.json --- common/locales/en/challenge.json | 2 +- common/locales/en/generic.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/locales/en/challenge.json b/common/locales/en/challenge.json index 28746de0e5..c0b5543caf 100644 --- a/common/locales/en/challenge.json +++ b/common/locales/en/challenge.json @@ -37,7 +37,7 @@ "publicChallenges": "Minimum 1 Gem for public challenges (helps prevent spam, it really does).", "officialChallenge": "Official HabitRPG Challenge", "by": "by", - "participants": "Participants", + "participants": "<%= membercount %> Participants", "join": "Join", "exportChallengeCSV": "Export to CSV", "selectGroup": "Please select group", diff --git a/common/locales/en/generic.json b/common/locales/en/generic.json index f8c90ebd3d..a20c4636dc 100644 --- a/common/locales/en/generic.json +++ b/common/locales/en/generic.json @@ -41,6 +41,7 @@ "gemButton": "You have <%= number %> Gems.", "moreInfo": "More Info", "gemsWhatFor": "Purchased using real money. Used for buying special items and services (eggs, hatching potions, Fortify, etc.). You'll need to unlock those features before being able to use Gems.", + "gemsPopTitle": "Gems", "veteran": "Veteran", "veteranText": "Has weathered Habit The Grey (our pre Angular website), and has gained many battle-scars from its bugs.", "originalUser": "Original User!",