diff --git a/src/locales/de.json b/src/locales/de.json index 2fc0bfd1..d5b53a9d 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -390,11 +390,7 @@ "Du kannst auch den", "Knopf drücken, um die Werte manuell zu bearbeiten!" ], - "p6": [ - "Drücke Sie auf den Pfeil nach unten um die Details Ihrer Pulls zu sehen. Ein Popup wird angezeigt, wenn du ein", - "oder", - "Sie können die Tabelle auch manuell hinzufügen oder bearbeiten." - ] + "p6": "Drücke Sie auf den Pfeil nach unten um die Details Ihrer Pulls zu sehen. Ein Popup wird angezeigt, wenn du ein 5★ oder 4★. Sie können die Tabelle auch manuell hinzufügen oder bearbeiten." } }, "types": { diff --git a/src/locales/en.json b/src/locales/en.json index 89acfacf..fe99efce 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -390,11 +390,7 @@ "You can also press the", "button to edit the values manually!" ], - "p6": [ - "Press the arrow on the bottom to see your pulls' details. A popup will show up when you get a", - "or", - "You can also add or edit the table manually." - ] + "p6": "Press the arrow on the bottom to see your pulls' details. A popup will show up when you get a 5★ or 4★. You can also add or edit the table manually." } }, "types": { @@ -416,7 +412,11 @@ "worth": "Worth", "loading": "Loading... (If this page is stuck, change your server on the settings page)", "guaranteed": "The next {rarity}★ is guaranteed to be the promotional character or weapon", - "unknown_3_star": "Unknown" + "unknown_3_star": "Unknown", + "rarity": "Rarity", + "total": "Total", + "percent": "Percent", + "pityAverage": "Pity AVG" }, "tally": { "title": "Global Wish Stats", @@ -440,6 +440,13 @@ "user": "Total Users", "detail": "Detail" }, + "summary": { + "total": "Total", + "percent": "Percent", + "pityAverage": "Pity AVG", + "character": "Character", + "weapon": "Weapon" + }, "note": [ "Wish history is not updated automatically, please import again to update your history!", "Paimon.moe cannot retrieve wishes older than 6 months because it has already deleted on HoYoVerse's servers, so your old wishes might not show up.", @@ -675,6 +682,23 @@ "feedback": "If you found any bugs, wrong data, or any other feedback, please leave a message on", "or": "or", "thanks": "Thanks😁!", + "credits": { + "title": "Credits", + "items": [ + { + "name": "Data and images", + "value": "Genshin Impact Wiki" + }, + { + "name": "Stats data", + "value": "Dimbreath Genshin Data" + }, + { + "name": "Drop rates for resin calculation", + "value": "Data Gathering Discord" + } + ] + }, "setMainAccount": "Set As Main Account", "modal": { "notice": "All Todo and Wish history data will be deleted", @@ -738,6 +762,16 @@ "paimon-moe-api Github", "and", "paimon-moe Github" + ], + "subtitleAd": "Advertisements", + "ad": [ + "We use third party advertisements to support our site. Some of these advertisers may be served from our third party advertiser.", + "You can view their", + " privacy policy", + "and", + "cookie policy", + "here. You can manage your cookies", + "here" ] }, "sync": { @@ -757,7 +791,16 @@ "copyright": "Genshin Impact, game content and materials are trademarks and copyrights of HoYoverse.", "discord": "Join Our Discord", "community": "Community Links", - "official": "Official Links" + "official": "Official Links", + "link": { + "github": "GitHub", + "discord": "Discord", + "devTwitter": "Dev Twitter", + "reddit": "Reddit", + "facebook": "Facebook", + "cookieSettings": "Cookie Settings", + "privacyPolicy": "Privacy Policy" + } }, "donate": { "message": [ @@ -821,6 +864,7 @@ "corridor": "Corridor", "inventoryButton": "Inventory", "listButton": "List", + "selectCharacter": "Select character...", "inventory": { "title": "Furnishing Inventory", "subtitle": "Some special categories like walls are not shown", @@ -895,4 +939,4 @@ "dataSynced": "Data has been synced!", "driveError": "Drive sync not available right now 😔" } -} \ No newline at end of file +} diff --git a/src/locales/es.json b/src/locales/es.json index a4b77340..dda81213 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -390,11 +390,7 @@ "¡Puedes además pulsar el botón", "para editar los valores manualmente!" ], - "p6": [ - "Pulsa la flecha sobre el botón para ver los detalles de tus tiradas. Una ventana emergente mostrará cuando conseguiste un", - "o", - "Puedes además añadir o editar la tabla manualmente." - ] + "p6": "Pulsa la flecha sobre el botón para ver los detalles de tus tiradas. Una ventana emergente mostrará cuando conseguiste un 5★ o 4★. Puedes además añadir o editar la tabla manualmente." } }, "types": { diff --git a/src/locales/fr.json b/src/locales/fr.json index e7002d94..b2e0ad0f 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -390,11 +390,7 @@ "Vous pouvez aussi cliquer sur le bouton", "pour éditer les valeurs manuellement !" ], - "p6": [ - "Cliquez sur la flèche en bas pour voir les détails de vos voeux. Une popup va apparaître quand vous aurez un", - "ou un", - "Vous pouvez aussi éditer le tableau manuellement." - ] + "p6": "Cliquez sur la flèche en bas pour voir les détails de vos voeux. Une popup va apparaître quand vous aurez un 5★ ou un 4★. Vous pouvez aussi éditer le tableau manuellement." } }, "types": { diff --git a/src/locales/id.json b/src/locales/id.json index e198047e..ed4f1951 100644 --- a/src/locales/id.json +++ b/src/locales/id.json @@ -390,11 +390,7 @@ "Kamu juga bisa menekan", "untuk mengedit nilai nya secara manual!" ], - "p6": [ - "Tekan tombol panah dibawah untuk melihat detail riwayat mu. Sebuah form akan muncul ketika kamu mendapat", - "atau", - "Atau kamu bisa menambahkan atau mengedit tabel nya secara manual." - ] + "p6": "Tekan tombol panah dibawah untuk melihat detail riwayat mu. Sebuah form akan muncul ketika kamu mendapat 5★ atau 4★. Atau kamu bisa menambahkan atau mengedit tabel nya secara manual." } }, "types": { diff --git a/src/locales/ja.json b/src/locales/ja.json index 2655170e..dbbc60b1 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -390,11 +390,7 @@ "また、このボタン", "で手動で編集できます！" ], - "p6": [ - "下にある矢印をクリックすると祈願詳細を確認することができます。", - "や", - "が出るとポップアップが表示されます。手動で祈願表を調整することもできます。" - ] + "p6": "下にある矢印をクリックすると祈願詳細を確認することができます。5★ や 4★ が出るとポップアップが表示されます。手動で祈願表を調整することもできます。" } }, "types": { diff --git a/src/locales/ko.json b/src/locales/ko.json index 6a170654..9f0c4733 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -390,11 +390,7 @@ "또는", "버튼을 눌러 값들을 직접 고칠 수도 있습니다!" ], - "p6": [ - "아래쪽에 있는 화살표를 눌러 상세 뽑기 결과를 볼 수 있습니다", - "또는", - "를 누르면 팝업이 나타나, 데이터를 수정할 수 있고 데이터를 수동으로 추가할 수도 있습니다." - ] + "p6": "아래쪽에 있는 화살표를 눌러 상세 뽑기 결과를 볼 수 있습니다. 5★ 또는 4★ 를 누르면 팝업이 나타나, 데이터를 수정할 수 있고 데이터를 수동으로 추가할 수도 있습니다." } }, "types": { diff --git a/src/locales/pt.json b/src/locales/pt.json index 52180b9c..f8e35969 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -390,11 +390,7 @@ "Você também pode pressionar o botão", "para editar os valores manualmente!" ], - "p6": [ - "Pressione a seta abaixo para visualizar os detalhes das orações. Um pop-up irá aparecer quando você conseguir um item", - "ou", - "Você também pode adicionar ou editar a tabela manualmente." - ] + "p6": "Pressione a seta abaixo para visualizar os detalhes das orações. Um pop-up irá aparecer quando você conseguir um item 5★ ou 4★. Você também pode adicionar ou editar a tabela manualmente." } }, "types": { diff --git a/src/locales/ru.json b/src/locales/ru.json index f579c6d1..c14f1696 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -391,9 +391,7 @@ "кнопку чтобы редактировать значения вручную!" ], "p6": [ - "Нажмите на стрелку ниже, чтобы увидеть подробности о ваших молитвах. Всплывающее окно появится, когда вы получите", - "или", - "Вы также можете добавить или редактировать таблицу вручную." + "Нажмите на стрелку ниже, чтобы увидеть подробности о ваших молитвах. Всплывающее окно появится, когда вы получите 5★ или 4★. Вы также можете добавить или редактировать таблицу вручную." ] } }, diff --git a/src/locales/th.json b/src/locales/th.json index d41b98ec..6ef4785a 100644 --- a/src/locales/th.json +++ b/src/locales/th.json @@ -390,11 +390,7 @@ "คุณสามารถกดปุ่ม", "เพื่อแก้ไขข้อมูลที่เพิ่มไปแล้วได้ด้วย!" ], - "p6": [ - "กดปุ่มลูกศรด้านล่างเพื่อดูรายละเอียดการอธิษฐาน จะมีหน้าต่างโผล่ขึ้นมาเมื่อคุณได้รับ", - "หรือ", - "คุณยังสามารถเพิ่มหรือแก้ไขตารางได้เองทุกเมื่อ" - ] + "p6": "กดปุ่มลูกศรด้านล่างเพื่อดูรายละเอียดการอธิษฐาน จะมีหน้าต่างโผล่ขึ้นมาเมื่อคุณได้รับ 5★ หรือ 4★ คุณยังสามารถเพิ่มหรือแก้ไขตารางได้เองทุกเมื่อ" } }, "types": { diff --git a/src/locales/tw.json b/src/locales/tw.json index 0262ceb4..c9db668d 100644 --- a/src/locales/tw.json +++ b/src/locales/tw.json @@ -390,11 +390,7 @@ "你也可以按", "按鈕來手動修改數值！" ], - "p6": [ - "點擊按鈕上的箭頭來檢視你的具體抽卡細節。會自動彈出提示你獲得一個", - "或", - "你也可以手動編輯列表。" - ] + "p6": "點擊按鈕上的箭頭來檢視你的具體抽卡細節。會自動彈出提示你獲得一個 5★ 或 4★。你也可以手動編輯列表。" } }, "types": { diff --git a/src/locales/vi.json b/src/locales/vi.json index 4d6132a4..53c4d1d7 100644 --- a/src/locales/vi.json +++ b/src/locales/vi.json @@ -390,11 +390,7 @@ "Bạn cũng có thể nhấn nút", "để sửa giá trị một cách thủ công!" ], - "p6": [ - "Ấn vào mũi tên ở dưới để xem thông tin chi tiết lượt cầu nguyện. Sẽ có một popup hiện ra khi bạn nhận được", - "hoặc", - "Bạn cũng có thể thêm hoặc chỉnh sử bảng này thủ công." - ] + "p6": "Ấn vào mũi tên ở dưới để xem thông tin chi tiết lượt cầu nguyện. Sẽ có một popup hiện ra khi bạn nhận được 5★ hoặc 4★. Bạn cũng có thể thêm hoặc chỉnh sử bảng này thủ công." } }, "types": { diff --git a/src/locales/zh.json b/src/locales/zh.json index db9ea194..0fc0418e 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -390,11 +390,7 @@ "你也可以按", "按钮来手动修改数值！" ], - "p6": [ - "点击按钮上的箭头来查看你的具体抽卡细节。会自动弹出提示你获得一个", - "或", - "你也可以手动编辑列表." - ] + "p6": "点击按钮上的箭头来查看你的具体抽卡细节。会自动弹出提示你获得一个 5★ 或 4★。你也可以手动编辑列表。" } }, "types": { diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte index 4a9e8ded..74792986 100644 --- a/src/routes/_layout.svelte +++ b/src/routes/_layout.svelte @@ -85,14 +85,14 @@ href="https://github.com/MadeBaruna/paimon-moe" target="_blank" > - Github + {$t('footer.link.github')} - Dev Twitter + {$t('footer.link.devTwitter')} @@ -104,30 +104,30 @@ href="https://discord.gg/4nbWsCGjjE" target="_blank" > - Discord + {$t('footer.link.discord')} - Facebook + {$t('footer.link.facebook')} - Reddit + {$t('footer.link.reddit')}
- Privacy Policy + {$t('footer.link.privacyPolicy')} - Cookie Settings + {$t('footer.link.cookieSettings')}
diff --git a/src/routes/furnishing/index.svelte b/src/routes/furnishing/index.svelte index 24143991..7f01d319 100644 --- a/src/routes/furnishing/index.svelte +++ b/src/routes/furnishing/index.svelte @@ -156,7 +156,10 @@ ※ {$t('furnishing.sets.subtitle')}

- +
{$t('privacypolicy.notCollect.0')} - {$t(`privacypolicy.notCollect.1`)} + {$t('privacypolicy.notCollect.1')} {$t('privacypolicy.notCollect.2')} - {$t(`privacypolicy.notCollect.3`)} + {$t('privacypolicy.notCollect.3')}

-

Advertisements

- We use third party advertisements to support our site. Some of these advertisers may be served from our third party advertiser. - You can view their - privacy policy - and - cookie policy - here. You can manage your cookies +

{$t('privacypolicy.subtitleAd')}

+ {$t('privacypolicy.ad.0')} + {$t('privacypolicy.ad.1')} + {$t('privacypolicy.ad.2')} + {$t('privacypolicy.ad.3')} + {$t('privacypolicy.ad.4')} + {$t('privacypolicy.ad.5')} - here + {$t('privacypolicy.ad.6')}
diff --git a/src/routes/settings/index.svelte b/src/routes/settings/index.svelte index b2167fd2..0fb6aeda 100644 --- a/src/routes/settings/index.svelte +++ b/src/routes/settings/index.svelte @@ -478,29 +478,29 @@
-

Credits

+

{$t('settings.credits.title')}

- + - + - + diff --git a/src/routes/wish/[id].svelte b/src/routes/wish/[id].svelte index 6e583a31..035a4d23 100644 --- a/src/routes/wish/[id].svelte +++ b/src/routes/wish/[id].svelte @@ -493,7 +493,7 @@

- Wish Counter + {$t('wish.title')} {$t(`wish.types.${id}`)}

diff --git a/src/routes/wish/_detail.svelte b/src/routes/wish/_detail.svelte index 04716368..9c0413b9 100644 --- a/src/routes/wish/_detail.svelte +++ b/src/routes/wish/_detail.svelte @@ -67,10 +67,10 @@

Data and images{$t('settings.credits.items.0.name')} - Genshin Impact Wiki + {$t('settings.credits.items.0.value')}
Stats data{$t('settings.credits.items.1.name')} - Dimbreath Genshin Data + {$t('settings.credits.items.1.value')}
Drop rates for resin calculation{$t('settings.credits.items.2.name')} - Data Gathering Discord + {$t('settings.credits.items.2.value')}
- - - - + + + +
RarityTotalPercentPity AVG{$t('wish.detail.rarity')}{$t('wish.detail.total')}{$t('wish.detail.percent')}{$t('wish.detail.pityAverage')}
@@ -102,7 +102,7 @@
- └ Character + └ {$t('wish.detail.character')} {numberFormat.format(banner.rare.character.length)} @@ -116,7 +116,7 @@
- └ Weapon + └ {$t('wish.detail.weapon')} {numberFormat.format(banner.rare.weapon.length)} diff --git a/src/routes/wish/_helpModal.svelte b/src/routes/wish/_helpModal.svelte index b4baf281..cf86bc66 100644 --- a/src/routes/wish/_helpModal.svelte +++ b/src/routes/wish/_helpModal.svelte @@ -65,15 +65,6 @@ {$t('wish.help.howto.p5.1')}
- {$t('wish.help.howto.p6.0')} - 5 - - {$t('wish.help.howto.p6.1')} - 4 - . {$t('wish.help.howto.p6.2')} + {$t('wish.help.howto.p6')}
diff --git a/src/routes/wish/_summaryItem.svelte b/src/routes/wish/_summaryItem.svelte index 61091e7f..d9677e85 100644 --- a/src/routes/wish/_summaryItem.svelte +++ b/src/routes/wish/_summaryItem.svelte @@ -30,9 +30,9 @@ - - - + + + - + @@ -89,7 +89,7 @@ - +
{$t(`wish.types.${type.id}`)}TotalPercentPity AVG{$t('wish.summary.total')}{$t('wish.summary.percent')}{$t('wish.summary.pityAverage')}
@@ -77,7 +77,7 @@
└ Character └ {$t('wish.summary.character')} {numberFormat.format(avg.rare.character.total)}
└ Weapon └ {$t('wish.summary.weapon')} {numberFormat.format(avg.rare.weapon.total)}