Skip to content

Commit a2dee1e

Browse files
slavickmarc-medleyJaquelineP
authored
v24 (#243)
* German (de) update (#237) * Upgrade org.greenrobot:eventbus to 3.3.1 * Update link in CONTRIBUTING.md (#239) * major zh Chinese (Traditional) translation update. minor de German quotation mark, space char changes. (#240) * Chinese traditional update (#241) * major zh Chinese (Traditional) translation update. minor de German quotation mark, space char changes. * Traditional Chinese update (zh-Hant). Minor updates bg/ro/ru. --------- Co-authored-by: John Slavick <[email protected]> * Simplified Chinese (zh-Hans) addition. Traditional Chinese (zh-Hant) relocation. (#242) * Adds Simplified Chinese (zh-Hans) translation. Places Traditional Chineses (zh-Hant) in `values-zh-Hant`. * Updated some Simplified Chinese items found during testing of iOS pre-release version. * Move Chinese translations to proper directories * Update versionCode and versionName --------- Co-authored-by: --marc <[email protected]> Co-authored-by: JaquelineP <[email protected]>
1 parent 5059897 commit a2dee1e

File tree

9 files changed

+1321
-179
lines changed

9 files changed

+1321
-179
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,5 @@ The footer should reference GitHub issues that this commit **Closes**.
160160
[issues]: https://github.com/nutritionfactsorg/daily-dozen-android/issues "Daily Dozen for Android Issues"
161161
[issue]: https://github.com/nutritionfactsorg/daily-dozen-android/issues/new "Create an Issue"
162162
[pr]: https://github.com/nutritionfactsorg/daily-dozen-android/pulls "Pull Requests"
163-
[contribute-os]: https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github "How to Contribute to an Open Source Project on GitHub"
164-
[cremail]: mailto:[email protected]?subject=Slack%20#Development%20Invitation
163+
[contribute-os]: https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github "How to Contribute to an Open Source Project on GitHub"
164+
[cremail]: mailto:[email protected]?subject=Slack%20#Development%20Invitation

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ android {
3434
multiDexEnabled true
3535
targetSdkVersion 33
3636
vectorDrawables.useSupportLibrary = true
37-
versionCode 85
38-
versionName "23.1"
37+
versionCode 86
38+
versionName "24"
3939
}
4040
buildTypes {
4141
debug {
@@ -71,7 +71,7 @@ dependencies {
7171
implementation 'com.github.prolificinteractive:material-calendarview:2.0.1'
7272
implementation('com.joanzapata.iconify:android-iconify-fontawesome:2.2.2') { exclude group: "com.android.support" }
7373
implementation('com.github.PhilJay:MPAndroidChart:v2.2.5') { exclude group: "com.android.support" }
74-
implementation('org.greenrobot:eventbus:3.2.0') { exclude group: "com.android.support" }
74+
implementation('org.greenrobot:eventbus:3.3.1') { exclude group: "com.android.support" }
7575
implementation 'com.google.code.gson:gson:2.8.6'
7676
implementation 'com.jakewharton.timber:timber:4.7.1'
7777
implementation "io.noties.markwon:core:4.6.2"

app/src/main/res/values-b+zh+Hans/strings.xml

Lines changed: 571 additions & 0 deletions
Large diffs are not rendered by default.

app/src/main/res/values-b+zh+Hant/strings.xml

Lines changed: 571 additions & 0 deletions
Large diffs are not rendered by default.

app/src/main/res/values-bg/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<string name="daily_reminder_settings">Настройки за напомняне</string>
7676
<string name="enable_daily_reminder">Активиране на напомнянето</string>
7777
<string name="remind_me_at">Напомни ми на</string>
78-
<string name="videos">Видео клипове</string>
78+
<string name="videos">Видео</string>
7979
<string name="units">единици</string>
8080
<string name="imperial">имперски</string>
8181
<string name="metric">метричен</string>

app/src/main/res/values-de/strings.xml

Lines changed: 12 additions & 12 deletions
Large diffs are not rendered by default.

app/src/main/res/values-ro/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<string name="daily_reminder_settings">Setări pentru mementouri zilnice</string>
7676
<string name="enable_daily_reminder">Activați Memento Zilnic</string>
7777
<string name="remind_me_at">Amintește-mi la</string>
78-
<string name="videos">Videoclipuri</string>
78+
<string name="videos">Video</string>
7979
<string name="units">Unități</string>
8080
<string name="imperial">Imperial</string>
8181
<string name="metric">Metric</string>

app/src/main/res/values-ru/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<string name="daily_reminder_settings">Настройки ежедневных напоминаний</string>
7676
<string name="enable_daily_reminder">Включить ежедневные напоминания</string>
7777
<string name="remind_me_at">Напомнить мне в:</string>
78-
<string name="videos">ВИДЕО</string>
78+
<string name="videos">Видео</string>
7979
<string name="units">Единица Измерения:</string>
8080
<string name="imperial">имперская</string>
8181
<string name="metric">метрическая</string>

app/src/main/res/values-zh/strings.xml

Lines changed: 159 additions & 159 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)