Skip to content

Commit

Permalink
v24 (#243)
Browse files Browse the repository at this point in the history
* 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 <slavick@users.noreply.github.com>

* 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 <marc-medley@users.noreply.github.com>
Co-authored-by: JaquelineP <jaqueline.pollak@gmail.com>
  • Loading branch information
3 people authored Feb 10, 2024
1 parent 5059897 commit a2dee1e
Show file tree
Hide file tree
Showing 9 changed files with 1,321 additions and 179 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,5 +160,5 @@ The footer should reference GitHub issues that this commit **Closes**.
[issues]: https://github.com/nutritionfactsorg/daily-dozen-android/issues "Daily Dozen for Android Issues"
[issue]: https://github.com/nutritionfactsorg/daily-dozen-android/issues/new "Create an Issue"
[pr]: https://github.com/nutritionfactsorg/daily-dozen-android/pulls "Pull Requests"
[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"
[cremail]: mailto:christi@nutritionfacts.org?subject=Slack%20#Development%20Invitation
[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"
[cremail]: mailto:christi@nutritionfacts.org?subject=Slack%20#Development%20Invitation
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ android {
multiDexEnabled true
targetSdkVersion 33
vectorDrawables.useSupportLibrary = true
versionCode 85
versionName "23.1"
versionCode 86
versionName "24"
}
buildTypes {
debug {
Expand Down Expand Up @@ -71,7 +71,7 @@ dependencies {
implementation 'com.github.prolificinteractive:material-calendarview:2.0.1'
implementation('com.joanzapata.iconify:android-iconify-fontawesome:2.2.2') { exclude group: "com.android.support" }
implementation('com.github.PhilJay:MPAndroidChart:v2.2.5') { exclude group: "com.android.support" }
implementation('org.greenrobot:eventbus:3.2.0') { exclude group: "com.android.support" }
implementation('org.greenrobot:eventbus:3.3.1') { exclude group: "com.android.support" }
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.jakewharton.timber:timber:4.7.1'
implementation "io.noties.markwon:core:4.6.2"
Expand Down
571 changes: 571 additions & 0 deletions app/src/main/res/values-b+zh+Hans/strings.xml

Large diffs are not rendered by default.

571 changes: 571 additions & 0 deletions app/src/main/res/values-b+zh+Hant/strings.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<string name="daily_reminder_settings">Настройки за напомняне</string>
<string name="enable_daily_reminder">Активиране на напомнянето</string>
<string name="remind_me_at">Напомни ми на</string>
<string name="videos">Видео клипове</string>
<string name="videos">Видео</string>
<string name="units">единици</string>
<string name="imperial">имперски</string>
<string name="metric">метричен</string>
Expand Down
24 changes: 12 additions & 12 deletions app/src/main/res/values-de/strings.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/src/main/res/values-ro/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<string name="daily_reminder_settings">Setări pentru mementouri zilnice</string>
<string name="enable_daily_reminder">Activați Memento Zilnic</string>
<string name="remind_me_at">Amintește-mi la</string>
<string name="videos">Videoclipuri</string>
<string name="videos">Video</string>
<string name="units">Unități</string>
<string name="imperial">Imperial</string>
<string name="metric">Metric</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<string name="daily_reminder_settings">Настройки ежедневных напоминаний</string>
<string name="enable_daily_reminder">Включить ежедневные напоминания</string>
<string name="remind_me_at">Напомнить мне в:</string>
<string name="videos">ВИДЕО</string>
<string name="videos">Видео</string>
<string name="units">Единица Измерения:</string>
<string name="imperial">имперская</string>
<string name="metric">метрическая</string>
Expand Down
318 changes: 159 additions & 159 deletions app/src/main/res/values-zh/strings.xml

Large diffs are not rendered by default.

0 comments on commit a2dee1e

Please sign in to comment.