diff --git a/Band of Blades Official/translations/fr.json b/Band of Blades Official/translations/fr.json index 0522de8f7f..d7a72810a1 100644 --- a/Band of Blades Official/translations/fr.json +++ b/Band of Blades Official/translations/fr.json @@ -70,11 +70,7 @@ "annals_tale_will_q3": "Combien ont survécus et comment ont-il rebâti la Légion ?", "annals_tale_will_top": "Retracez l'histoire de la volonté inflexible de la Légion", "armor": "Armure", -<<<<<<< Updated upstream - "armor_heavy": "Roc", -======= "armor_heavy": "Lourde", ->>>>>>> Stashed changes "assignment": "Affectation", "athletic": "Athlétique", "back_at_camp": "Retour au camp", @@ -715,11 +711,7 @@ "role_spymaster": "Maître des espions", "roll_fortune": "Faire un jet de chance", "roll_inf": "Jet", -<<<<<<< Updated upstream - "rolls": "jets", -======= "rolls": "obtient", ->>>>>>> Stashed changes "rolls_for_an": "obtenir un résultat de", "rookie_promotion_desc": "Votre Bleu n'en est plus un et va devenir un Soldat ! Vous gagnez une capacité spéciale et un rang en tripes. ", "rot": "Putréfaction", diff --git a/Dark_Heresy/translations/zu.json b/Dark_Heresy/translations/zu.json index 1f2764dd59..d974bb5f4e 100644 --- a/Dark_Heresy/translations/zu.json +++ b/Dark_Heresy/translations/zu.json @@ -153,20 +153,10 @@ "threshold:": "crwdns42683:0crwdne42683:0", "tohit": "crwdns42684:0crwdne42684:0", "target:": "crwdns42685:0crwdne42685:0", -<<<<<<< Updated upstream - "aim:": "crwdns159496:0crwdne159496:0", - "attacktype:": "crwdns159498:0crwdne159498:0", - "modifier:": "crwdns159500:0crwdne159500:0", - "success": "crwdns159502:0crwdne159502:0", - "failure": "crwdns159504:0crwdne159504:0", - "with": "crwdns159506:0crwdne159506:0", - "degrees": "crwdns159508:0crwdne159508:0", -======= "success:": "crwdns171282:0crwdne171282:0", "failure:": "crwdns171284:0crwdne171284:0", "degreesofsuccess": "crwdns171286:0crwdne171286:0", "degreesoffailure": "crwdns171288:0crwdne171288:0", ->>>>>>> Stashed changes "player-sheet-u": "crwdns82798:0crwdne82798:0", "psykana-u": "crwdns82800:0crwdne82800:0", "name-u": "crwdns82802:0crwdne82802:0", diff --git a/Deadlands Classic Anniversary - Improved/translations/zu.json b/Deadlands Classic Anniversary - Improved/translations/zu.json index 09a695dc7e..96cafbfafe 100644 --- a/Deadlands Classic Anniversary - Improved/translations/zu.json +++ b/Deadlands Classic Anniversary - Improved/translations/zu.json @@ -30,11 +30,7 @@ "coreAttributes": "crwdns152088:0crwdne152088:0", "cost": "crwdns152090:0crwdne152090:0", "critical": "crwdns152092:0crwdne152092:0", -<<<<<<< Updated upstream - "currentShots": "crwdns159810:0crwdne159810:0", -======= "currentShots": "crwdns171290:0crwdne171290:0", ->>>>>>> Stashed changes "damage": "crwdns152096:0crwdne152096:0", "defense": "crwdns152098:0crwdne152098:0", "deftness": "crwdns152100:0crwdne152100:0", @@ -134,11 +130,7 @@ "sheetTabbedDisplay": "crwdns159838:0crwdne159838:0", "sheetTabbedDisplayDescription": "crwdns159840:0crwdne159840:0", "shooting": "crwdns152262:0crwdne152262:0", -<<<<<<< Updated upstream - "shootingIronsAndSuch": "crwdns159842:0crwdne159842:0", -======= "shootingIronsAndSuch": "crwdns171292:0crwdne171292:0", ->>>>>>> Stashed changes "shots": "crwdns152266:0crwdne152266:0", "size": "crwdns152268:0crwdne152268:0", "skill": "crwdns152270:0crwdne152270:0", @@ -171,10 +163,7 @@ "upperGuts": "crwdns152316:0crwdne152316:0", "vigor": "crwdns152318:0crwdne152318:0", "weapon": "crwdns152320:0crwdne152320:0", -<<<<<<< Updated upstream -======= "weaponDamage": "crwdns171294:0crwdne171294:0", ->>>>>>> Stashed changes "wind": "crwdns152324:0crwdne152324:0", "worstNightmare": "crwdns152326:0crwdne152326:0", "woundMod": "crwdns159852:0crwdne159852:0", diff --git a/Eclipse Phase Alternate/translations/zu.json b/Eclipse Phase Alternate/translations/zu.json index 663d02a7f2..53e371244e 100644 --- a/Eclipse Phase Alternate/translations/zu.json +++ b/Eclipse Phase Alternate/translations/zu.json @@ -112,12 +112,7 @@ "effect-game": "crwdns71751:0crwdne71751:0", "effect-game-example": "crwdns71752:0crwdne71752:0", "effect-name": "crwdns71753:0crwdne71753:0", -<<<<<<< Updated upstream - "effects": "crwdns168094:0crwdne168094:0", - "effects-active-summary": "crwdns168096:0crwdne168096:0", -======= "effects": "crwdns171314:0crwdne171314:0", ->>>>>>> Stashed changes "energy": "crwdns65443:0crwdne65443:0", "equipment": "crwdns65444:0crwdne65444:0", "equipment-description": "crwdns65445:0crwdne65445:0", diff --git a/GURPS/translations/zu.json b/GURPS/translations/zu.json index 061d254f8f..c6b75f2b29 100644 --- a/GURPS/translations/zu.json +++ b/GURPS/translations/zu.json @@ -47,17 +47,10 @@ "tab-grimoire": "crwdns156950:0crwdne156950:0", "tab-updates": "crwdns156952:0crwdne156952:0", "attributes-label": "crwdns156954:0crwdne156954:0", -<<<<<<< Updated upstream - "abbreviation-modifier-label": "crwdns159854:0crwdne159854:0", - "attributes-modifier-tooltip": "crwdns156958:0crwdne156958:0", - "abbreviation-character-points-label": "crwdns156960:0crwdne156960:0", - "abbreviation-strength": "crwdns168030:0crwdne168030:0", -======= "abbreviation-modifier-label": "crwdns171296:0crwdne171296:0", "attributes-modifier-tooltip": "crwdns156958:0crwdne156958:0", "abbreviation-character-points-label": "crwdns156960:0crwdne156960:0", "abreviation-strength": "crwdns171298:0crwdne171298:0", ->>>>>>> Stashed changes "attributes-strength-tooltip": "crwdns156964:0crwdne156964:0", "abbreviation-dexterity": "crwdns156966:0crwdne156966:0", "attributes-dexterity-tooltip": "crwdns156968:0crwdne156968:0", @@ -88,11 +81,7 @@ "abbreviation-knock-down": "crwdns157016:0crwdne157016:0", "attribute-knock-down-tooltip": "crwdns157018:0crwdne157018:0", "abbreviation-unconscious": "crwdns157020:0crwdne157020:0", -<<<<<<< Updated upstream - "attribute-unconscious-check-tooltip": "crwdns168034:0crwdne168034:0", -======= "attribute-unconscious-check-tooltip": "crwdns171300:0crwdne171300:0", ->>>>>>> Stashed changes "abbreviation-death-check": "crwdns157024:0crwdne157024:0", "attribute-death-check-tooltip": "crwdns157026:0crwdne157026:0", "speed-label": "crwdns157028:0crwdne157028:0", @@ -228,11 +217,7 @@ "standing-broad-jump-label": "crwdns157288:0crwdne157288:0", "standing-broad-jump-tooltip": "crwdns157290:0crwdne157290:0", "running-broad-jump-label": "crwdns157292:0crwdne157292:0", -<<<<<<< Updated upstream - "running-broad-jump-tooltip": "crwdns168036:0crwdne168036:0", -======= "running-broad-jump-tooltip": "crwdns171302:0crwdne171302:0", ->>>>>>> Stashed changes "high-jump-label": "crwdns157296:0crwdne157296:0", "high-jump-tooltip": "crwdns157298:0crwdne157298:0", "run-high-jump-label": "crwdns157300:0crwdne157300:0", @@ -366,11 +351,7 @@ "row-id-repeating-tooltip": "crwdns157534:0crwdne157534:0", "link-label": "crwdns157536:0crwdne157536:0", "link-to-row-id-tooltip": "crwdns157538:0crwdne157538:0", -<<<<<<< Updated upstream - "copy-paste-row-id-tooltip": "crwdns159856:0crwdne159856:0", -======= "copy-paste-row-id-tooltip": "crwdns171304:0crwdne171304:0", ->>>>>>> Stashed changes "name-label": "crwdns157542:0crwdne157542:0", "hit-location-label": "crwdns157544:0crwdne157544:0", "hit-location-tooltip": "crwdns157546:0crwdne157546:0", @@ -413,11 +394,7 @@ "damage-type-tooltip": "crwdns157610:0crwdne157610:0", "reach-label": "crwdns157612:0crwdne157612:0", "melee-reach-tooltip": "crwdns157614:0crwdne157614:0", -<<<<<<< Updated upstream - "modifier-tooltip": "crwdns159858:0crwdne159858:0", -======= "modifier-tooltip": "crwdns171306:0crwdne171306:0", ->>>>>>> Stashed changes "weapon-notes-label": "crwdns157618:0crwdne157618:0", "melee-weapon-notes-tooltip": "crwdns157620:0{Location|Head|Torso}crwdne157620:0", "damage-notes-label": "crwdns157622:0crwdne157622:0", diff --git a/L5R/translations/zu.json b/L5R/translations/zu.json index 0343a13873..468d8d9851 100644 --- a/L5R/translations/zu.json +++ b/L5R/translations/zu.json @@ -23,15 +23,9 @@ "+10-to-insight-u": "crwdns38399:0crwdne38399:0", "etiquette-bonus-u": "crwdns38400:0crwdne38400:0", "traits-u": "crwdns38401:0crwdne38401:0", -<<<<<<< Updated upstream - "skills-u": "crwdns159862:0crwdne159862:0", - "weapons-u": "crwdns159864:0crwdne159864:0", - "spells-u": "crwdns159866:0crwdne159866:0", -======= "skills-u": "crwdns171308:0crwdne171308:0", "weapons-u": "crwdns171310:0crwdne171310:0", "spells-u": "crwdns171312:0crwdne171312:0", ->>>>>>> Stashed changes "air-u": "crwdns38405:0crwdne38405:0", "reflexes-u": "crwdns38406:0crwdne38406:0", "awareness-u": "crwdns38407:0crwdne38407:0", diff --git a/Monster of the Week/translations/zu.json b/Monster of the Week/translations/zu.json index e410cc0571..0c491a37b0 100644 --- a/Monster of the Week/translations/zu.json +++ b/Monster of the Week/translations/zu.json @@ -1011,21 +1011,10 @@ "sidekick-fixed-move1": "crwdns151192:0crwdne151192:0", "sidekick-move1": "crwdns151194:0crwdne151194:0", "sidekick-move2": "crwdns151196:0crwdne151196:0", -<<<<<<< Updated upstream - "sidekick-move3": "crwdns171210:0crwdne171210:0", - "sidekick-move3.1": "crwdns171212:0crwdne171212:0", - "sidekick-move3.2": "crwdns171214:0crwdne171214:0", - "sidekick-move3.3": "crwdns171216:0crwdne171216:0", - "sidekick-move4": "crwdns171218:0crwdne171218:0", - "sidekick-move5": "crwdns171220:0crwdne171220:0", - "sidekick-move6": "crwdns171222:0crwdne171222:0", - "sidekick-move7": "crwdns171224:0crwdne171224:0", -======= "sidekick-move3": "crwdns171334:0crwdne171334:0", "sidekick-move4": "crwdns171336:0crwdne171336:0", "sidekick-move5": "crwdns171338:0crwdne171338:0", "sidekick-move6": "crwdns171340:0crwdne171340:0", ->>>>>>> Stashed changes "sidekick-hero-weapon": "crwdns151206:0crwdne151206:0", "sidekick-weapons": "crwdns151208:0crwdne151208:0", "sidekick-gear1": "crwdns151210:0crwdne151210:0", diff --git a/Monsterhearts-2/translations/pt.json b/Monsterhearts-2/translations/pt.json index 34d81ebfbc..b87eb130a7 100644 --- a/Monsterhearts-2/translations/pt.json +++ b/Monsterhearts-2/translations/pt.json @@ -19,11 +19,7 @@ "lbl-unlocked": "Desbloqueado", "lbl-experience": "Experiência", "lbl-rewritten": "Eu Mais Sombrio Reescrito", -<<<<<<< Updated upstream - "lbl-atfault": "At Fault", -======= "lbl-atfault": "Culpados", ->>>>>>> Stashed changes "text-expinfo": "Quando tiver 5 de experiência, apague e escolha um Avanço da lista abaixo:", "text-expreminder": "Não esqueça de adicionar manualmente qualquer Avanço na sua ficha. Marque o que você já possui.", "text-seasonadvancesinfo": "Assim que alguém tiver o quinto Avanço, o Avanço de Temporada é desbloqueado para todos. Há mais uma sessão após essa, e então a temporada termina.", @@ -61,86 +57,6 @@ "text-fae-advance3": "Escolha outro movimento de Fada.", "text-fae-advance4": "Escolha um movimento de qualquer Pele", "text-fae-advance5": "Escolha um movimento de qualquer Pele.", -<<<<<<< Updated upstream - "text-fae-advance6": " You belong to a Jury of Fae.", - "lbl-ghost": "Ghost", - "text-ghostbackstory": "Someone knows that you're dead and how you died. They gain 2 Strings on you.

You've been inside someone's bedroom while they were sleeping. Take a String on them. ", - "text-ghostinfo": "You get Unresolved Trauma, and choose two more:", - "text-ghost-move1name": "Unresolved Trauma", - "text-ghost-move1desc": " Whenever something brings to mind your death, you choke up and gain the Condition traumatized if you don't have it already. Whenever someone helps you resolve this Condition, you both mark experience.", - "text-ghost-move2name": "Helpful Spirit", - "text-ghost-move2desc": " When you help someone resolve a Condition, gain a String on them.", - "text-ghost-move3name": "Transference", - "text-ghost-move3desc": " Whenever you spend time truly listening to someone else's struggles, they heal 1 Harm, and then transfer their remaining harm to you.", - "text-ghost-move4name": "Projected Blame", - "text-ghost-move4desc": " While you've got the Condition traumatized, you may act as though others had the Condition at fault for my death.", - "text-ghost-move5name": "Creep", - "text-ghost-move5desc": " When you silently witness someone in one of their most private moments, perhaps sleeping or putting on makeup, gain a String on them.", - "text-ghost-move6name": "Limitless", - "text-ghost-move6desc": " You can walk through walls and fly.", - "text-ghost-sexmove": "When you have sex with someone, you both get to ask a question of one another. This can be asked in character or player-to-player. They must answer honestly and directly. ", - "text-ghost-darkestself": "You become invisible, unnoticeable. No one can see you, feel you, or hear your voice. You can still affect inanimate objects, but this is your only avenue of communication. You escape your Darkest Self when someone acknowledges your presence, and demonstrates how much they want you around. ", - "text-ghost-advance1": " Add +1 to one of your stats.", - "text-ghost-advance2": " Take another Ghost move.", - "text-ghost-advance3": " Take another Ghost move.", - "text-ghost-advance4": " Take a move from any Skin.", - "text-ghost-advance5": " Take a move from any Skin.", - "text-ghost-advance6": " You belong to a Haunted House.", - "lbl-ghoul": "Ghoul", - "text-ghoulbackstory": "Someone reminded you what love was, when you thought that death had stolen it away from you forever. Give them a String.

Did anyone watch you die? If so, you gain 2 Strings on each other. ", - "lbl-hunger": "Hunger", - "text-ghoulinfo": "You get The Hunger, and choose two more:", - "text-ghoul-move1name": "The Hunger", - "text-ghoul-move1desc": " You have a Hunger for (select 1):", - "lbl-ghoulhunger1": "fear", - "lbl-ghoulhunger2": "power", - "lbl-ghoulhunger3": "plunder", - "lbl-ghoulhunger4": "thrills", - "text-ghoul-move1desc-cont": "When you heedlessly pursue a Hunger, add 1 to rolls. When you ignore a promising feeding opportunity, roll to Keep Your Cool.", - "text-ghoul-move2name": "What The Right Hand Wants", - "text-ghoul-move2desc": " Your body contains many histories, and it desires many things. Create another Hunger.", - "text-ghoul-move3name": "Satiety", - "text-ghoul-move3desc": " When you satiate a Hunger, choose one:
✦   heal 1 Harm;
✦   mark experience;
✦   take 1 Forward.", - "text-ghoul-move4name": "Short Rest For The Wicked", - "text-ghoul-move4desc": " When you die, wait it out. A few hours later, you wake up fully healed.", - "text-ghoul-move5name": "Watchful Golem", - "text-ghoul-move5desc": " When you defend someone without them ever knowing about it, mark experience.", - "text-ghoul-move6name": "Ending", - "text-ghoul-move6desc": " You remember every detail of your death. When you tell someone about it, give them the Condition morbid and roll to Turn Them On with Cold.", - "text-ghoul-move7name": "Esprit de Corpse", - "text-ghoul-move7desc": " When you Gaze Into the Abyss, the abyss will share with you its Hunger. Treat that Hunger as one of your own until you satiate it, and mark experience when you do so.", - "text-ghoul-sexmove": "When you have sex with someone, create a new Hunger. ", - "text-ghoul-darkestself": "Your dull hunger sharpens. You can't focus on anything else but feeding. And in addition to your peculiar cravings, you recognize something else. That primordial hunger which connects all hungers. Flesh, blood, meat. You escape your Darkest Self once you've overindulged, or you've been locked out for long enough to regain composure.", - "text-ghoul-advance1": " Add +1 to one of your stats.   ", - "text-ghoul-advance2": " Take another Ghoul move.   ", - "text-ghoul-advance3": " Take another Ghoul move.  ", - "text-ghoul-advance4": " Take a move from any Skin.", - "text-ghoul-advance5": " Take a move from any Skin.", - "text-ghoul-advance6": " You're part of a Reckless Crew. ", - "lbl-hollow": "Hollow", - "text-hollowbackstory": "You've been taking your social cues from someone, and doing so has taught you a lot about them. Gain 2 Strings on them.

Someone's seen through your invented past, and realized it's all lies. They gain 2 Strings on you.", - "text-hollowinfo": "Choose two:", - "text-hollow-move1name": "Better Than Nothing", - "text-hollow-move1desc": " When you gain a Condition, mark experience.", - "text-hollow-move2name": "A Blank Canvas", - "text-hollow-move2desc": " When you take an action that embodies one of your Conditions, allowing that Condition to alter your sense of self, cross it off and add 1 to your roll.", - "text-hollow-move3name": "Try Harder Next Time", - "text-hollow-move3desc": " When you screw up, give yourself an appropriate Condition and take 1 forward.", - "text-hollow-move4name": "Fake", - "text-hollow-move4desc": " Add 1 to any rolls you make while lying.", - "text-hollow-move5name": "Metamorphosis", - "text-hollow-move5desc": " When you Gaze Into the Abyss, on a 7 or higher the abyss will also show you what you must become, and you can permanently swap two of your stats.", - "text-hollow-move6name": "Strange Impressions", - "text-hollow-move6desc": " When a main character either harms you or helps you heal, you can respond by studying them with wide eyes. If you do, temporarily gain one of their Skin Moves and add it to your character sheet. It disappears once you use it.", - "text-hollow-sexmove": "When you have sex with someone, both players secretly write down whether the sex was confusing or soothing for their character. If you reveal the same answer, both characters mark experience. ", - "text-hollow-darkestself": "Your body is a prison. You don't belong inside of it. You need to put it in harm's way, and make it suffer, just like it's made you suffer. There's got to be a way to cut yourself out of it. You need to meet your makers, and hold them accountable for what they've done to you. To escape your Darkest Self, you must come to see how someone else feels more trapped than you do.", - "text-hollow-advance1": " Add +1 to one of your stats.  ", - "text-hollow-advance2": " Take another Hollow move.  ", - "text-hollow-advance3": " Take another Hollow move.  ", - "text-hollow-advance4": " Take a move from any Skin.", - "text-hollow-advance5": " Take a move from any Skin.", - "text-hollow-advance6": " You've found Hollow Siblings.", -======= "text-fae-advance6": " Você pertence a um Júri das Fadas.", "lbl-ghost": "Fantasma", "text-ghostbackstory": "Alguém sabe que você está morta e como morreu. Essa pessoa recebe 2 Fios com você.

Você esteve dentro do quarto de alguém enquanto essa pessoa estava dormindo. Receba um Fio com ela.", @@ -219,7 +135,6 @@ "text-hollow-advance4": "Escolha um movimento de qualquer Pele.", "text-hollow-advance5": "Escolha um movimento de qualquer Pele.", "text-hollow-advance6": "Você encontrou Irmãos Vazios", ->>>>>>> Stashed changes "lbl-infernal": "Infernal", "text-infernalbackstory": "Você tem dívidas. Dê 3 Fios, divididos da forma que quiser entre o Poder Sombrio e as outras personagens.

Alguém pensa que pode te salvar. Receba um Fio com essa pessoa.\n", "lbl-darkpower": "Poder Sombrio", @@ -350,41 +265,6 @@ "text-werewolf-advance5": "Escolha um movimento de qualquer Pele.", "text-werewolf-advance6": "Você faz parte de uma Alcatéia de Lobos", "lbl-witch": "Skin", -<<<<<<< Updated upstream - "text-witchbackstory": "You start the game with two Sympathetic Tokens. Decide whose and what they are.

One of the others caught you rummaging through their friend's stuff, but hasn't said anything. They get a String on you. ", - "lbl-sympathetictokens": "Sympathetic Tokens", - "text-witchinfo": "You get Sympathetic Tokens and Hex-Casting.", - "text-witch-move1name": "Sympathetic Tokens", - "text-witch-move1desc": " You gain power from Sympathetic Tokens - items of personal significance taken from others. Sympathetic Tokens count as Strings.", - "text-witch-move2name": "Hex-Casting", - "text-witch-move2desc": " You can cast Hexes. Choose two that you know. To cast them, either expend a Sympathetic Token during a secret ritual, or meet the target's gaze and chant at them in tongues. Then roll with Dark. On a 10 up, the Hex works, and can easily be reversed. On a 7-9, it works but choose one:
✦   the casting does you 1 Harm;
✦   the Hex has weird side effects;
✦   trigger your Darkest Self.", - "text-witch-move3name": "Transgressive Magic", - "text-witch-move3desc": " If your ritual transgresses the community's moral or sexual standards, add 1 to your Hex-Casting roll.", - "text-witch-move5name": "Sanctuary", - "text-witch-move5desc": " You have a secret place for practicing witchcraft. Add 1 to all rolls you make within this space.", - "lbl-hexes": "Hexes", - "text-hexes1-name": "Wither", - "lbl-hexes1-desc": "The hexed loses all of their hair, or their teeth start falling out, or their period arrives unexpected and heavy, or their skin gets all sickly yellow and spotty. Whatever the specifics, it's bad.", - "text-hexes2-name": "Binding", - "lbl-hexes2-desc": "The person cannot physically harm others.", - "text-hexes3-name": "Ring Of Lies", - "lbl-hexes3-desc": "Whenever the person attempts to lie, they hear a piercing ringing noise. Big lies will often make their knees buckle and disorient them. Severe lies can cause harm or even brain damage.", - "text-hexes4-name": "Watching", - "lbl-hexes4-desc": "You enter a deep sleep, and begin to see the world through the eyes of the hexed. You can feel their reactions to and impressions of what they are seeing.", - "text-hexes5-name": "Illusions", - "lbl-hexes5-desc": "Pick one: snakes and bugs, demonic visages, false prophecies, non-existent subtext. The hexed sees that thing everywhere. You have no control over the exact images or manifestations.", - "text-witch-sexmove": "After sex, you can take a Sympathetic Token from them. They know about it, and it's cool. ", - "text-witch-darkestself": "The time for subtlety and patience is over. You're too powerful to put up with their garbage any longer. You hex anyone who slights you. All of your hexes have unexpected side effects, and are more effective than you are comfortable with. To escape your Darkest Self, you must offer peace to the one you have hurt the most.", - "text-witch-advance1": " Add +1 to one of your stats.   ", - "text-witch-advance2": " Take another Witch move.   ", - "text-witch-advance3": " Take all the remaining Hexes.   ", - "text-witch-advance4": " Create a new Hex.  ", - "text-witch-advance5": " Take a move from any Skin.", - "text-witch-advance6": " Take a move from any Skin.", - "text-witch-advance7": " You belong to a Coven.", - "lbl-customskin": "Custom Skin", - "text-custom-advance1": " Add +1 to one of your stats.   ", -======= "text-witchbackstory": "Você começa o jogo com dois Símbolos Simpatéticos. Decida de quem e o que são.

Uma das outras personagens te pegou mexendo nas coisas dos amigos dela, mas não disse nada. Essa pessoa tem umFio com você.", "lbl-sympathetictokens": "Símbolos Simpatéticos", "text-witchinfo": "Você começa com Símbolos Simpatéticos e Feitiçaria", @@ -418,7 +298,6 @@ "text-witch-advance7": "Você faz parte de um Coven", "lbl-customskin": "Pele Customizada", "text-custom-advance1": "Adicione +1 a um de seus atributos", ->>>>>>> Stashed changes "text-custom-advance2": "Pegue outro movimento da sua Pele.", "text-custom-advance3": "Pegue outro movimento da sua Pele.", "text-custom-advance4": "Escolha um movimento de qualquer Pele.", diff --git a/NOC/translations/zu.json b/NOC/translations/zu.json index 4a4941e006..9474e7bbf9 100644 --- a/NOC/translations/zu.json +++ b/NOC/translations/zu.json @@ -10,10 +10,7 @@ "idteinte-t": "crwdns156430:0crwdne156430:0", "idpossede-t": "crwdns156432:0crwdne156432:0", "idcorrompu-t": "crwdns156434:0crwdne156434:0", -<<<<<<< Updated upstream -======= "idsecurite-t": "crwdns171316:0crwdne171316:0", ->>>>>>> Stashed changes "idviolence-t": "crwdns156438:0crwdne156438:0", "idmalaise-t": "crwdns156440:0crwdne156440:0", "idHallucinations-t": "crwdns156442:0crwdne156442:0", @@ -66,19 +63,6 @@ "effet-points-blessures-leger-u": "crwdns156534:0crwdne156534:0", "effet-points-blessures-grave-u": "crwdns156536:0crwdne156536:0", "effet-points-blessures-mort-u": "crwdns156538:0crwdne156538:0", -<<<<<<< Updated upstream - "effet-points-trauma-leger-u": "crwdns160808:0crwdne160808:0", - "effet-points-trauma-grave-u": "crwdns160810:0crwdne160810:0", - "effet-points-trauma-mort-u": "crwdns156544:0crwdne156544:0", - "effet-points-traque-leger-u": "crwdns156546:0crwdne156546:0", - "effet-points-traque-grave-u": "crwdns160812:0crwdne160812:0", - "effet-points-traque-mort-u": "crwdns160814:0crwdne160814:0", - "effet-points-noirceur-leger-u": "crwdns160816:0crwdne160816:0", - "effet-points-noirceur-grave-u": "crwdns160818:0crwdne160818:0", - "effet-points-noirceur-grave1-u": "crwdns160820:0crwdne160820:0", - "effet-points-noirceur-mort-u": "crwdns160822:0crwdne160822:0", - "effet-points-noirceur-plus1trait-u": "crwdns160824:0crwdne160824:0", -======= "effet-points-trauma-leger-u": "crwdns171318:0crwdne171318:0", "effet-points-trauma-grave-u": "crwdns171320:0crwdne171320:0", "effet-points-trauma-mort-u": "crwdns156544:0crwdne156544:0", @@ -88,7 +72,6 @@ "effet-points-noirceur-leger-u": "crwdns171326:0crwdne171326:0", "effet-points-noirceur-grave-u": "crwdns171328:0crwdne171328:0", "effet-points-noirceur-mort-u": "crwdns171330:0crwdne171330:0", ->>>>>>> Stashed changes "EQUIPMENTS-u": "crwdns156558:0crwdne156558:0", "CONTACTS-u": "crwdns156560:0crwdne156560:0", "Description-u": "crwdns156562:0crwdne156562:0", @@ -98,11 +81,7 @@ "faveurmax-u": "crwdns156570:0crwdne156570:0", "Combathelper-u": "crwdns156572:0crwdne156572:0", "tir-u": "crwdns156574:0crwdne156574:0", -<<<<<<< Updated upstream - "dps-u": "crwdns161210:0crwdne161210:0", -======= "dps-u": "crwdns171332:0crwdne171332:0", ->>>>>>> Stashed changes "munitions-u": "crwdns156578:0crwdne156578:0", "munitionsmax-u": "crwdns156580:0crwdne156580:0", "armetalent-u": "crwdns156582:0crwdne156582:0", diff --git a/Old School Essentials - AAC/translations/fr.json b/Old School Essentials - AAC/translations/fr.json index 585d7c55e2..822e409a08 100644 --- a/Old School Essentials - AAC/translations/fr.json +++ b/Old School Essentials - AAC/translations/fr.json @@ -52,10 +52,6 @@ "find-room-trap-full": "Trouver des pièges", "find-room-trap": "Trouver des pièges", "find-secret-door": "Trouver porte secrète", -<<<<<<< Updated upstream - "find-secret-door-full": "Find secret door", -======= ->>>>>>> Stashed changes "find-secret-room-full": "Trouver porte secrète", "gold-piece-abbr": "PO", "hit-dice-number-abbr": "# DV", @@ -134,27 +130,10 @@ "weight": "Poids", "wisdom-abbr": "SAG", "wisdom": "Sagesse", -<<<<<<< Updated upstream - "wisdom-mod-abbr": "+WIS", -======= ->>>>>>> Stashed changes "worn-question": "Usé ?", "thac0": "TCA0", "enabled": "Disponible", "disabled": "Indisponible", "threshold-modifier-enabled": "Modificateur de Seuil disponible ?", -<<<<<<< Updated upstream - "saves-as": "Sauvegarde de", - "reaction": "Réaction", - "reaction-hostile": "Hostile, attaque", - "reaction-unfriendly": "Inamical, peut attaquer", - "reaction-neutral": "Neutre, incertain", - "reaction-indifferent": "Indifférent, désintéressé", - "reaction-friendly": "Amical, serviable", - "charisma-modifier": "Modificateur de Charisme", - "classic-fantasy": "Classic Fantasy", - "advanced-fantasy": "Advanced Fantasy" -======= "saves-as": "Sauvegarde de" ->>>>>>> Stashed changes }