Skip to content

Commit 2007a87

Browse files
committed
Merge branch 'origin/develop' into Weblate.
2 parents 87bcd69 + a834803 commit 2007a87

89 files changed

Lines changed: 987 additions & 321 deletions

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/bg/npc.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
"success": "Готово!",
8989
"classGear": "Снаряжение за класа",
9090
"classGearText": "Поздравления за избора на клас! Добавих новата Ви основна екипировка в инвентара Ви. Погледнете по-долу, за да я екипирате!",
91-
"autoAllocate": "Автоматично разпределяне",
9291
"spells": "Умения",
9392
"skillsTitle": "Умения",
9493
"toDo": "Задача",

website/common/locales/cs/npc.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
"success": "Úspěch!",
8989
"classGear": "Vybavení pro tvé povolání",
9090
"classGearText": "Gratuluji k vybrání povolání! Přidal jsem ti základní zbraň do tvého inventáře. Podívej se dolů a vybav se!",
91-
"autoAllocate": "Připisovat automaticky",
9291
"spells": "Dovednosti",
9392
"skillsTitle": "<%= classStr %> Dovednosti",
9493
"toDo": "úkol",

website/common/locales/da/npc.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
"success": "Succes!",
8989
"classGear": "Klasseudstyr",
9090
"classGearText": "Tillykke med at vælge klasse! Jeg har tilføjet dit nye basisudstyr til dit inventar. Tag et kig forneden og tag det på!",
91-
"autoAllocate": "Tildel automatisk",
9291
"spells": "Evner",
9392
"skillsTitle": "<%= classStr %> Evner",
9493
"toDo": "To Do",

website/common/locales/de/gear.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3444,5 +3444,8 @@
34443444
"weaponSpecialWinter2026WarriorNotes": "Sensen helfen beim Schneiden, Ernten und beim Abdecken großer Bereiche - alles Dinge, die du beim Verfeinern von Aufgabenlisten brauchst. Erhöht Stärke um <%= str %>. Limitierte Ausgabe Winterausrüstung 2025-2026.",
34453445
"weaponSpecialWinter2026RogueText": "Skistock",
34463446
"weaponSpecialWinter2026RogueNotes": "Stistöcke helfen dir dabei, Balance, Stabilität und Timing zu wahren - alles Dinge, die du brauchst, um wirklich produktiv zu sein. Erhöht Stärke um <%= str %>. Limitierte Ausgabe Winterausrüstung 2025-2026.",
3447-
"weaponSpecialWinter2026HealerText": "Polarstab"
3447+
"weaponSpecialWinter2026HealerText": "Polarstab",
3448+
"weaponSpecialWinter2026HealerNotes": "Stäbe dienen als Stütze, Stabilitätshilfe und zur Richtungsfindung - alles Dinge, die dir beim Bezwingen einer Aufgabenliste wirklich helfen. Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe Winterausrüstung 2025-2026.",
3449+
"weaponSpecialWinter2026MageNotes": "Kandelaber helfen, indem sie mehrere Kerzen gleichzeitig halten - folge diesem Beispiel, wenn du das nächste Mal multitasken musst. Erhöht Intelligenz um <%= int %> und Wahrnehmung um <%= per %>. Limitierte Ausgabe Winterausrüstung 2025-2026.",
3450+
"weaponSpecialWinter2026MageText": "Kandelaber Stab"
34483451
}

website/common/locales/de/npc.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
"success": "Erfolg!",
8989
"classGear": "Klassenausrüstung",
9090
"classGearText": "Glückwunsch zur Wahl Deiner Klasse! Ich habe Deine neue Basiswaffe dem Inventar hinzugefügt. Schaue sie Dir unten an, um sie auszurüsten!",
91-
"autoAllocate": "Automatische Verteilung",
9291
"spells": "Fertigkeiten",
9392
"skillsTitle": "<%= classStr %> Fertigkeiten",
9493
"toDo": "To-Do",

website/common/locales/en_GB/gear.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
"weaponSpecialFallMageText": "Magic Broom",
145145
"weaponSpecialFallMageNotes": "This enchanted broom flies faster than a dragon! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2014 Autumn Gear.",
146146
"weaponSpecialFallHealerText": "Scarab Wand",
147-
"weaponSpecialFallHealerNotes": "The scarab on this wand protects and heals its wielder. Increases Intelligence by <%= int %>. Limited Edition Autumn Gear 2014.",
147+
"weaponSpecialFallHealerNotes": "The scarab on this wand protects and heals its wielder. Increases Intelligence by <%= int %>. Limited Edition 2014 Autumn Gear.",
148148
"weaponSpecialWinter2015RogueText": "Ice Spike",
149149
"weaponSpecialWinter2015RogueNotes": "You truly, definitely, absolutely just picked these up off of the ground. Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.",
150150
"weaponSpecialWinter2015WarriorText": "Gumdrop Sword",

website/common/locales/en_GB/groups.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,5 +426,7 @@
426426
"groupParentChildren": "Using with my household",
427427
"groupFriends": "Using with friends",
428428
"groupManager": "Using for work",
429-
"groupTeacher": "Using for education"
429+
"groupTeacher": "Using for education",
430+
"groupPlanBillingFYI": "Group Plan subscriptions will automatically renew unless you cancel at least 24 hours before the end of your current period. You can cancel from the Group Billing tab of your Group Plan. You will be charged within 24 hours before your subscription renews, based on the number of members in your Group Plan at that time. If you add members between payment periods, you will see an additional pro-rated charge for their benefits in your next billing cycle.",
431+
"groupPlanBillingFYIShort": "Group Plan subscriptions will automatically renew unless you cancel at least 24 hours before the end of your current period. You can cancel from the Group Billing tab of your Group Plan. You will be charged within 24 hours before your subscription renews, based on the number of members in your Group Plan at that time. If you add members between payment periods, you will see an additional pro-rated charge for their benefits in your next billing cycle."
430432
}

website/common/locales/en_GB/npc.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
"success": "Success!",
8989
"classGear": "Class Gear",
9090
"classGearText": "Congratulations on choosing a class! I've added your new basic weapon to your inventory. Take a look below to equip it!",
91-
"autoAllocate": "Auto Allocate",
9291
"spells": "Skills",
9392
"skillsTitle": "<%= classStr %> Skills",
9493
"toDo": "To Do",

website/common/locales/en_GB/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,5 +270,8 @@
270270
"performanceAnalytics": "Performance and Analytics",
271271
"usedForSupport": "These are used to improve the user experience, performance, and services of our website and apps. This data is used by our support team when handling requests and bug reports.",
272272
"savePreferences": "Save Preferences",
273-
"habiticaPrivacyPolicy": "Habitica's Privacy Policy"
273+
"habiticaPrivacyPolicy": "Habitica's Privacy Policy",
274+
"learnMorePrivacy": "To learn more, review our <a href='/static/privacy' target='_blank'>Privacy Policy</a>.",
275+
"gpcWarning": "<a href='<%= url %>' target='_blank'>GPC</a> is enabled. Turning on tracking below will override this setting and send data to our analytics partners.",
276+
"gpcPlusAnalytics": "<a href='<%= url %>' target='_blank'>GPC</a> is enabled. You have opted in to tracking and to sending data to our analytics partners."
274277
}

website/common/locales/es/gear.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,7 +2329,7 @@
23292329
"bodyArmoireClownsBowtieNotes": "Una buena pajarita no es ninguna broma, incluso para un payaso. Aumenta la fuerza, inteligencia, constitución y percepción en <%= attrs %> cada uno. Armario Encantado: conjunto de payaso (artículo 5 de 5).",
23302330
"shieldArmoireChocolateFoodNotes": "A todo el mundo le gusta el chocolate, pero a unas mascotas más que a otras... Aumenta la inteligencia en <%= int %>. Armario Encantado: conjunto de comida para mascotas (artículo 8 de 10).",
23312331
"shieldArmoireBagpipesText": "Gaitas",
2332-
"headAccessoryMystery202004Notes": "Se mueven un poco si detectan el aroma de las flores, ¡utilízalas para encontrar un bonito jardín! No otorga ningún beneficio. Artículo de suscriptor de abril 2020.",
2332+
"headAccessoryMystery202004Notes": "Se mueven un poco si detectan el aroma de las flores¡utilízalas para encontrar un bonito jardín! No otorga ningún beneficio. Artículo de suscriptor de abril 2020.",
23332333
"shieldArmoireLifeBuoyText": "Boya salvavidas",
23342334
"shieldArmoirePiratesCompanionNotes": "Perfecto si quieres matar a hablar a tus enemigos, porque este loro nunca se calla. ¡Quizás también te recuerde tus tareas! Aumenta la percepción en <%= per %>. Armario Encantado: conjunto pirata (artículo 3 de 3).",
23352335
"headAccessoryMystery202109Notes": "Capta el aroma de las flores en la brisa o la esencia del cambio en el viento. No otorga ningún beneficio. Artículo de suscriptor de septiembre 2021.",
@@ -3487,5 +3487,13 @@
34873487
"headMystery202602Notes": " Tu percepción de los sonidos será tan aguzada debido a estas orejas, que podrás escuchar no solo una mano aplaudiendo sola, si no también el florecimiento de las hermosas florecillas cuando la primavera se vaya acercando, florecilla. No otorga ningún beneficio. Artículo de Suscriptor Febrero 2026.",
34883488
"headArmoireLoneCowpokeHatText": "Sombrero de Vaquero Solitario",
34893489
"shieldSpecialWinter2026WarriorText": "Escudo Escarcha",
3490-
"shieldSpecialWinter2026HealerText": "Explosión Estelar"
3490+
"shieldSpecialWinter2026HealerText": "Explosión Estelar",
3491+
"shieldArmoirePrettyPinkGiftBoxNotes": "¿Es este regalo para un buen amigo? ¿Un familiar apreciado? ¿Tu amor verdadero? ¿Un admirador secreto, mi tessssorooo? Sea para quien sea estará encantado de tenerlo, mejor que en los bolsillos de ese sucio hobbit preciossssso mío. Aumenta todas las estadisticas en <%= attrs %>. Armario Encantado: Conjunto Hermosa en Rosa (Artículo 2 de 2)",
3492+
"backMystery202601Notes": "Este sello concede a quien lo usa el control de los elementos en la estación del frío y la escarcha, imbuido en el corazón de la disformidad. No otorga ningún beneficio. Artículo de Suscriptor Enero 2026.",
3493+
"backMystery202602Notes": "Estas esponjosas colas son del color del cerezo en flor, ¡un recordatorio de que la primavera siempre llega! No otorga ningún beneficio. Artículo de Suscriptor Febrero 2026.",
3494+
"shieldArmoirePrettyPinkGiftBoxText": "Hermoso Regalo Rosa",
3495+
"backMystery202601Text": "Símbolo Invernal",
3496+
"backMystery202602Text": "Las Cinco Colas de Sakura",
3497+
"backArmoireHarpsichordText": "Clavicémbalo",
3498+
"backArmoireHarpsichordNotes": "¡Duing! ¡Ding! Reúne a tu equipo ya sea para un almuerzo campestre o un picnic, algo totalmente diferente a lo anterior, y una vez allí deleita sus pabellones auditivos mientras interpretas Highway to Hell en tu clavicémbalo. Aumenta la Percepción y la Inteligencia en <%= attrs %> cada uno.Armario Encantado: Conjunto Instrumentos Musicales 2 (Artículo 1 de 3)"
34913499
}

0 commit comments

Comments
 (0)