Merge branch 'develop' into TheHollidayInn-tasks-add-multiple-maintain-order

.gitignore

@@ -24,5 +24,6 @@ test/*.map
 website/public/docs
 *.sublime-workspace
 coverage.html
+common/dist/scripts/habitrpg-shared.js
 
 test/spec/translations.js

.travis.yml

@@ -10,3 +10,4 @@ before_script:
   - 'npm install -g grunt-cli mocha'
   - cp config.json.example config.json
   - "until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done"
+  - "export DISPLAY=:99"

common/dist/sprites/spritesmith4.css

@@ -1,6 +1,6 @@
 .shop_head_healer_3 {
   background-image: url(spritesmith4.png);
-  background-position: -492px -1786px;
+  background-position: -451px -1786px;
   width: 40px;
   height: 40px;
 }
@@ -54,25 +54,25 @@
 }
 .shop_head_special_1 {
   background-image: url(spritesmith4.png);
-  background-position: -1107px -1745px;
+  background-position: -1066px -1745px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_2 {
   background-image: url(spritesmith4.png);
-  background-position: -1148px -1745px;
+  background-position: -1107px -1745px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_1 {
   background-image: url(spritesmith4.png);
-  background-position: -1189px -1745px;
+  background-position: -1148px -1745px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_2 {
   background-image: url(spritesmith4.png);
-  background-position: -451px -1786px;
+  background-position: -1189px -1745px;
   width: 40px;
   height: 40px;
 }
@@ -750,7 +750,7 @@
 }
 .Pet_Currency_Gem {
   background-image: url(spritesmith4.png);
-  background-position: -533px -1786px;
+  background-position: -492px -1786px;
   width: 45px;
   height: 39px;
 }
@@ -1620,7 +1620,7 @@
 }
 .shop_gold {
   background-image: url(spritesmith4.png);
-  background-position: -1856px -390px;
+  background-position: -1856px -445px;
   width: 32px;
   height: 22px;
 }
@@ -1644,25 +1644,25 @@
 }
 .shop_shinySeed {
   background-image: url(spritesmith4.png);
-  background-position: -1066px -1745px;
-  width: 40px;
-  height: 40px;
+  background-position: -1856px -280px;
+  width: 32px;
+  height: 32px;
 }
 .shop_silver {
   background-image: url(spritesmith4.png);
-  background-position: -1856px -413px;
+  background-position: -1856px -468px;
   width: 32px;
   height: 22px;
 }
 .shop_snowball {
   background-image: url(spritesmith4.png);
-  background-position: -1856px -335px;
+  background-position: -1856px -390px;
   width: 32px;
   height: 32px;
 }
 .shop_spookDust {
   background-image: url(spritesmith4.png);
-  background-position: -1856px -280px;
+  background-position: -1856px -335px;
   width: 32px;
   height: 32px;
 }

common/locales/cs/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Mozaikové sklo",
     "backgroundStainedGlassNotes": "Obdivuj krásné mozaikové sklo.",
     "backgroundRollingHillsText": "Kopce",
-    "backgroundRollingHillsNotes": "Potloukej se v kopcích."
+    "backgroundRollingHillsNotes": "Potloukej se v kopcích.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/cs/groups.json

@@ -95,6 +95,6 @@
     "abuseFlagModalButton": "Nahlásit",
     "abuseReported": "Děkujeme za nahlášení tohoto příspěvku. Moderátoři byli upozorněni.",
     "abuseAlreadyReported": "Již jsi tento příspěvek nahlásil.",
-    "needsText": "Please type a message.",
-    "needsTextPlaceholder": "Type your message here."
+    "needsText": "Prosím, napiš zprávu.",
+    "needsTextPlaceholder": "Napiš svou zprávu sem."
 }

common/locales/cs/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Pozván na Výpravu",
     "kickedGroup": "Vykopnut z družiny",
     "remindersToLogin": "Upomínky k přihlášení do HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Zaškrtni, aby ses odhlásil z emailů",
     "unsubscribeAllEmailsText": "Zaškrtnutím toho políčka potvrzuji, že rozumím tomu, že kvůli odhlášení se z emailů mě nebude HabitRPG moci nikdy kontaktovat emailem o důležitých změnách na stránce nebo v mém účtu.",
     "correctlyUnsubscribedEmailType": "Správně odhlášen z \"<%= email Type %>\" emailů.",

common/locales/cs/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Aktivní",
     "complete": "Splněno",
     "dated": "Datovaný",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Zbývající",
     "grey": "Dokončené",
     "score": "Skóre",

common/locales/da/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Glasmosaik",
     "backgroundStainedGlassNotes": "Nyd en smuk Glasmosaik.",
     "backgroundRollingHillsText": "Bølgende Bakker",
-    "backgroundRollingHillsNotes": "Løb frejdigt rundt mellem Bølgende Bakker."
+    "backgroundRollingHillsNotes": "Løb frejdigt rundt mellem Bølgende Bakker.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/da/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Inviteret til Quest",
     "kickedGroup": "Fjernet fra gruppe",
     "remindersToLogin": "Påmindelser om at tjekek ind på HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Markér for at afmelde emails",
     "unsubscribeAllEmailsText": "Ved at markere denne boks er jeg indforstået med, at ved at afmelde alle emails vil HabitRPG aldrig være i stand til at informere mig via email om vigtige ændringer på siden eller min konto.",
     "correctlyUnsubscribedEmailType": "Succesfuldt afmeldt \"<%= emailType %>\" emails.",

common/locales/da/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Aktive",
     "complete": "Færdige",
     "dated": "Med dato",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Forfalden",
     "grey": "Grå",
     "score": "Score",

common/locales/de/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Bleiglas",
     "backgroundStainedGlassNotes": "Bewundere das Bleiglas.",
     "backgroundRollingHillsText": "Hügellandschaft",
-    "backgroundRollingHillsNotes": "Tolle durch die Hügellandschaft. "
+    "backgroundRollingHillsNotes": "Tolle durch die Hügellandschaft. ",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/de/content.json

@@ -30,7 +30,7 @@
     "questEggDeerText": "Hirsch",
     "questEggDeerAdjective": "anmutiger",
     "questEggEggText": "Ei",
-    "questEggEggMountText": "Eier Korb",
+    "questEggEggMountText": "Osternest",
     "questEggEggAdjective": "farbenfroh",
     "questEggRatText": "Ratterich",
     "questEggRatAdjective": "dreckiger",

common/locales/de/gear.json

@@ -245,7 +245,7 @@
     "armorMystery201412Notes": "Du bist ein Pinguin! Kein Attributbonus. Dezember 2014 Abonnenten-Gegenstand.",
     "armorMystery201501Text": "Sternenrüstung",
     "armorMystery201501Notes": "Du siehst Galaxien im Metall dieser Rüstung schimmern, die dem Träger der Rüstung eine unerschütterliche Entschlossenheit schenken.\nDiese Rüstung gibt keinen Attributbonus. Januar 2015 Abonnenten Gegenstand.",
-    "armorMystery201503Text": "aquarmarinblauen Rüstung",
+    "armorMystery201503Text": "Aquamarinblaue Rüstung",
     "armorMystery201503Notes": "Dieses blaue Mineral symbolisiert Glück, Fröhlichkeit und endlose Produktivität. Gewährt keinen Attributbonus. März 2015 Abonnentengegenstand.",
     "armorMystery301404Text": "Steampunkanzug",
     "armorMystery301404Notes": "Adrett und schneidig, hoho! Februar 3015 Abonennten-Gegenstand. Kein Attributbonus.",
@@ -500,7 +500,7 @@
     "eyewearSpecialWonderconRedNotes": "Was für ein beeindruckender Kopfschmuck! Kein Attributbonus. Special Edition Convention-Rüstung.",
     "eyewearSpecialWonderconBlackText": "Tückische Maske",
     "eyewearSpecialWonderconBlackNotes": "Deine Vorhaben sind mit Sicherheit absolut rechtmäßig. Special Edition Convention Gegenstand.",
-    "eyewearMystery201503Text": "aquamarinblauen Brillen",
+    "eyewearMystery201503Text": "Aquamarinblaue Brille",
     "eyewearMystery201503Notes": "Pikse dir mit diesen schimmernden Edelsteinen nicht ins Auge! Gewährt keinen Attributbonus. März 2015 Abonnentengegenstand.",
     "eyewearMystery301404Text": "Schutzbrille",
     "eyewearMystery301404Notes": "Es gibt nichts schickeres vor den Augen als diese Brille - außer vielleicht einem Monokel. April 3015 Abonennten-Gegenstand. Kein Attributbonus",

common/locales/de/groups.json

@@ -95,6 +95,6 @@
     "abuseFlagModalButton": "Melden",
     "abuseReported": "Danke, dass Du diesen Verstoß gemeldet hast. Die Moderatoren wurden benachrichtigt.",
     "abuseAlreadyReported": "Du hast diese Nachricht bereits gemeldet.",
-    "needsText": "Please type a message.",
-    "needsTextPlaceholder": "Type your message here."
+    "needsText": "Bitte gib eine Nachricht ein.",
+    "needsTextPlaceholder": "Gib Deine Nachricht hier ein."
 }

common/locales/de/limited.json

@@ -6,7 +6,7 @@
     "annoyingFriendsText": "Hat sich <%= snowballs %> Schneebälle von Gruppenmitgliedern eingefangen.",
     "alarmingFriends": "Unheimliche Freunde",
     "alarmingFriendsText": "Wurde <%= spookDust %> mal von Gruppenmitgliedern erschreckt.",
-    "agriculturalFriends": "Agricultural Friends",
+    "agriculturalFriends": "Gartenbegeisterte Freunde",
     "agriculturalFriendsText": "Wurde <%= seeds %> mal von Gruppenmitgliedern in eine Blume verwandelt.",
     "valentineCard": "Valentinstagskarte",
     "valentineCardNotes": "Einem Gruppenmitglied eine Valentinskarte schicken.",

common/locales/de/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Zu einem Quest eingeladen",
     "kickedGroup": "Aus Gruppe entfernt.",
     "remindersToLogin": "Erinnerungen, HabitRPG zu überprüfen",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Häkchen setzen, um keine weiteren Emails zu erhalten",
     "unsubscribeAllEmailsText": "Indem ich hier ein Häkchen gesetzt habe, bestätige ich, dass ich verstanden habe, dass ich aus allen HabitRPG Email-Listen ausgetragen wurde. HabitRPG kann mir keine Emails mehr zu wichtigen Änderungen der Seite oder meines Accounts schicken.",
     "correctlyUnsubscribedEmailType": "Erfolgreich \"<%= emailType %>\"-E-Mails abbestellt. ",

common/locales/de/spells.json

@@ -39,8 +39,8 @@
     "spellSpecialSpookDustNotes": "Verwandle einen Freund in ein schwebendes Bettlaken mit Augen!",
     "spellSpecialOpaquePotionText": "Trank der Entgeisterung",
     "spellSpecialOpaquePotionNotes": "Beendet den Effekt von Spukglitter",
-    "spellSpecialShinySeedText": "Leuchtende Saat",
-    "spellSpecialShinySeedNotes": "Verwandle einen Freund in eine fröhliche Blume.",
-    "spellSpecialPetalFreePotionText": "Petal-Free Potion",
-    "spellSpecialPetalFreePotionNotes": "Beendet den Effekt einer leuchtenden Saat."
+    "spellSpecialShinySeedText": "Schimmernde Saat",
+    "spellSpecialShinySeedNotes": "Verwandle einen Freund in eine fröhliche Blume!",
+    "spellSpecialPetalFreePotionText": "Blütenfrei Trank",
+    "spellSpecialPetalFreePotionNotes": "Beendet den Effekt der schimmernden Saat."
 }

common/locales/de/subscriber.json

@@ -19,7 +19,7 @@
     "supportDevsText": "Dieses 'open source Projekt' kann jede Hilfe gebrauchen die es bekommen kann. Hilf uns HabitRPG am Leben zu erhalten!",
     "monthUSD": "USD($) / Monat",
     "organization": "Organisation",
-    "groupPlans": "Corporate Plans",
+    "groupPlans": "Gemeinschaftliche Pläne",
     "indivPlan1": "Für Privatpersonen ist HabitRPG kostenlos. Auch für kleine Interessengruppen kann die kostenlose (oder billige)",
     "indivPlan2": "verwendet werden um Teilnehmer zu motivieren ihr Verhalten zu verändern. Denke nur an Gruppen von Autoren, künstlerische Wettbewerbe und mehr.",
     "groupText1": "Aber einige Gruppenleiter wollen mehr Kontrolle, Datenschutz, Sicherheit und Unterstützung. Beispielsweise Familien, Gruppen mit Gesundheits- oder Erholungszielen, Angestelltengruppen und mehr. Die Planung erlauben selbstständige Instanzen von HabitRPG für Deine Gruppe oder Organisation, sicher und unabhängig von",

common/locales/de/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Aktiv",
     "complete": "Erledigt",
     "dated": "Datiert",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Fällig",
     "grey": "Grau",
     "score": "Punktestand",

common/locales/en/backgrounds.json

@@ -79,5 +79,13 @@
   "backgroundStainedGlassText": "Stained Glass",
   "backgroundStainedGlassNotes": "Admire some Stained Glass.",
   "backgroundRollingHillsText": "Rolling Hills",
-  "backgroundRollingHillsNotes": "Frolic through the Rolling Hills."
+  "backgroundRollingHillsNotes": "Frolic through the Rolling Hills.",
+
+  "backgrounds042015": "SET 11: Released April 2015",
+  "backgroundCherryTreesText": "Cherry Trees",
+  "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+  "backgroundFloralMeadowText": "Flowering Meadow",
+  "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+  "backgroundGumdropLandText": "Gumdrop Land",
+  "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/en/challenge.json

@@ -37,7 +37,7 @@
     "publicChallenges": "Minimum 1 Gem for <strong> public challenges </strong> (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",

common/locales/en/generic.json

@@ -37,6 +37,7 @@
     "notEnoughGems": "Not enough Gems",
     "alreadyHave": "Whoops! You already have this item. No need to buy it again!",
     "delete": "Delete",
+    "gemsPopoverTitle": "Gems",
     "gems": "Gems",
     "gemButton": "You have <%= number %> Gems.",
     "moreInfo": "More Info",
@@ -61,7 +62,7 @@
     "errorUpCase": "ERROR:",
     "newPassSent": "New password sent.",
     "serverUnreach": "Server currently unreachable.",
-    "seeConsole": "(see Chrome console for more details).",
+    "seeConsole": "If the error persists, please report it at Help > Report a Bug. If you're familiar with your browser's console, please include any error messages.",
     "error": "Error",
     "menu": "Menu",
     "notifications": "Notifications",

common/locales/en/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Invited to Quest",
     "kickedGroup": "Kicked from group",
     "remindersToLogin": "Reminders to check in to HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Check to Unsubscribe from Emails",
     "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, HabitRPG will never be able to notify me via email about important changes to the site or my account.",
     "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.",

common/locales/en@pirate/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Stained Glass",
     "backgroundStainedGlassNotes": "Admire some Stained Glass.",
     "backgroundRollingHillsText": "Rolling Hills",
-    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills."
+    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/en@pirate/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Invited to Quest",
     "kickedGroup": "Kicked from group",
     "remindersToLogin": "Reminders to check in to HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Check to Unsubscribe from Emails",
     "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, HabitRPG will never be able to notify me via email about important changes to the site or my account.",
     "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.",

common/locales/en@pirate/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Active",
     "complete": "Done",
     "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Due",
     "grey": "Grey",
     "score": "Score",

common/locales/en_GB/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Stained Glass",
     "backgroundStainedGlassNotes": "Admire some Stained Glass.",
     "backgroundRollingHillsText": "Rolling Hills",
-    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills."
+    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/en_GB/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Invited to Quest",
     "kickedGroup": "Kicked from group",
     "remindersToLogin": "Reminders to check in to HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Check to Unsubscribe from Emails",
     "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, HabitRPG will never be able to notify me via email about important changes to the site or my account.",
     "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.",

common/locales/en_GB/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Active",
     "complete": "Done",
     "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Due",
     "grey": "Grey",
     "score": "Score",

common/locales/es/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Vidriera",
     "backgroundStainedGlassNotes": "Admira estas vidrieras.",
     "backgroundRollingHillsText": "Colinas Onduladas",
-    "backgroundRollingHillsNotes": "Retoza por las Colinas Onduladas"
+    "backgroundRollingHillsNotes": "Retoza por las Colinas Onduladas",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/es/character.json

@@ -35,7 +35,7 @@
     "flower": "Flor",
     "basicSkins": "Pieles Básicas",
     "rainbowSkins": "Pieles Arcoiris",
-    "pastelSkins": "Pieles Pastel",
+    "pastelSkins": "Pieles color Pastel",
     "spookySkins": "Pieles Tenebrosas",
     "supernaturalSkins": "Pieles sobrenaturales",
     "rainbowColors": "Colores Arcoiris",

common/locales/es/groups.json

@@ -2,7 +2,7 @@
     "tavern": "Taberna",
     "innCheckOut": "Dejar la Posada",
     "innCheckIn": "Descansar en la Posada",
-    "innText": "¿Que tal tu estancia en la Posada, <%= name %>? Para protegerte, tu lista diaria está congelada. Tus marcas de verificación no serán procesadas ​​o reiniciadas hasta mañana (el día después de salir). Ten cuidado, si tu grupo está en una misión, sus fallos te harán daño! Además, no le harás daño al enemigo. ¿Listo para salir? Verifíquete fuera.",
+    "innText": "¿Qué tal tu estancia en la Posada, <%= name %>? Para protegerte, tu lista diaria está congelada. Tus marcas de verificación no serán procesadas ​​o reiniciadas hasta mañana (el día después de salir). Ten cuidado, si tu grupo está en una misión, ¡sus fallos te harán daño! Además, no le harás daño al enemigo. ¿Listo para salir? Echa un vistazo.",
     "lfgPosts": "Post en la busqueda de Grupo (Se busca Grupo)",
     "tutorial": "Tutorial",
     "glossary": "Glosario",
@@ -95,6 +95,6 @@
     "abuseFlagModalButton": "Notificar",
     "abuseReported": "Gracias por notificar esta infracción. Los moderadores han sido informados.",
     "abuseAlreadyReported": "Ya has notificado este mensaje.",
-    "needsText": "Please type a message.",
-    "needsTextPlaceholder": "Type your message here."
+    "needsText": "Por favor, escribe un mensaje.",
+    "needsTextPlaceholder": "Escribe tu mensaje aquí."
 }

common/locales/es/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Invitado a Misión",
     "kickedGroup": "Expulsado del grupo",
     "remindersToLogin": "Recordatorios para revisar HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Marca para Desuscribirte de Notificaciones de Correo Electrónico",
     "unsubscribeAllEmailsText": "Al marcar esta casilla, certifico que entiendo que al desuscribirme de todos las notificaciones por correo electrónico, HabitRPG no va a poder nunca notificarme vía email sobre cambios importantes en el sitio o mi cuenta.",
     "correctlyUnsubscribedEmailType": "Suscripción denegada correctamente desde el email \"<%= emailType %>\".",

common/locales/es/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Activo",
     "complete": "Hecho",
     "dated": "Con fecha de",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Por vencer",
     "grey": "Gris",
     "score": "Puntaje",

common/locales/es_419/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Vitral",
     "backgroundStainedGlassNotes": "Admira algunos vitrales.",
     "backgroundRollingHillsText": "Colinas ondulantes",
-    "backgroundRollingHillsNotes": "Diviertete en las colinas ondulantes."
+    "backgroundRollingHillsNotes": "Diviertete en las colinas ondulantes.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/es_419/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Invitado a la Misión",
     "kickedGroup": "Expulsado del grupo",
     "remindersToLogin": "Notificaciones para reportarse en HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Marque para darse de baja de los Emails",
     "unsubscribeAllEmailsText": "Al marcar esta casilla, certifico que entiendo que al darme de baja de todos los emails, HabitsRPG nunca será capaz de notificarme por ese medio sobre cambios importantes en el sitio o en mi cuenta.",
     "correctlyUnsubscribedEmailType": "Ha dado de baja correctamente de los emails de \"<%= emailType %>\"",

common/locales/es_419/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Activo",
     "complete": "Hecho",
     "dated": "Fecha limite",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Por hacer",
     "grey": "Gris",
     "score": "Puntuaje",

common/locales/fr/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Vitraux",
     "backgroundStainedGlassNotes": "Admirez des Vitraux.",
     "backgroundRollingHillsText": "Collines",
-    "backgroundRollingHillsNotes": "Gambadez dans les Collines."
+    "backgroundRollingHillsNotes": "Gambadez dans les Collines.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/fr/groups.json

@@ -95,6 +95,6 @@
     "abuseFlagModalButton": "Signaler",
     "abuseReported": "Merci d'avoir signalé cette infraction. Les modérateurs en ont été informé.",
     "abuseAlreadyReported": "Vous avez déjà signalé ce message.",
-    "needsText": "Please type a message.",
-    "needsTextPlaceholder": "Type your message here."
+    "needsText": "Veuillez écrire un message.",
+    "needsTextPlaceholder": "Écrivez votre message ici."
 }

common/locales/fr/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Invitation à une Quête",
     "kickedGroup": "Éjecté·e du groupe",
     "remindersToLogin": "Rappels de vérification d'HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Cocher pour se désabonner des mails",
     "unsubscribeAllEmailsText": "En cochant cette case, je certifie comprendre qu'en me désabonnant de tous les mails, HabitRPG n'aura jamais la possibilité de m'avertir par e-mail de changements importants au niveau du site ou de mon compte.",
     "correctlyUnsubscribedEmailType": "Correctement désinscrit·e des mails \"<%= emailType %>\".",

common/locales/fr/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Actives",
     "complete": "Complétées",
     "dated": "Datées",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Restantes",
     "grey": "Grisées",
     "score": "Score",

common/locales/he/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "זכוכית מאויירת",
     "backgroundStainedGlassNotes": "להתפעל מזכוכית מאויירת",
     "backgroundRollingHillsText": "גבעות עגלגלות",
-    "backgroundRollingHillsNotes": "להשתעשע בגבעות עגלגלות."
+    "backgroundRollingHillsNotes": "להשתעשע בגבעות עגלגלות.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/he/communityguidelines.json

@@ -91,23 +91,23 @@
     "commGuidePara051": "<strong>ישנן מספר עבירות, והן מטופלות באופן התלוי בחומרתן.</strong> אלו אינן רשימות סופיות והמנהלים מורשים להפעיל את שיקול דעתם בנושא. כאשר מטפלים בעבירות, המנהלים מתחשבים בהקשר שבו העבירה נעשתה.",
     "commGuideHeadingSevereInfractions": "עבירות חמורות",
     "commGuidePara052": "עבירות חמורות הן אלו שפוגעות פגיעה אנושה בבטחונה של קהילת האביטיקה ומשתמשיה, וכתוצאה מכך יש להן גם השלכות חמורות.",
-    "commGuidePara053": "להלן רשימת דוגמאות לעבירות חמורות, זו אינה רשימה כוללת.",
+    "commGuidePara053": "להלן רשימת דוגמאות לעבירות חמורות, זו איננה רשימה כוללת.",
     "commGuideList05A": "הפרה של תנאי השימוש",
     "commGuideList05B": "הפצת מילות/תמונות שנאה, הטרדה/מעקב, בריונות-רשת, וכחנות והצקה",
     "commGuideList05C": "הפרה של תנאי תקופת מבחן",
     "commGuideList05D": "התחזות לאיש צוות או עורך",
     "commGuideList05E": "ביצוע עבירות בינוניות בצורה חוזרת ונשנית",
     "commGuideList05F": "יצירת חשבון חדש כדי להימנע מהשלכות (לדוגמא, על מנת לשוחח בצ׳ט לאחר שבחשבון הקודם נחסמה אפשרות זו)",
-    "commGuideHeadingModerateInfractions": "עבירות בינוניות",
-    "commGuidePara054": "עבירות מתונות אינן פוגעות בביטחון הקהילה, אך הן יוצרות חוויה לא נעימה. לעבירות כאלו יהיו השלכות מתונות. אם ייעשו עבירות נוספות, ייתכן ויהיו לכך השלכות חמורות יותר.",
-    "commGuidePara055": "להלן רשימת דוגמאות לעבירות בינוניות. זו איננה רשימה ממצאת.",
+    "commGuideHeadingModerateInfractions": "עבירות בדרגת חומרה בינונית",
+    "commGuidePara054": "עבירות בינוניות אינן פוגעות בביטחון הקהילה, אך הן יוצרות חוויה לא נעימה. לעבירות כאלו יהיו השלכות מתונות. אם ייעשו עבירות נוספות, ייתכן ויהיו לכך השלכות חמורות יותר.",
+    "commGuidePara055": "להלן רשימת דוגמאות לעבירות בינוניות. זו איננה רשימה כוללת.",
     "commGuideList06A": "התעלמות או חוסר הבעת כבוד לעורך. זה כולל התלוננות ציבורית על משתמשים אחרים או תשבוחות/הגנה של משתמשים שהושעו. אם את/ה מודאג/ת לגבי אחד מהחוקים או העורכים, אנא דבר/י עם למונס באימייל  (<a href=\"mailto:leslie@habitrpg.com\">leslie@habitrpg.com</a>).",
     "commGuideList06B": "ניהול מחתרתי. לצורך ההבהרה של נקודה חשובה: תזכורת ידידותית לחוקים היא בסדר. ניהול מחתרתי הוא אמירה, דרישה ו/או רמיזה חזקה שמישהו חייב לנקוט בדרך פעולה שתיארת כדי לתקן טעות כלשהי. ניתן לדווח על העובדה שהם ביצעו עבירה, אבל אנא אל תדרשו מהם פעולות בעצמכם. לדוגמה, להגיד \"לידיעתך, אסור לקלל בפונדק, אז אולי יהיה עדיף אם תמחק את זה.\" זה יותר טוב מאשר להגיד \"אני נאלצ/ת לבקש ממך למחוק את התגובה הזו.\"",
     "commGuideList06C": "הפרה חוזרת ונשנה של חוקי המרחבים הציבוריים",
     "commGuideList06D": "עבירות משניות שחוזרות על עצמן",
     "commGuideHeadingMinorInfractions": "עבירות משניות",
     "commGuidePara056": "עבירות משניות, למרות שאינן מעודדות, עדיין גוררות רק השלכות משניות. אם הן ממשיכות להצטבר, הן עשויות להוביל להשלכות חמורות יותר עם הזמן.",
-    "commGuidePara057": "להלן רשימת דוגמאות לעבירות משניות. זו אינה רשימה ממצאת.",
+    "commGuidePara057": "להלן רשימת דוגמאות לעבירות משניות. זו איננה רשימה כוללת.",
     "commGuideList07A": "הפרה ראשונה של חוקי המרחב הציבורי",
     "commGuideList07B": "כל פעולה או הצהרה שגוררת \"בבקשה לא\". כאשר עורך צריך להגיד \"בבקשה אל תעשה/י זאת\", למשתמש, זה עשוי להיחשב כעבירה מאוש שולית עבור אותו משתמש. לדוגמה: \"בתור עורך: בבקשה אל תמשיכו להתווכח לטובת רעיון לתכונה חדשה אחרי שאמרנו לכם שהוא לא ניתן לביצוע.\" במקרים רבים, ל\"בבקשה לא\" יהיו גם השלכות משניות, אבל אם עורך חייב להגיד \"בבקשה לא\" לאותו משתמש מספיק פעמים, זה יתחיל להיחשב כעבירה בינונית.",
     "commGuideHeadingConsequences": "השלכות",

common/locales/he/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Invited to Quest",
     "kickedGroup": "Kicked from group",
     "remindersToLogin": "Reminders to check in to HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Check to Unsubscribe from Emails",
     "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, HabitRPG will never be able to notify me via email about important changes to the site or my account.",
     "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.",

common/locales/he/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "פעיל",
     "complete": "הושלם",
     "dated": "תאריך השלמה",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "עכשווי",
     "grey": "אפור",
     "score": "ציון",

common/locales/hu/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Ólomüveg",
     "backgroundStainedGlassNotes": "Csodáld meg az ólomüveget.",
     "backgroundRollingHillsText": "Lankás dombok",
-    "backgroundRollingHillsNotes": "Ugrándozz a lankás lejtőkön."
+    "backgroundRollingHillsNotes": "Ugrándozz a lankás lejtőkön.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/hu/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Meghívva egy küldetésre",
     "kickedGroup": "Kirúgtak a csoportból",
     "remindersToLogin": "Emlékeztetők a HabitRPG-be történő bejelentkezésre",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Pipáld ki hogyha le akarsz iratkozni az Email-ekről",
     "unsubscribeAllEmailsText": "Ennek a mezőnek a kipipálásával elismerem, hogy megértettem azt, hogyha leiratkozom minden emailről, akkor a HabitRPG nem fog tudni értesíteni engem Email-en keresztül semmilyen fontos változásról az oldallal vagy a felhasználói fiókommal kapcsolatban.",
     "correctlyUnsubscribedEmailType": "Sikeresen leiratkoztál a(z) \"<%= emailType %>\" e-mailekről.",

common/locales/hu/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Aktív",
     "complete": "Befejezett",
     "dated": "Határidős",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Hátralevő",
     "grey": "Szürke",
     "score": "Pontszám",

common/locales/it/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Vetrata Colorata",
     "backgroundStainedGlassNotes": "Ammira delle vetrate colorate.",
     "backgroundRollingHillsText": "Colline Ondulanti",
-    "backgroundRollingHillsNotes": "Folleggia tra le colline ondulanti."
+    "backgroundRollingHillsNotes": "Folleggia tra le colline ondulanti.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/it/groups.json

@@ -95,6 +95,6 @@
     "abuseFlagModalButton": "Segnala",
     "abuseReported": "Grazie di aver segnalato questa violazione. I moderatori sono stati avvertiti.",
     "abuseAlreadyReported": "Hai già segnalato questo messaggio.",
-    "needsText": "Please type a message.",
-    "needsTextPlaceholder": "Type your message here."
+    "needsText": "Perfavore scrivi un messaggio.",
+    "needsTextPlaceholder": "Scrivi il tuo messaggio qui."
 }

common/locales/it/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Invito ad unirti ad una missione",
     "kickedGroup": "Espulsione da un gruppo",
     "remindersToLogin": "Promemoria per accedere ad HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Disattiva tutte le notifiche email",
     "unsubscribeAllEmailsText": "Selezionando questa opzione, confermo di essere cosciente del fatto che, disattivando le notifiche via email, HabitRPG non sarà mai in grado di notificarmi via email cambiamenti importanti riguardo al sito o al mio account.",
     "correctlyUnsubscribedEmailType": "Sottoscrizione alle mail \"<%= emailType %>\" annullata correttamente.",

common/locales/it/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Attivi",
     "complete": "Completi",
     "dated": "Con scadenza",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Incomplete",
     "grey": "Grigie",
     "score": "Punti",

common/locales/nl/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Glas in lood",
     "backgroundStainedGlassNotes": "Bewonder het glas in lood.",
     "backgroundRollingHillsText": "Glooiende velden",
-    "backgroundRollingHillsNotes": "Dartel door de glooiende velden."
+    "backgroundRollingHillsNotes": "Dartel door de glooiende velden.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/nl/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Uitgenodigd voor queeste",
     "kickedGroup": "Uit de groep gegooid",
     "remindersToLogin": "Herinneringsberichten om HabitRPG te checken",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Klik hier om emails uit te zetten",
     "unsubscribeAllEmailsText": "Door dit aan te klikken geef ik aan dat ik begrijp dat als ik me uitschrijf van emails, HabitRPG nooit meer per email contact met me op kan nemen om belangrijke wijzigingen in de site of mijn account door te geven.",
     "correctlyUnsubscribedEmailType": "Afgemeld voor \"<%= emailType %>\" emails.",

common/locales/nl/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Actief",
     "complete": "Gedaan",
     "dated": "Met datum",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Onvoltooid",
     "grey": "Grijs",
     "score": "Score",

common/locales/pl/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Witraż",
     "backgroundStainedGlassNotes": "Podziwiaj Witraże",
     "backgroundRollingHillsText": "Toczące Doliny",
-    "backgroundRollingHillsNotes": "Hasaj przez Toczone Doliny"
+    "backgroundRollingHillsNotes": "Hasaj przez Toczone Doliny",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/pl/gear.json

@@ -65,7 +65,7 @@
     "weaponSpecial2Text": "Smocza laska Stephena Webera",
     "weaponSpecial2Notes": "Poczuj moc smoka płynącą z wnętrza! Zwiększa Siłę jak i Percepcję o <%= attrs %>.",
     "weaponSpecial3Text": "Morgensztern miażdżący kamienie milowe Mustaine'a",
-    "weaponSpecial3Notes": "Zebrania, złe stwory, zaniepokojenie – z głowy! Zmiażdżone! Zwiększa Siłę, Inteligencję i Kondycję o <%= attrs %>.",
+    "weaponSpecial3Notes": "Zebrania, potwory, zaniepokojenie – z głowy! Zmiażdżone! Zwiększa Siłę, Inteligencję i Kondycję o <%= attrs %>.",
     "weaponSpecialCriticalText": "Kryzysowy młot do miażdżenia błędów",
     "weaponSpecialCriticalNotes": "Ten czempion zgładził krytycznego wroga na Githubie tam, gdzie wielu poległo. Wykonany z jego kości, młot ten zadaje potężne krytyczne obrażenia. Zwiększa Siłę jak i Percepcję o <%= attrs %>.",
     "weaponSpecialYetiText": "Włócznia poskramiacza yeti",
@@ -479,7 +479,7 @@
     "headAccessorySpecialSpring2015MageText": "Niebieskie królicze uszy",
     "headAccessorySpecialSpring2015MageNotes": "These ears listen keenly, in case somewhere a magician is revealing secrets. Confers no benefit. Limited Edition 2015 Spring Gear.",
     "headAccessorySpecialSpring2015HealerText": "Zielone kocie uszy",
-    "headAccessorySpecialSpring2015HealerNotes": "These cute kitty ears will make others green with envy. Confers no benefit. Limited Edition 2015 Spring Gear.",
+    "headAccessorySpecialSpring2015HealerNotes": "Te słodkie kocie uszka sprawią, że wszyscy zzielenieją z zazdrości. Brak korzyści. Edycja Limitowana Wiosna 2015.",
     "headAccessoryMystery201403Text": "Poroże przemierzania lasów",
     "headAccessoryMystery201403Notes": "To poroże lśni od mchów i porostów. Brak dodatkowych korzyści. Marzec 2014. Przedmiot abonencki.",
     "headAccessoryMystery201404Text": "Czułki motyla zmierzchu",
@@ -505,5 +505,5 @@
     "eyewearMystery301404Text": "Gogle",
     "eyewearMystery301404Notes": "Żadne okulary nie są bardziej szykowne od pary gogli - no może oprócz monokla. Brak korzyści. Kwiecień 3015 Przedmiot abonencki.",
     "eyewearMystery301405Text": "Monokl",
-    "eyewearMystery301405Notes": "No eyewear could be fancier than a monocle - except, perhaps, for a pair of goggles. Confers no benefit. July 3015 Subscriber Item."
+    "eyewearMystery301405Notes": "Żadne okulary nie dorównają fantazyjnością monoklowi - poza, być może, parą gogli. Brak korzyści. Lipiec 3015 Przedmiot abonencki."
 }

common/locales/pl/groups.json

@@ -95,6 +95,6 @@
     "abuseFlagModalButton": "Zgłoś",
     "abuseReported": "Dziękujemy za zgłoszenie. Moderatorzy zostali powiadomieni.",
     "abuseAlreadyReported": "Już zgłosiłeś tę wiadomość.",
-    "needsText": "Please type a message.",
-    "needsTextPlaceholder": "Type your message here."
+    "needsText": "Proszę wpisać wiadomość.",
+    "needsTextPlaceholder": "Wpisz swoją wiadomość tutaj."
 }

common/locales/pl/limited.json

@@ -6,12 +6,12 @@
     "annoyingFriendsText": "Dostał <%= snowballs %> razy śnieżką od członków Drużyny.",
     "alarmingFriends": "Niepokojący przyjaciele",
     "alarmingFriendsText": "Przestraszony <%= spookDust %> razy przez członków drużyny.",
-    "agriculturalFriends": "Agricultural Friends",
+    "agriculturalFriends": "Rolniczy Przyjaciele",
     "agriculturalFriendsText": "Został przemieniony w kwiata <%= seeds %> razy przez członków drużyny.",
     "valentineCard": "Kartka Walentynkowa",
     "valentineCardNotes": "Wyślij Kartkę Walentynkową do członka drużyny.",
     "valentine0": "\"Róże są czerwone<%= lineBreak %>Moje dzienne zadania są niebieskie<%= lineBreak %>Cieszy mnie, że<%= lineBreak %>jestem w drużynie z tobą!\"",
-    "valentine1": "\"Roses are red<%= lineBreak %>Violets are nice<%= lineBreak %>Let's get together<%= lineBreak %>And fight against Vice!\"",
+    "valentine1": "\"Na górze róże<%= lineBreak %>Fiołki za progiem<%= lineBreak %>Wspólnie ruszajmy<%= lineBreak %>Na wojnę z Nałogiem!\"",
     "valentine2": "\"Roses are red<%= lineBreak %>This poem style is old<%= lineBreak %>I hope that you like this<%= lineBreak %>'Cause it cost ten Gold.\"",
     "valentine3": "\"Roses are red<%= lineBreak %>Ice Drakes are blue<%= lineBreak %>No treasure is better<%= lineBreak %>Than time spent with you!\"",
     "adoringFriends": "Kochani przyjaciele",

common/locales/pl/npc.json

@@ -48,6 +48,6 @@
     "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can freeze your account in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
     "tourPartyPage": "Your Party will help you stay accountable. Invite friends to unlock a Quest Scroll!",
     "tourGuildsPage": "Guilds are social groups with common themes. Search for the subjects that interest you! We recommend the Newbies Guild.",
-    "tourChallengesPage": "Joining a Challenge will add tasks to your account. Compete against other users to win gem prizes!",
-    "tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market."
+    "tourChallengesPage": "Podjęcie Wyzwania spowoduje dodanie zadań do Twojego konta. Rywalizuj z innymi graczami i wygrywaj Klejnoty!",
+    "tourMarketPage": "Od poziomu 4, jaja i eliksiry wyklucia zdobywasz losowo po ukończeniu zadań. Pojawiają się one tutaj - użyj ich, a wyklują się chowańce! Możesz także kupować przedmioty na Targu."
 }

common/locales/pl/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Zostałeś zaproszony do zadania",
     "kickedGroup": "Wyrzucono z grupy",
     "remindersToLogin": "Przypominaj by meldować się do HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Zaznacz by zrezygnować z otrzymywania emaili",
     "unsubscribeAllEmailsText": "Przez zaznaczenie tego pola poświadczam, że rozumiem, że po zrezygnowaniu z otrzymywania wszystkich emaili HabitRPG nie będzie mogło powiadamiać mnie przez email o ważnych zmianach na stronie i na moim koncie.",
     "correctlyUnsubscribedEmailType": "Poprawnie zrezygnowano z \"<%=emailType %>\" emaili.",

common/locales/pl/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Aktywne",
     "complete": "Skończone",
     "dated": "Z datą",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Dzisiejsze",
     "grey": "Szare",
     "score": "Wynik",

common/locales/pt/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Vitral",
     "backgroundStainedGlassNotes": "Admire alguns Vitrais.",
     "backgroundRollingHillsText": "Colinas",
-    "backgroundRollingHillsNotes": "Divirta-se nas Colinas"
+    "backgroundRollingHillsNotes": "Divirta-se nas Colinas",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/pt/gear.json

@@ -444,7 +444,7 @@
     "backMystery201404Text": "Asas de Borboleta de Crepúsculo",
     "backMystery201404Notes": "Seja uma borboleta e borboleteie! Não concede benefícios. Item de Assinante de Abril 2014",
     "backMystery201410Text": "Asas de Goblin",
-    "backMystery201410Notes": "Mergulhe pela noite com essas asas resistentes. Não concede benefícios. Item de Assinante de Outubro 2014.",
+    "backMystery201410Notes": "Mergulhe pela noite com essas resistentes asas. Não concede benefícios. Item de Assinante de Outubro 2014.",
     "backSpecialWonderconRedText": "Capa Poderosa",
     "backSpecialWonderconRedNotes": "Sibila com força e beleza. Não concede benefícios. Equipamento Edição Especial de Convenção.",
     "backSpecialWonderconBlackText": "Capa Furtiva",

common/locales/pt/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Convidado para Missão",
     "kickedGroup": "Expulso do grupo ",
     "remindersToLogin": "Lembretes para se conectar em HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Marque para cancelar assinatura de E-mails",
     "unsubscribeAllEmailsText": "Marcando esta caixa, eu certifico que entendo que, por não assinar nenhum e-mail, HabitRPG nunca será capaz de me notificar via e-mail sobre mudanças importantes do site ou da minha conta.",
     "correctlyUnsubscribedEmailType": "Assinatura a emails \"<%= emailType %>\" corretamente cancelada.",

common/locales/pt/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Ativos",
     "complete": "Feitos",
     "dated": "Com data",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "De hoje",
     "grey": "Cinza",
     "score": "Pontuação",

common/locales/ro/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Stained Glass",
     "backgroundStainedGlassNotes": "Admire some Stained Glass.",
     "backgroundRollingHillsText": "Rolling Hills",
-    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills."
+    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/ro/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Invited to Quest",
     "kickedGroup": "Kicked from group",
     "remindersToLogin": "Reminders to check in to HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Check to Unsubscribe from Emails",
     "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, HabitRPG will never be able to notify me via email about important changes to the site or my account.",
     "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.",

common/locales/ro/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Active",
     "complete": "Done",
     "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Scadente",
     "grey": "Gri",
     "score": "Score",

common/locales/ru/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Витражное стекло",
     "backgroundStainedGlassNotes": "Полюбоваться витражами.",
     "backgroundRollingHillsText": "Перекатывающиеся холмы",
-    "backgroundRollingHillsNotes": "Резвитесь между перекатывающихся холмов."
+    "backgroundRollingHillsNotes": "Резвитесь между перекатывающихся холмов.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/ru/front.json

@@ -73,7 +73,7 @@
     "mobileAndroid": "Android",
     "footerCompany": "Компания",
     "companyDonate": " Пожертвования",
-    "companyAbout": "How it Works",
+    "companyAbout": "Как это Работает",
     "companyVideos": "Видео",
     "companyBlog": "Блог",
     "companyExtensions": "Расширения",

common/locales/ru/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Приглашен в Квест",
     "kickedGroup": "Исключен из группы",
     "remindersToLogin": "Напоминания о заданиях в HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Поставьте галочку, чтобы отписаться от е-мейлов.",
     "unsubscribeAllEmailsText": "Отписываясь от е-мейлов, я понимаю, что HabitRPG никогда не сможет известить меня по электронной почте о важных изменениях на сайте или в моем аккаунте.",
     "correctlyUnsubscribedEmailType": "Вы успешно отписались от уведомлений \"<%= emailType %>\".",

common/locales/ru/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Активные",
     "complete": "Завершенные",
     "dated": "С датой",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Открытые",
     "grey": "Серые",
     "score": "Счет",

common/locales/sk/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Stained Glass",
     "backgroundStainedGlassNotes": "Admire some Stained Glass.",
     "backgroundRollingHillsText": "Rolling Hills",
-    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills."
+    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/sk/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Invited to Quest",
     "kickedGroup": "Kicked from group",
     "remindersToLogin": "Reminders to check in to HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Check to Unsubscribe from Emails",
     "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, HabitRPG will never be able to notify me via email about important changes to the site or my account.",
     "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.",

common/locales/sk/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Aktívne",
     "complete": "Hotové",
     "dated": "S dátumom",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "V pláne",
     "grey": "Šedé",
     "score": "Skóre",

common/locales/sv/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Glasmålning",
     "backgroundStainedGlassNotes": "Beundra en glasmålning.",
     "backgroundRollingHillsText": "Gröna Kullar",
-    "backgroundRollingHillsNotes": "Skutta över de Gröna Kullarna"
+    "backgroundRollingHillsNotes": "Skutta över de Gröna Kullarna",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/sv/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Inbjuden till uppdrag",
     "kickedGroup": "Avfärdad från grupp",
     "remindersToLogin": "Reminders to check in to HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Kryssa i för avregistrera från emails",
     "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, HabitRPG will never be able to notify me via email about important changes to the site or my account.",
     "correctlyUnsubscribedEmailType": "Avprenumerade från \"<%= emailType %>\" e-post framgångsrikt.",

common/locales/sv/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Aktiv",
     "complete": "Klar",
     "dated": "Daterad",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Ofärdig",
     "grey": "Grå",
     "score": "Poäng",

common/locales/uk/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Stained Glass",
     "backgroundStainedGlassNotes": "Admire some Stained Glass.",
     "backgroundRollingHillsText": "Rolling Hills",
-    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills."
+    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/uk/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "Invited to Quest",
     "kickedGroup": "Kicked from group",
     "remindersToLogin": "Reminders to check in to HabitRPG",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "Check to Unsubscribe from Emails",
     "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, HabitRPG will never be able to notify me via email about important changes to the site or my account.",
     "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.",

common/locales/uk/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "Active",
     "complete": "Виконано",
     "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Повинен зробити",
     "grey": "Сірі",
     "score": "Score",

common/locales/zh/backgrounds.json

@@ -69,5 +69,12 @@
     "backgroundStainedGlassText": "Stained Glass",
     "backgroundStainedGlassNotes": "Admire some Stained Glass.",
     "backgroundRollingHillsText": "Rolling Hills",
-    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills."
+    "backgroundRollingHillsNotes": "Frolic through the Rolling Hills.",
+    "backgrounds042015": "SET 11: Released April 2015",
+    "backgroundCherryTreesText": "Cherry Trees",
+    "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+    "backgroundFloralMeadowText": "Flowering Meadow",
+    "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+    "backgroundGumdropLandText": "Gumdrop Land",
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/locales/zh/settings.json

@@ -98,6 +98,9 @@
     "invitedQuest": "任务邀请",
     "kickedGroup": "Kicked from group",
     "remindersToLogin": "HabitRPG签到提醒",
+    "unsubscribedSuccessfully": "Unsubscribed successfully!",
+    "unsubscribedTextUsers": "You have successfully unsubscribed from all HabitRPG emails. You can enable only the emails you want to receive from <a href=\"/#/options/settings/notifications\">the settings</a> (requires login).",
+    "unsubscribedTextOthers": "You won't receive any other email from HabitRPG.",
     "unsubscribeAllEmails": "确认从电子邮件退订",
     "unsubscribeAllEmailsText": "以此确认，我明白在我取消邮箱订阅后，HabitRPG不会再通过邮件通知我关于我的账号或关于网站的重要更改。",
     "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.",

common/locales/zh/tasks.json

@@ -44,6 +44,7 @@
     "remaining": "进行中",
     "complete": "已完成",
     "dated": "已过期",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "待办",
     "grey": "已完成",
     "score": "成绩",

common/script/content.coffee

@@ -1737,6 +1737,16 @@ api.backgrounds =
     rolling_hills:
       text: t('backgroundRollingHillsText')
       notes: t('backgroundRollingHillsNotes')
+  backgrounds042015:
+    cherry_trees:
+      text: t('backgroundCherryTreesText')
+      notes: t('backgroundCherryTreesNotes')
+    floral_meadow:
+      text: t('backgroundFloralMeadowText')
+      notes: t('backgroundFloralMeadowNotes')
+    gumdrop_land:
+      text: t('backgroundGumdropLandText')
+      notes: t('backgroundGumdropLandNotes')
 
 api.subscriptionBlocks =
   basic_earned: months:1, price:5

common/script/index.coffee

@@ -472,7 +472,7 @@ api.wrap = (user, main=true) ->
             task.value = 0
         user.stats.hp = 50
         cb? null, user
-        ga?.event('purchase', 'reroll').send()
+        ga?.event('behavior', 'gems', 'reroll').send()
 
       rebirth: (req, cb, ga) ->
         # Cost is 8 Gems ($2)
@@ -533,7 +533,7 @@ api.wrap = (user, main=true) ->
         user.stats.buffs = {}
         # user.markModified? 'stats'
         cb? null, user
-        ga?.event('purchase', 'Rebirth').send()
+        ga?.event('behavior', 'gems', 'rebirth').send()
 
       allocateNow: (req, cb) ->
         _.times user.stats.points, user.fns.autoAllocate
@@ -749,7 +749,7 @@ api.wrap = (user, main=true) ->
           user.items[type][key] = 0  unless user.items[type][key] > 0
           user.items[type][key]++
         cb? null, _.pick(user,$w 'items balance')
-        ga?.event('purchase', key).send()
+        ga?.event('behavior', 'gems', key).send()
 
       releasePets: (req, cb) ->
         if user.balance < 1
@@ -898,7 +898,7 @@ api.wrap = (user, main=true) ->
         user.balance -= cost
         user.markModified? 'purchased'
         cb? null, _.pick(user,$w 'purchased preferences')
-        ga?.event('purchase', path).send()
+        ga?.event('behavior', 'gems', path).send()
 
       # ------
       # Classes
@@ -937,7 +937,7 @@ api.wrap = (user, main=true) ->
             user.balance -= .75
           _.merge user.stats, {str: 0, con: 0, per: 0, int: 0, points: user.stats.lvl}
           user.flags.classSelected = false
-          ga?.event('purchase', 'changeClass').send()
+          ga?.event('behavior', 'gems', 'changeClass').send()
           #'stats.points': this is handled on the server
         cb? null, _.pick(user,$w 'stats flags items preferences')
 
@@ -1567,7 +1567,7 @@ api.wrap = (user, main=true) ->
       # Analytics
       user.flags.cronCount?=0
       user.flags.cronCount++
-      options.ga?.event('cron', user.flags.cronCount).send(); #TODO userId for cohort
+      options.ga?.event('behavior', 'cron', 'cron', user.flags.cronCount).send(); #TODO userId for cohort
 
       # After all is said and done, progress up user's effect on quest, return those values & reset the user's
       progress = user.party.quest.progress; _progress = _.cloneDeep progress

package.json

@@ -72,7 +72,7 @@
     "node": "0.10.x"
   },
   "scripts": {
-    "test": "./test/run_tests.sh",
+    "test": "./node_modules/coffee-script/bin/coffee ./test/runTests.coffee -n",
     "start": "grunt run:dev",
     "postinstall": "./node_modules/bower/bin/bower --config.interactive=false install -f; ./node_modules/.bin/grunt;",
     "coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html"
@@ -100,8 +100,9 @@
     "mocha": "~1.12.1",
     "mongoskin": "~0.6.1",
     "phantomjssmith": "~0.5.4",
-    "protractor": "~0.14.0",
+    "protractor": "~2.0.0",
     "rimraf": "^2.2.8",
+    "shelljs": "^0.4.0",
     "sinon": "^1.12.2",
     "superagent": "~0.15.7",
     "superagent-defaults": "~0.1.5",

protractor.conf.js

@@ -19,6 +19,6 @@ exports.config = {
   // Options to be passed to Jasmine-node.
   jasmineNodeOpts: {
     showColors: true,
-    defaultTimeoutInterval: 60000
+    defaultTimeoutInterval: 90000
   }
 };

test/e2e/e2e.js

@@ -25,7 +25,7 @@ describe('front page', function() {
 
   it('shows the front page', function(){
     var button = element(by.className('btn'));
-    expect(button.getText()).toEqual('Play');
+    expect(button.getText()).toEqual('Play HabitRPG');
   });
 
   it("don't login when using wrong credentials", function(){
@@ -41,7 +41,7 @@ describe('front page', function() {
     alertDialog.accept();
   });
 
-  it('registers a new user', function(){
+  xit('registers a new user', function(){
     var button = element(by.className('btn'));
     button.click();
     browser.sleep(1000);
@@ -51,7 +51,7 @@ describe('front page', function() {
     element(by.model('registerVals.email')).sendKeys('user@example.com');
     element(by.model('registerVals.password')).sendKeys('pass');
     element(by.model('registerVals.confirmPassword')).sendKeys('pass');
-    var register = element(by.css("#register-tab input[value='Register']"));
+    var register = element(by.css("#registrationForm input[value='Register']"));
     register.click();
     browser.sleep(1000);
     browser.getCurrentUrl().then(function(url){

test/runTests.coffee

@@ -0,0 +1,99 @@
+sh                = require('shelljs')
+async             = require('async')
+TEST_DB           = 'habitrpg_test'
+TEST_DB_URI       = "mongodb://localhost/#{TEST_DB}"
+TEST_SERVER_PORT  = 3001
+MAX_WAIT          = 60
+
+announce = (msg) ->
+  sh.echo '\x1b[36m%s\x1b[0m', "TEST SUITE: #{msg}"
+
+Suite =
+  # Primary Task
+  run: ->
+    announce "Preparing the test environment."
+    Suite.prepareEnvironment ->
+      announce "Test prep complete. Waiting for server availability."
+      Suite.awaitServers ->
+        announce "Servers are ready. Beginning tests."
+        Suite.summarize
+          "API Specs":       Suite.runApiSpecs()
+          "Common Specs":    Suite.runCommonSpecs()
+          "End-to-End Specs": Suite.runE2ESpecs()
+          "Karma Specs":      Suite.runKarmaSpecs()
+
+  # Output summary report when tests are done.
+  summarize: (results) ->
+    anyFailed = 0
+    sh.echo ""
+    announce "Tests complete!\n\nSummary\n-------\n"
+    for name, result of results
+      if result is 0
+        sh.echo '\x1b[36m%s\x1b[0m', "#{name}: \x1b[32mpassing"
+      else
+        anyFailed = 1
+        sh.echo '\x1b[36m%s\x1b[0m', "#{name}: \x1b[31mfailing"
+    sh.echo ""
+    announce "Thanks for helping keep Habitica clean!"
+    process.exit(anyFailed)
+
+  # Prepare files, db, and spin up servers.
+  prepareEnvironment: (cb) ->
+    sh.exec "grunt build:test"
+    sh.exec "mongo \"#{TEST_DB}\" --eval \"db.dropDatabase()\""
+    sh.exec "./node_modules/protractor/bin/webdriver-manager update"
+
+    # Spin this up even if we're not in a headless environment. Shouldn't matter.
+    sh.exec "Xvfb :99 -screen 0 1024x768x24 -extension RANDR", silent: true, async: true
+
+    sh.exec "./node_modules/protractor/bin/webdriver-manager start", silent: true, async: true
+    sh.exec "NODE_DB_URI=\"#{TEST_DB_URI}\" PORT=\"#{TEST_SERVER_PORT}\" node ./website/src/server.js", silent: true, async: true
+    cb()
+
+  # Ensure both the selenium and node servers are available
+  awaitServers: (cb) ->
+    async.parallel [Suite.awaitSelenium, Suite.awaitNode], (err, results) ->
+      throw err if err?
+      cb()
+
+  awaitSelenium: (cb) ->
+    waited = 0
+    interval = setInterval ->
+      if sh.exec('nc -z localhost 4444').code is 0
+        clearInterval(interval)
+        cb()
+      waited += 1
+      if waited > MAX_WAIT
+        clearInterval(interval)
+        cb(new Error("Timed out waiting for Selenium"))
+    , 1000
+
+  awaitNode: (cb) ->
+    waited = 0
+    interval = setInterval ->
+      if sh.exec('nc -z localhost 3001').code is 0
+        clearInterval(interval)
+        cb()
+      waited += 1
+      if waited > MAX_WAIT
+        clearInterval(interval)
+        cb(new Error("Timed out waiting for Node server"))
+    , 1000
+
+  runApiSpecs: ->
+    announce "Running API Specs (Mocha)"
+    sh.exec("NODE_ENV=testing ./node_modules/mocha/bin/mocha test/api.mocha.coffee").code
+
+  runCommonSpecs: ->
+    announce "Running Common Specs (Mocha)"
+    sh.exec("NODE_ENV=testing ./node_modules/mocha/bin/mocha test/common").code
+
+  runE2ESpecs: ->
+    announce "Running End-to-End Specs (Protractor)"
+    sh.exec("DISPLAY=:99 NODE_ENV=testing ./node_modules/protractor/bin/protractor protractor.conf.js").code
+
+  runKarmaSpecs: ->
+    announce "Running Karma Specs"
+    sh.exec("NODE_ENV=testing grunt karma:continuous").code
+
+Suite.run()

test/run_tests.sh

@@ -1,64 +0,0 @@
-#!/bin/bash
-# Configuration
-TEST_DB=habitrpg_test
-TEST_DB_URI="mongodb://localhost/$TEST_DB"
-TEST_SERVER_PORT=3001
-
-# Build assets
-grunt build:test
-
-# Launch Node server and Selenium
-echo "= Recreating test database"
-mongo "$TEST_DB" --eval "db.dropDatabase()"
-
-if [ -z "$TRAVIS" ]; then
-  if [ -z "$1" ] || [ "$1" == "protractor" ]; then
-    ./node_modules/protractor/bin/webdriver-manager update
-    ./node_modules/protractor/bin/webdriver-manager start > /dev/null &
-    trap "curl http://localhost:4444/selenium-server/driver/?cmd=shutDownSeleniumServer" EXIT
-
-    # Wait for selenium
-    MAX_WAIT=30
-    WAITED=0
-    until nc -z localhost 4444; do
-      if [ $WAITED -ge $MAX_WAIT ]; then
-        echo "Waited $MAX_WAIT seconds, but Selenium never responded" >&2
-        kill $NODE_PID
-        exit 1
-      fi
-      sleep 1
-      let 'WAITED+=1'
-    done
-  fi
-fi
-
-NODE_DB_URI="$TEST_DB_URI" PORT=$TEST_SERVER_PORT node ./website/src/server.js > /dev/null &
-NODE_PID=$!
-trap "kill $NODE_PID" EXIT
-
-if [ -z "$1" ] || [ "$1" == "mocha:api" ]; then
-  echo "= Running mocha api unit specs"
-  NODE_ENV=testing mocha || exit $?
-fi
-
-if [ -z "$1" ] || [ "$1" == "mocha:common" ]; then
-  echo "= Running mocha common unit specs"
-  NODE_ENV=testing mocha test/common || exit $?
-fi
-
-# If we're only running protractor, we need to let the server spin up.
-if [ "$1" == "protractor" ]; then
-  sleep 2
-fi
-
-if [ -z "$TRAVIS" ]; then
-  if [ -z "$1" ] || [ "$1" == "protractor" ]; then
-    echo "= Running protractor specs"
-    NODE_ENV=testing ./node_modules/protractor/bin/protractor protractor.conf.js || exit $?
-  fi
-fi
-
-if [ -z "$1" ] || [ "$1" == "karma" ]; then
-  echo "= Running karma specs"
-  NODE_ENV=testing grunt karma:continuous || exit $?
-fi

website/public/js/controllers/challengesCtrl.js

@@ -58,7 +58,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
       var groupsWithChallenges = _.uniq(_.pluck($scope.groupsFilter, '_id'));
       var len = groupsWithChallenges.length;
       var filterCount = 0;
-      
+
       for ( var i = 0; i < len; i += 1 ) {
         if ( $scope.search.group[groupsWithChallenges[i]] == true ) {
           filterCount += 1;
@@ -186,11 +186,11 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
       delete listDef.newTask;
     };
 
-    $scope.removeTask = function(list, $index) {
+    $scope.removeTask = function(task, list) {
       if (!confirm(window.env.t('sureDelete'))) return;
       //TODO persist
       // User.log({op: "delTask", data: task});
-      list.splice($index, 1);
+      _.remove(list, task);
     };
 
     $scope.saveTask = function(task){

website/public/js/controllers/footerCtrl.js

@@ -28,7 +28,7 @@ function($scope, $rootScope, User, $http, Notification, ApiUrl) {
     // Google Analytics, only in production
     if (window.env.NODE_ENV === 'production') {
       // Get experiments API
-      $.getScript('//www.google-analytics.com/cx/api.js?experiment=wud1Ba5qT1m9qR3PP0-Mmg', function(){
+      $.getScript('//www.google-analytics.com/cx/api.js?experiment=pi26hZ3rRFaEPNiKqXbhqA', function(){
         $rootScope.variant = cxApi.chooseVariation();
         $rootScope.$apply();
 

website/public/js/controllers/tasksCtrl.js

@@ -84,9 +84,9 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
       }
     };
 
-    $scope.removeTask = function(list, $index) {
+    $scope.removeTask = function(task) {
       if (!confirm(window.env.t('sureDelete'))) return;
-      User.user.ops.deleteTask({params:{id:list[$index].id}})
+      User.user.ops.deleteTask({params:{id:task.id}})
     };
 
     $scope.saveTask = function(task, stayOpen, isSaveAndClose) {