Skip to content

Commit 0aaf6d6

Browse files
committed
Merge branch 'origin/develop' into Weblate.
2 parents 19ae042 + 5d70ed9 commit 0aaf6d6

440 files changed

Lines changed: 1047 additions & 361 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

website/common/locales/en_GB/front.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"marketing2Lead2": "Take on one of our hundreds of Quests with a Party of friends to enter the fray. Quest monsters push your accountability to the max. Forgetting to floss means damage done to everyone!",
3939
"marketing2Lead3Title": "Challenge each other",
4040
"marketing2Lead3": "Join Challenges made by our community to get curated task lists that fit your interests and goals. Do your best to compete for the Gem prize awarded to the winner!",
41-
"marketing3Header": "Android & iOS Apps",
41+
"marketing3Header": "More ways to use Habitica",
4242
"marketing3Lead1": "You can get Habitica on your Android or iOS device to check off tasks anywhere. Check out our award winning apps for a fresh approach to getting things done.",
4343
"marketing3Lead2Title": "Open-Source Community",
4444
"marketing3Lead2": "We're proud to be an open-source project that welcomes contributions from our dedicated community. Make Habitica fit your own needs or contribute to improve the experience of all players around the world. Visit us on [GitHub](https://github.com/habitrpg) to learn more!",

website/common/locales/en_GB/generic.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"titleSeasonalShop": "Seasonal Shop",
1010
"saveEdits": "Save Edits",
1111
"showMore": "Show More",
12-
"showLess": "Show Fewer",
12+
"showLess": "Show Less",
1313
"markdownHelpLink": "Markdown formatting help",
1414
"bold": "**Bold**",
1515
"code": "`code`",
Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
{
2-
"needTips": "Need some tips on how to begin? Here's a straightforward guide!",
3-
4-
"step1": "Step 1: Enter Tasks",
5-
"webStep1Text": "Habitica is nothing without real-world goals, so enter a few tasks. You can add more later as you think of them! All tasks can be added by clicking the green \"Create\" button.\n* **Set up To Do's:** Enter tasks you do once or rarely in the To Do's column, one at a time. You can click on the tasks to edit them and add checklists, due dates, and more!\n* **Set up Dailies:** Enter activities you need to do daily or on a particular day of the week, month, or year in the Dailies column. Click task to edit when it will be due and/or set a start date. You can also make it due on a repeating basis, for example, every 3 days.\n* **Set up Habits:** Enter habits you want to establish in the Habits column. You can edit the Habit to change it to just a good habit :heavy_plus_sign: or a bad habit :heavy_minus_sign:\n* **Set up Rewards:** In addition to the in-game Rewards offered, add activities or treats which you want to use as a motivation to the Rewards column. It's important to give yourself a break or allow some indulgence in moderation!",
6-
7-
"step2": "Step 2: Gain Points by Doing Things in Real Life",
8-
"webStep2Text": "Now, start tackling your goals from the list! As you complete tasks and check them off in Habitica, you will gain Experience, which helps you level up, and Gold, which allows you to purchase Rewards. If you fall into bad habits or miss your Dailies, you will lose Health. In that way, the Habitica Experience and Health bars serve as a fun indicator of your progress toward your goals. You'll start seeing your real life improve as your character advances in the game.",
9-
10-
"step3": "Step 3: Customize and Explore Habitica",
11-
"webStep3Text": "Once you're familiar with the basics, you can get even more out of Habitica with these nifty features:\n * Organize your Tasks with tags (edit a Task to add them).\n * Customize your Avatar by clicking the user icon in the upper-right corner.\n * Buy your Equipment under Rewards or from the Shops, and change it under Inventory > Equipment.\n * Connect with other users via the Looking for Party tool.\n * Hatch Pets by collecting Eggs and Hatching Potions. Feed them to create Mounts.\n * At level 10: Choose a particular Class and then use Class-specific skills (levels 11 to 14).\n * Form a Party with your friends (by clicking Party in the navigation bar) to stay accountable and earn a Quest scroll.\n * Defeat monsters and collect objects on Quests (you will be given a quest at level 15).",
12-
13-
"overviewQuestionsRevised": "Have questions? Check out the <%= faqLink %>FAQ<%= linkClose %>! If your question isn’t mentioned there, you can reach out from the Help section in the menu, or <%= adminLink %>contact us<%= linkClose %> directly."
2+
"needTips": "Need some tips on how to begin? Here's a straightforward guide!",
3+
"step1": "Step 1: Enter Tasks",
4+
"webStep1Text": "Habitica is nothing without real-world goals, so enter a few tasks. You can add more later as you think of them! All tasks can be added by clicking the green \"Create\" button.\n* **Set up To Do's:** Enter tasks you do once or rarely in the To Do's column, one at a time. You can click on the tasks to edit them and add checklists, due dates, and more!\n* **Set up Dailies:** Enter activities you need to do daily or on a particular day of the week, month, or year in the Dailies column. Click task to edit when it will be due and/or set a start date. You can also make it due on a repeating basis, for example, every 3 days.\n* **Set up Habits:** Enter habits you want to establish in the Habits column. You can edit the Habit to change it to just a good habit :heavy_plus_sign: or a bad habit :heavy_minus_sign:\n* **Set up Rewards:** In addition to the in-game Rewards offered, add activities or treats which you want to use as a motivation to the Rewards column. It's important to give yourself a break or allow some indulgence in moderation!",
5+
"step2": "Step 2: Gain Points by Doing Things in Real Life",
6+
"webStep2Text": "Now, start tackling your goals from the list! As you complete tasks and check them off in Habitica, you will gain Experience, which helps you level up, and Gold, which allows you to purchase Rewards. If you fall into bad habits or miss your Dailies, you will lose Health. In that way, the Habitica Experience and Health bars serve as a fun indicator of your progress toward your goals. You'll start seeing your real life improve as your character advances in the game.",
7+
"step3": "Step 3: Customise and Explore Habitica",
8+
"webStep3Text": "Once you’re familiar with the basics, you can get even more out of Habitica with these nifty features:\n * Organise your Tasks with tags (edit a Task to add them).\n * Customise your Avatar by clicking the user icon in the upper-right corner.\n * Buy your Equipment under Rewards or from the Shops, and change it under Inventory > Equipment.\n * Connect with other users via the Looking for Party tool.\n * Hatch Pets by collecting Eggs and Hatching Potions. Feed them to create Mounts.\n * At level 10: Choose a particular Class and then use Class-specific skills (levels 11 to 14).\n * Form a Party with your friends (by clicking Party in the navigation bar) to stay accountable and earn a Quest scroll.\n * Defeat monsters and collect objects on Quests (you will be given a quest at level 15).",
9+
"overviewQuestionsRevised": "Have questions? Check out the <%= faqLink %>FAQ<%= linkClose %>! If your question isn’t mentioned there, you can reach out from the Help section in the menu, or <%= adminLink %>contact us<%= linkClose %> directly."
1410
}

website/common/locales/en_GB/subscriber.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,5 +278,6 @@
278278
"subscriptionBillingFYI": "Subscriptions automatically renew unless you cancel at least 24 hours before the end of the current period. You can manage your subscription from the Subscription tab in the settings. Your account will be charged within 24 hours of your renewal date, at the same price you initially paid.",
279279
"mysterySet202606": "Holiday Hammock Set",
280280
"mysterySet202607": "Oceanmancer Set",
281-
"mysterySet202608": "Beaming Blades Set"
281+
"mysterySet202608": "Beaming Blades Set",
282+
"giftGems": "Want to bestow a shiny haul of Gems on someone else?"
282283
}

website/common/locales/es_419/character.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"communityGuidelinesWarning": "Ten en cuenta que tu nombre para mostrar, foto de perfil y sección \"Sobre mí\" deben cumplir con las <%= linkOpen %>Normas de la Comunidad<%= linkClose %> (por ejemplo, nada de comentarios obscenos, temas inapropiados para menores de edad, insultos, etc.). Si tienes preguntas sobre si algo es apropiado o no, por favor comunícate al correo electrónico <%= adminEmail %>!",
2+
"communityGuidelinesWarning": "Tené en cuenta que tu nombre público, foto de perfil y sección _Sobre mí_ deben cumplir con las <%= linkOpen %>Normas de la Comunidad<%= linkClose %> (por ejemplo, nada de obscenidades, temas inapropiados para menores de edad, insultos, etc.). Si tenés preguntas sobre si algo es apropiado o no, ¡sentite libre de comunicarte al correo electrónico <%= adminEmail %>!",
33
"profile": "Perfil",
44
"avatar": "Personalizar avatar",
5-
"editAvatar": "Personalizar Personaje",
6-
"noDescription": "Este Habiticano no ha añadido una descripción.",
7-
"noPhoto": "Este Habiticano no ha añadido una foto.",
5+
"editAvatar": "Personalizar avatar",
6+
"noDescription": "Este Habiticano no tiene descripción.",
7+
"noPhoto": "Este Habiticano no tiene foto de perfil.",
88
"other": "Otro",
99
"fullName": "Nombre completo",
10-
"displayName": "Nombre Público",
10+
"displayName": "Nombre público",
1111
"changeDisplayName": "Cambiar Nombre Público",
1212
"newDisplayName": "Nuevo Nombre Público",
1313
"displayBlurbPlaceholder": "Por favor, preséntate",
@@ -129,7 +129,7 @@
129129
"healerText": "Los Sanadores son inmunes al daño y extienden esa protección a otros. El no cumplir Diarias y los malos Hábitos no les afectan demasiado y tienen maneras de recuperar la Salud tras un fallo. ¡Juega como un Sanador si disfrutas de ayudar a otros en tu grupo o si la idea de engañar a la muerte a través del trabajo duro te inspira!",
130130
"optOutOfClasses": "No usar",
131131
"chooseClass": "Elige tu clase",
132-
"chooseClassLearnMarkdown": "[Aprende más sobre el sistema de clases de Habitica](/static/faq#what-classes)",
132+
"chooseClassLearnMarkdown": "[Aprendé más sobre el sistema de clases de Habitica](<%= classLink %>)",
133133
"optOutOfClassesText": "No quieres tomarte la molestia de las clases? Si Quieres elegir luego puedes leer <%= linkOpen %>our FAQ<%= linkClose %> y elegir en tu Configuración para habilitar el sistema de clases.",
134134
"selectClass": "Seleccionar <%= heroClass %>",
135135
"select": "Seleccionar",

website/common/locales/fr/subscriber.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,5 +278,6 @@
278278
"mysterySet202603": "Ensemble Mage de la Glycine",
279279
"mysterySet202607": "Ensemble Océanmancien",
280280
"mysterySet202606": "Ensemble Hamac de Vacances",
281-
"mysterySet202608": "Ensemble Lames Lumineuses"
281+
"mysterySet202608": "Ensemble Lames Lumineuses",
282+
"giftGems": "Vous souhaitez offrir un butin étincelant de Gemmes à quelqu'un·e d'autre ?"
282283
}

website/common/locales/ja/character.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"gearAchievement": "クラスの最上級の装備セットを入手したため、「アルティメット・ギア」の実績を解除しました! あなたは以下の全てのセットを手に入れています:",
6363
"gearAchievementNotification": "クラスの最上級の装備セットを入手したため、「アルティメット・ギア」の実績を解除しました!",
6464
"moreGearAchievements": "他の「アルティメット・ギア」のバッジを手にするには、<%= linkOpen %>設定>サイトのページ<%= linkClose %>でクラスを変えて、新しいクラスの装備を買いましょう!",
65-
"armoireUnlocked": "もっと装備品がほしいですか?<strong>ラッキー宝箱</strong>をチェックしましょう!ごほうびの「ラッキー宝箱」をクリックすると、ランダムで特別な装備が当たります!経験値やえさが当たることもあります。",
65+
"armoireUnlocked": "もっと装備品がほしいですか?<strong>ラッキー宝箱</strong>をチェックしましょう!ごほうびの「ラッキー宝箱」をクリックすると、ランダムで特別な装備が当たるかもしれません!経験値やえさが当たることもあります。",
6666
"ultimGearName": "アルティメット・ギア - <%= ultClass %>",
6767
"ultimGearText": "<%= ultClass %>のクラスにおいて最上級の武器防具を揃えました。",
6868
"level": "レベル",

0 commit comments

Comments
 (0)