Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Chinese translation of cross-quarter days #728

Merged
merged 1 commit into from
Aug 21, 2023
Merged

fix: Chinese translation of cross-quarter days #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions app/src/main/res/values-zh-rCN/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,14 +370,14 @@
<string name="timeMode_solstice_winter">冬至</string> <!-- setting -->
<string name="timeMode_solstice_winter_short">冬至</string> <!-- setting -->

<string name="timeMode_cross_midwinter">春跨季度</string> <!-- setting --> <!-- TODO; "Spring Cross-Quarter" to either "Imbolc (Cross-Quarter), or "Mid-Winter (Cross-Quarter)" -->
<string name="timeMode_cross_midwinter_short">跨季度</string> <!-- setting -->
<string name="timeMode_cross_midsummer">秋跨季度</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midsummer_short">跨季度</string> <!-- setting -->
<string name="timeMode_cross_midspring">夏跨季度</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midspring_short">跨季度</string> <!-- setting -->
<string name="timeMode_cross_midautumnal">冬跨季度</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midautumnal_short">跨季度</string> <!-- setting -->
<string name="timeMode_cross_midwinter">圣布里吉德节 (Imbolc)</string> <!-- setting -->
<string name="timeMode_cross_midwinter_short">跨季节</string> <!-- setting -->
<string name="timeMode_cross_midsummer">拉马斯节 (Lughnasadh)</string> <!-- setting -->
<string name="timeMode_cross_midsummer_short">跨季节</string> <!-- setting -->
<string name="timeMode_cross_midspring">贝尔丹节 (Beltane)</string> <!-- setting -->
<string name="timeMode_cross_midspring_short">跨季节</string> <!-- setting -->
<string name="timeMode_cross_midautumnal">夏末节 (Samhain)</string> <!-- setting -->
<string name="timeMode_cross_midautumnal_short">跨季节</string> <!-- setting -->

<string name="timeMode_moon">月光</string> <!-- label -->
<string name="timeMode_moon_new">新月</string> <!-- setting -->
Expand Down Expand Up @@ -1121,7 +1121,7 @@
<string name="configLabel_ui_showmoon_noon_summary">在月亮对话框中显示月亮正午和月亮午夜。</string>

<!-- App Setting: Show Cross Quarter days -->
<string name="configLabel_ui_showCrossQuarter">跨季度日</string>
<string name="configLabel_ui_showCrossQuarter">跨季节日</string>
<string name="configLabel_ui_showCrossQuarter_summary">包含至点和分点之间的中点。</string>

<!-- App Setting: Show Equinox / Solstice -->
Expand Down Expand Up @@ -1767,10 +1767,10 @@
]]></string> <!-- each [Icon LABEL] is replaced with an actual icon at runtime -->

<string name="help_general_timeMode2_1"><![CDATA[
<b>春跨季度:</b> 冬至与春分的中点；<em>二月</em>[北半球]，或 <em>八月</em>[南半球]。<br/><br/>
<b>夏跨季度:</b> 春分与夏至的中点；<em>五月</em>[北半球], 或 <em>十一月</em>[南半球]。<br/><br/>
<b>秋跨季度:</b> 夏至与秋分的中点；<em>八月</em>[北半球], 或 <em>二月</em>[南半球]。<br/><br/>
<b>冬跨季度:</b> 秋分与冬至的中点；<em>十一月</em>[北半球], 或 <em>五月</em>[南半球]。<br/>
<b>春跨季节:</b> 冬至与春分的中点；<em>二月</em>[北半球]，或 <em>八月</em>[南半球]。<br/><br/>
<b>夏跨季节:</b> 春分与夏至的中点；<em>五月</em>[北半球], 或 <em>十一月</em>[南半球]。<br/><br/>
<b>秋跨季节:</b> 夏至与秋分的中点；<em>八月</em>[北半球], 或 <em>二月</em>[南半球]。<br/><br/>
<b>冬跨季节:</b> 秋分与冬至的中点；<em>十一月</em>[北半球], 或 <em>五月</em>[南半球]。<br/>
]]></string> <!-- help contents: cross-quarter days -->

<string name="help_eventlist"><![CDATA[
Expand Down
26 changes: 13 additions & 13 deletions app/src/main/res/values-zh-rTW/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,14 +370,14 @@
<string name="timeMode_solstice_winter">冬至</string> <!-- setting -->
<string name="timeMode_solstice_winter_short">冬至</string> <!-- setting -->

<string name="timeMode_cross_midwinter">春跨季度</string> <!-- setting --> <!-- TODO; "Spring Cross-Quarter" to either "Imbolc (Cross-Quarter), or "Mid-Winter (Cross-Quarter)" -->
<string name="timeMode_cross_midwinter_short">跨季度</string> <!-- setting -->
<string name="timeMode_cross_midsummer">秋跨季度</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midsummer_short">跨季度</string> <!-- setting -->
<string name="timeMode_cross_midspring">夏跨季度</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midspring_short">跨季度</string> <!-- setting -->
<string name="timeMode_cross_midautumnal">冬跨季度</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midautumnal_short">跨季度</string> <!-- setting -->
<string name="timeMode_cross_midwinter">聖布里吉德節 (Imbolc)</string> <!-- setting -->
<string name="timeMode_cross_midwinter_short">跨季節</string> <!-- setting -->
<string name="timeMode_cross_midsummer">拉馬斯節 (Lughnasadh)</string> <!-- setting -->
<string name="timeMode_cross_midsummer_short">跨季節</string> <!-- setting -->
<string name="timeMode_cross_midspring">貝爾丹節 (Beltane)</string> <!-- setting -->
<string name="timeMode_cross_midspring_short">跨季節</string> <!-- setting -->
<string name="timeMode_cross_midautumnal">夏末節 (Samhain)</string> <!-- setting -->
<string name="timeMode_cross_midautumnal_short">跨季節</string> <!-- setting -->

<string name="timeMode_moon">月光</string> <!-- label -->
<string name="timeMode_moon_new">新月</string> <!-- setting -->
Expand Down Expand Up @@ -1121,7 +1121,7 @@
<string name="configLabel_ui_showmoon_noon_summary">在月亮對話框中顯示月亮正午和月亮午夜。</string>

<!-- App Setting: Show Cross Quarter days -->
<string name="configLabel_ui_showCrossQuarter">跨季度日</string>
<string name="configLabel_ui_showCrossQuarter">跨季節日</string>
<string name="configLabel_ui_showCrossQuarter_summary">包含至點和分點之間的中點。</string>

<!-- App Setting: Show Equinox / Solstice -->
Expand Down Expand Up @@ -1767,10 +1767,10 @@
]]></string> <!-- each [Icon LABEL] is replaced with an actual icon at runtime -->

<string name="help_general_timeMode2_1"><![CDATA[
<b>春跨季度:</b> 冬至與春分的中點；<em>二月</em>[北半球]，或 <em>八月</em>[南半球]。<br/><br/>
<b>夏跨季度:</b> 春分與夏至的中點；<em>五月</em>[北半球], 或 <em>十一月</em>[南半球]。<br/><br/>
<b>秋跨季度:</b> 夏至與秋分的中點；<em>八月</em>[北半球], 或 <em>二月</em>[南半球]。<br/><br/>
<b>冬跨季度:</b> 秋分與冬至的中點；<em>十一月</em>[北半球], 或 <em>五月</em>[南半球]。<br/>
<b>春跨季節:</b> 冬至與春分的中點；<em>二月</em>[北半球]，或 <em>八月</em>[南半球]。<br/><br/>
<b>夏跨季節:</b> 春分與夏至的中點；<em>五月</em>[北半球], 或 <em>十一月</em>[南半球]。<br/><br/>
<b>秋跨季節:</b> 夏至與秋分的中點；<em>八月</em>[北半球], 或 <em>二月</em>[南半球]。<br/><br/>
<b>冬跨季節:</b> 秋分與冬至的中點；<em>十一月</em>[北半球], 或 <em>五月</em>[南半球]。<br/>
]]></string> <!-- help contents: cross-quarter days -->

<string name="help_eventlist"><![CDATA[
Expand Down
Loading