From 4cb80b54634182bdd33e75341da6857267167139 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 4 Dec 2021 11:40:40 -0800 Subject: [PATCH] Update memory feeling localization files for gen8 Keep the old localizations around for displaying gen6 format memories in their original localization. I didn't rename the files so the git diff was clean for showing the re-localized lines. Closes #3302 --- PKHeX.Core/Game/GameStrings/GameStrings.cs | 5 +- PKHeX.Core/Game/GameStrings/MemoryStrings.cs | 2 +- .../memories/feeling6/text_Feeling6_de.txt | 24 +++++++++ .../memories/feeling6/text_Feeling6_en.txt | 24 +++++++++ .../memories/feeling6/text_Feeling6_es.txt | 24 +++++++++ .../memories/feeling6/text_Feeling6_fr.txt | 24 +++++++++ .../memories/feeling6/text_Feeling6_it.txt | 24 +++++++++ .../memories/feeling6/text_Feeling6_ja.txt | 24 +++++++++ .../memories/feeling6/text_Feeling6_ko.txt | 24 +++++++++ .../memories/feeling6/text_Feeling6_zh.txt | 24 +++++++++ .../text/memories/text_Feeling_de.txt | 4 +- .../text/memories/text_Feeling_en.txt | 4 +- .../text/memories/text_Feeling_es.txt | 16 +++--- .../text/memories/text_Feeling_fr.txt | 22 ++++---- .../text/memories/text_Feeling_it.txt | 50 +++++++++---------- .../text/memories/text_Feeling_ja.txt | 12 ++--- .../text/memories/text_Feeling_ko.txt | 4 +- .../text/memories/text_Feeling_zh.txt | 50 +++++++++---------- 18 files changed, 277 insertions(+), 84 deletions(-) create mode 100644 PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_de.txt create mode 100644 PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_en.txt create mode 100644 PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_es.txt create mode 100644 PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_fr.txt create mode 100644 PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_it.txt create mode 100644 PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_ja.txt create mode 100644 PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_ko.txt create mode 100644 PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_zh.txt diff --git a/PKHeX.Core/Game/GameStrings/GameStrings.cs b/PKHeX.Core/Game/GameStrings/GameStrings.cs index 2281d525d..3329c349a 100644 --- a/PKHeX.Core/Game/GameStrings/GameStrings.cs +++ b/PKHeX.Core/Game/GameStrings/GameStrings.cs @@ -10,7 +10,7 @@ namespace PKHeX.Core { // PKM Info public readonly string[] specieslist, movelist, itemlist, abilitylist, types, natures, forms, - memories, genloc, feeling, intensity, + memories, genloc, feeling6, feeling8, intensity, trainingbags, trainingstage, characteristics, groundtiletypes, balllist, gamelist, pokeblocks, ribbons; @@ -96,7 +96,8 @@ namespace PKHeX.Core pokeblocks = Get("pokeblock"); forms = Get("forms"); memories = Get("memories"); - feeling = Get("feeling"); + feeling6 = Get("feeling6"); + feeling8 = Get("feeling"); intensity = Get("intensity"); genloc = Get("genloc"); trainingbags = Get("trainingbag"); diff --git a/PKHeX.Core/Game/GameStrings/MemoryStrings.cs b/PKHeX.Core/Game/GameStrings/MemoryStrings.cs index fa2954531..1ee1741b9 100644 --- a/PKHeX.Core/Game/GameStrings/MemoryStrings.cs +++ b/PKHeX.Core/Game/GameStrings/MemoryStrings.cs @@ -55,7 +55,7 @@ namespace PKHeX.Core } public ReadOnlySpan GetMemoryQualities() => s.intensity; - public ReadOnlySpan GetMemoryFeelings(int memoryGen) => memoryGen >= 8 ? s.feeling.AsSpan(0, 25) : s.feeling.AsSpan(1, 24); // empty line for 0 in gen8+ + public ReadOnlySpan GetMemoryFeelings(int memoryGen) => memoryGen >= 8 ? s.feeling8 : s.feeling6; public List GetArgumentStrings(MemoryArgType type, int memoryGen) => type switch { diff --git a/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_de.txt b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_de.txt new file mode 100644 index 000000000..cecf6cdf7 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_de.txt @@ -0,0 +1,24 @@ +wie glücklich es war +wie viel Spaß es hatte +wie sehr es sich gefreut hat +wie es gegrinst hat +wie überwältigt es war +wie unbeschreiblich seine Gefühle waren +wie gut gelaunt es war +dass es feuchte Augen bekommen hat +wie sehr es sich amüsiert hat +wie nervös es war +wie wohl es sich gefühlt hat +wie unruhig es war +wie sehr es das genossen hat +wie leid es ihm getan hat +wie herzzerreißend das war +wie nostalgisch es geworden ist +was für Schwierigkeiten es hatte +wie anstrengend das war +wie es im Unreinen mit sich war +wie stolz es war +wie schlecht gelaunt es war +wie wütend es war +wie eifersüchtig es war +wie müde es war \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_en.txt b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_en.txt new file mode 100644 index 000000000..28df2e51c --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_en.txt @@ -0,0 +1,24 @@ +it was happy +it had fun +it was glad +it grinned +it got overwhelmed by emotion +its feelings were indescribable +it felt good +it got teary eyed +it got lighthearted +it got nervous +it felt comfortable +it was restless +it got a bit carried away +it felt sorry +it got emotional +it felt nostalgic +it had some difficulty +it felt exhausted +it couldn’t be true to its feelings +it felt proud +they ended up in a foul mood +it got angry +it got jealous +it got sleepy \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_es.txt b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_es.txt new file mode 100644 index 000000000..3dc038c15 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_es.txt @@ -0,0 +1,24 @@ +cuánto se alegró +lo bien que lo pasó +la felicidad que sintió +la sonrisa que esbozó +cómo le embargó la emoción +la sensación inenarrable que experimentó +lo mucho que le agradó +las lágrimas que le vinieron a los ojos +la ilusión que le hizo +lo nervioso que se puso +lo bien que se sintió +el hormigueo que sintió +la experiencia y le gustaría revivirla +el regusto amargo que le quedó +la pena que sintió +la nostalgia que sintió +lo difícil que le pareció +lo extenuante que resultó +cómo le costó aceptar lo que sentía +el orgullo que sintió +el mal humor que le sobrevino +cuánto se enfadó +los celos que sintió +el sueño que le entró \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_fr.txt b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_fr.txt new file mode 100644 index 000000000..40f4c73df --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_fr.txt @@ -0,0 +1,24 @@ +ça lui a fait plaisir +c’était amusant +ça l’a rendu heureux +ça l’a fait sourire +ça l’a ému +c’était une drôle de sensation +c’était agréable +ça lui a mis les larmes aux yeux +ça lui a donné du baume au cœur +ça l’a rendu nerveux +c’était apaisant +ça chatouillait +ça ne lui a laissé aucun regret +ça lui a laissé un goût amer +ça lui a fait beaucoup de peine +ça l’a rendu nostalgique +c’était difficile +c’était épuisant +ça n’était pas facile à accepter +ça l’a rendu fier +ça l’a mis de mauvaise humeur +ça l’a rendu furieux +ça l’a rendu jaloux +ça lui a donné sommeil \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_it.txt b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_it.txt new file mode 100644 index 000000000..e62e93fbb --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_it.txt @@ -0,0 +1,24 @@ +la sua felicità +quanto sia stato divertente +la sua gioia +le sue risate +la sua emozione +quella sensazione indescrivibile +quanto è stato piacevole +la sua commozione +la sua allegria +quanto era nervoso +quella bella sensazione +che non riusciva a star fermo +il suo entusiasmo +il suo dispiacere +la sua tristezza +quella sensazione di malinconia +la sua preoccupazione +la sensazione di sfinimento +il suo dilemma +quanto questo lo abbia reso orgoglioso +la tensione di quei momenti +quanto questo lo abbia fatto arrabbiare +quanto questo lo abbia reso geloso +quanto sonno gli era venuto \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_ja.txt b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_ja.txt new file mode 100644 index 000000000..31379c409 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_ja.txt @@ -0,0 +1,24 @@ +うれしかった +たのしかった +よろこんだ +ニヤニヤした +たまらない きもちになった +なんともいえない きもちだった +いい きぶんになった +うるうるした +うかれてしまった +きんちょうした +きもちよかった +もぞもぞした +クセになりそうに なった +もうしわけない きぶんになった +せつない きもちになった +なつかしい きもちになった +てこずった +きつかった +すなおに なれなかった +ほこらしく おもった +けんあくな ムードになった +おこってしまった +しっとした +ねむくなった \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_ko.txt b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_ko.txt new file mode 100644 index 000000000..31f1e916e --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_ko.txt @@ -0,0 +1,24 @@ +고마웠던 +즐거웠던 +기뻤던 +히죽히죽 웃었던 +참을 수 없는 기분이 되었던 +말로는 표현할 수 없는 기분이 되었던 +좋은 기분이 되었던 +눈물이 글썽글썽했던 +마음이 들뜨고 말았던 +긴장했던 +기분이 좋았던 +꼼지락거렸던 +완전히 푹 빠졌던 +미안한 기분이 들었던 +슬픈 기분이 되었던 +그리운 기분이 되었던 +어려웠던 +힘들었던 +솔직할 수 없었던 +자랑스럽게 생각했던 +험악한 분위기가 되었던 +화를 내고 말았던 +질투했던 +졸렸던 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_zh.txt b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_zh.txt new file mode 100644 index 000000000..59a448516 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/feeling6/text_Feeling6_zh.txt @@ -0,0 +1,24 @@ +它很高兴 +它玩的开心 +它很开心 +它咧嘴笑 +它变得不知所措 +它的感觉难以形容 +它感觉很好 +它变得饱含泪水 +它感到轻松 +它感到紧张了 +它感觉很舒服 +它感到焦躁不安 +它变得有点得意忘形 +它感到惋惜 +它变得很敏感 +它变得很怀旧 +它遇到了一些困难 +它感到精疲力尽 +它感觉不像是真的 +它感到骄傲 +他们以坏心情收场 +它变得愤怒 +它感到嫉妒 +它想睡觉 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_de.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_de.txt index fc79d622c..ef8915657 100644 --- a/PKHeX.Core/Resources/text/memories/text_Feeling_de.txt +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_de.txt @@ -1,10 +1,10 @@ - + wie glücklich es war wie viel Spaß es hatte wie sehr es sich gefreut hat wie es gegrinst hat wie überwältigt es war -wie unbeschreiblich seine Gefühle waren +wie es dabei gemischte Gefühle hatte wie gut gelaunt es war dass es feuchte Augen bekommen hat wie sehr es sich amüsiert hat diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_en.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_en.txt index f094eec07..7e734535d 100644 --- a/PKHeX.Core/Resources/text/memories/text_Feeling_en.txt +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_en.txt @@ -1,10 +1,10 @@ - + it was happy it had fun it was glad it grinned it got overwhelmed by emotion -its feelings were indescribable +its feelings were complicated it felt good it got teary eyed it got lighthearted diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_es.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_es.txt index b4481d1c4..4d722080e 100644 --- a/PKHeX.Core/Resources/text/memories/text_Feeling_es.txt +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_es.txt @@ -1,22 +1,22 @@ - + cuánto se alegró lo bien que lo pasó la felicidad que sintió la sonrisa que esbozó cómo le embargó la emoción -la sensación inenarrable que experimentó -lo mucho que le agradó +el inenarrable sentimiento que tuvo +su buen humor las lágrimas que le vinieron a los ojos -la ilusión que le hizo -lo nervioso que se puso +la ilusión que sintió +los nervios que le entraron lo bien que se sintió el hormigueo que sintió -la experiencia y le gustaría revivirla +lo mucho que disfrutó el regusto amargo que le quedó la pena que sintió la nostalgia que sintió -lo difícil que le pareció -lo extenuante que resultó +lo mucho que se esforzó +el agotamiento que sintió cómo le costó aceptar lo que sentía el orgullo que sintió el mal humor que le sobrevino diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_fr.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_fr.txt index 3fbf4b6ce..93fc7f395 100644 --- a/PKHeX.Core/Resources/text/memories/text_Feeling_fr.txt +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_fr.txt @@ -1,25 +1,25 @@ - + ça lui a fait plaisir -c’était amusant +ça l’a bien amusé ça l’a rendu heureux ça l’a fait sourire ça l’a ému -c’était une drôle de sensation -c’était agréable +ça l’a rendu perplexe +ça l’a mis de bonne humeur ça lui a mis les larmes aux yeux -ça lui a donné du baume au cœur +ça lui a mis du baume au cœur ça l’a rendu nerveux -c’était apaisant +ça l’a apaisé ça chatouillait -ça ne lui a laissé aucun regret +ça l’a vraiment emballé ça lui a laissé un goût amer -ça lui a fait beaucoup de peine +ça lui a fait de la peine ça l’a rendu nostalgique -c’était difficile -c’était épuisant +ça n’était pas facile pour lui +ça l’a épuisé ça n’était pas facile à accepter ça l’a rendu fier -ça l’a mis de mauvaise humeur +ça l’a mis d’humeur maussade ça l’a rendu furieux ça l’a rendu jaloux ça lui a donné sommeil \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_it.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_it.txt index 195fbcbac..af47ecd02 100644 --- a/PKHeX.Core/Resources/text/memories/text_Feeling_it.txt +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_it.txt @@ -1,25 +1,25 @@ - -la sua felicità -quanto sia stato divertente -la sua gioia -le sue risate -la sua emozione -quella sensazione indescrivibile -quanto è stato piacevole -la sua commozione -la sua allegria -quanto era nervoso -quella bella sensazione -che non riusciva a star fermo -il suo entusiasmo -il suo dispiacere -la sua tristezza -quella sensazione di malinconia -la sua preoccupazione -la sensazione di sfinimento -il suo dilemma -quanto questo lo abbia reso orgoglioso -la tensione di quei momenti -quanto questo lo abbia fatto arrabbiare -quanto questo lo abbia reso geloso -quanto sonno gli era venuto \ No newline at end of file + +la sua felicità. +quanto sia stato divertente. +la sua gioia. +le sue risate. +la sua emozione. +quella vaga sensazione. +quanto è stato piacevole. +la sua commozione. +la sua allegria. +quanto era nervoso. +quella bella sensazione. +che non riusciva a star fermo. +il suo entusiasmo. +il suo dispiacere. +la sua tristezza. +quella sensazione di malinconia. +quanto è stata dura. +la sensazione di sfinimento. +il suo dilemma. +quanto questo lo abbia reso orgoglioso. +la tensione di quei momenti. +quanto questo lo abbia fatto arrabbiare. +quanto questo lo abbia reso geloso. +quanto sonno gli era venuto. \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_ja.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_ja.txt index 3fc91e755..4a411c80e 100644 --- a/PKHeX.Core/Resources/text/memories/text_Feeling_ja.txt +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_ja.txt @@ -1,25 +1,25 @@ - + うれしかった たのしかった よろこんだ ニヤニヤした たまらない きもちになった -なんともいえない きもちだった -いい きぶんになった +びみょうな きもちになった +いい きぶんに なった うるうるした うかれてしまった きんちょうした きもちよかった もぞもぞした -クセになりそうに なった +くせになりそうになった もうしわけない きぶんになった せつない きもちになった なつかしい きもちになった -てこずった +くろうした きつかった すなおに なれなかった ほこらしく おもった -けんあくな ムードになった +けんあくな ムードに なった おこってしまった しっとした ねむくなった \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_ko.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_ko.txt index 12afebda4..c4f1f385a 100644 --- a/PKHeX.Core/Resources/text/memories/text_Feeling_ko.txt +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_ko.txt @@ -1,10 +1,10 @@ - + 고마웠던 즐거웠던 기뻤던 히죽히죽 웃었던 참을 수 없는 기분이 되었던 -말로는 표현할 수 없는 기분이 되었던 +묘한 기분이 들었던 좋은 기분이 되었던 눈물이 글썽글썽했던 마음이 들뜨고 말았던 diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_zh.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_zh.txt index 1d17df522..12a1a4aca 100644 --- a/PKHeX.Core/Resources/text/memories/text_Feeling_zh.txt +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_zh.txt @@ -1,25 +1,25 @@ - -它很高兴 -它玩的开心 -它很开心 -它咧嘴笑 -它变得不知所措 -它的感觉难以形容 -它感觉很好 -它变得饱含泪水 -它感到轻松 -它感到紧张了 -它感觉很舒服 -它感到焦躁不安 -它变得有点得意忘形 -它感到惋惜 -它变得很敏感 -它变得很怀旧 -它遇到了一些困难 -它感到精疲力尽 -它感觉不像是真的 -它感到骄傲 -他们以坏心情收场 -它变得愤怒 -它感到嫉妒 -它想睡觉 \ No newline at end of file + +那种高兴的心情 +那种快乐的心情 +那种喜悦的心情 +那种想偷着乐的心情 +那种难以招架的心情 +那种无法言喻的心情 +那种舒畅的心情 +那种眼角含泪的心情 +那种兴高采烈的心情 +那种紧张的心情 +那种舒适的感觉 +那种坐立难安的心情 +那种差点上瘾的感觉 +那种心生愧疚的感觉 +那种难过的心情 +那种怀念的感觉 +那种辛苦劳累的感觉 +那种精疲力尽的感觉 +那没能坦率的心情 +那种令它骄傲的感觉 +那变得险恶的氛围 +那种生气的感觉 +那种嫉妒的心情 +那种昏昏欲睡的感觉 \ No newline at end of file