isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-07 17:48:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java
#	app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
#	app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
#	uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
#	uhabits-android/src/main/res/values-id/strings.xml
#	uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
This commit is contained in:
Alinson S. Xavier
2017-07-18 22:54:52 -04:00
parent 122b300c50 540a618ba8
commit 2db4c06fe8
21 changed files with 724 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
uhabits-android/src/main/res/values-zh-rTW/strings.xml
View File

@@ -46,7 +46,7 @@
<string name="times_every">次每</string>
<string name="days">日</string>
<string name="reminder">提醒</string>
<string name="discard">放棄</string>
<string name="discard">取消</string>
<string name="save">保存</string>
<string name="streaks">記錄</string>
<string name="no_habits_found">你還沒有任何習慣</string>
@@ -74,6 +74,7 @@
<string name="interval_2_hour">2小時</string>
<string name="interval_4_hour">4小時</string>
<string name="interval_8_hour">8小時</string>
<string name="interval_24_hour">24 小時</string>
<string name="pref_toggle_title">短按來記錄習慣</string>
<string name="pref_toggle_description">但有可能造成意外記錄</string>
<string name="pref_snooze_interval_title">提醒延遲間隔</string>
@@ -91,6 +92,7 @@
<string name="hint_landscape">把手機橫放可以看到更多天數</string>
<string name="delete_habits">刪除</string>
<string name="delete_habits_message">習慣會被永久刪除，而且該操作不可恢復</string>
<string name="habit_not_found">習慣已刪除/找不到</string>
<string name="weekends">周末</string>
<string name="any_weekday">工作日</string>
<string name="any_day">每天</string>
@@ -120,7 +122,7 @@
<string name="two_times_per_week">每週兩次</string>
<string name="five_times_per_week">每週五次</string>
<string name="custom_frequency">自訂週期</string>
<string name="help">幫助&amp;amp;常見問題</string>
<string name="help">幫助&amp; 常見問題</string>
<string name="could_not_export">輸出資料失敗</string>
<string name="could_not_import">輸入資料失敗</string>
<string name="file_not_recognized">無法辨識</string>
@@ -146,6 +148,7 @@
<string name="month">月</string>
<string name="quarter">季</string>
<string name="year">年</string>
<string name="total">總計</string>
<!-- Middle part of the sentence '1 time in xx days' -->
<string name="time_every">次每</string>
<string name="every_x_days">每 %d 天</string>
@@ -154,4 +157,22 @@
<string name="score">分數</string>
<string name="reminder_sound">提醒音效</string>
<string name="none">無</string>
<string name="filter">篩選</string>
<string name="hide_completed">隱藏已完成的習慣</string>
<string name="hide_archived">隱藏已封存習慣</string>
<string name="sticky_notifications">使提醒保持常駐</string>
<string name="sticky_notifications_description">防止提醒被滑動移除</string>
<string name="repair_database">修復資料庫</string>
<string name="database_repaired">資料庫已修復</string>
<string name="uncheck">取消選取</string>
<string name="toggle">切換</string>
<string name="action">操作</string>
<string name="habit">習慣</string>
<string name="sort">排序</string>
<string name="manually">手動</string>
<string name="by_name">根據名稱</string>
<string name="by_color">根據顏色</string>
<string name="by_score">根據分數</string>
<string name="download">下載</string>
<string name="export">匯出</string>
</resources>