Skip to content

Commit

Permalink
English strings
Browse files Browse the repository at this point in the history
  • Loading branch information
wutao committed Sep 9, 2023
1 parent 4caa2af commit d5895c7
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 53 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ dependencies {
implementation 'androidx.core:core-ktx:1.9.0'
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.ui:ui-util:$compose_version"
implementation "androidx.compose.material:material-icons-extended:1.4.0"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation "androidx.compose.material:material-icons-extended:$compose_version"
implementation "androidx.compose.material3:material3:$material3"
implementation "androidx.compose.material:material:1.3.1"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.0'
implementation "com.google.accompanist:accompanist-navigation-animation:$accompanist"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/ldlywt/memo/ui/component/DisplayText.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fun DisplayText(
) {
Text(
modifier = Modifier
.height(44.dp),
.height(48.dp),
// .animateContentSize(tween()),
text = text,
style = MaterialTheme.typography.displaySmall.copy(
Expand Down
43 changes: 42 additions & 1 deletion app/src/main/res/values-zh-rCN/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Light Memos</string>
<string name="app_name">轻笔记</string>
<string name="search">搜索</string>
<string name="back">返回</string>
<string name="memos">灵感</string>
Expand Down Expand Up @@ -36,6 +36,47 @@
<string name="share">分享</string>
<string name="archive">归档</string>
<string name="explore">探索</string>
<string name="user_agree">用户协议</string>
<string name="contact">联系</string>
<string name="author">开发者：ldlywt</string>
<string name="json_export">Json 导出</string>
<string name="json_export_summary">导出为 Json 数据，不支持图片附件</string>
<string name="color_and_style">颜色和样式</string>
<string name="color_and_style_desc">主题、色调样式</string>
<string name="local_data_manager">本地数据管理</string>
<string name="local_data_manager_desc">本地数据备份/还原/Json导出</string>
<string name="local_data_manager_subtitle">数据本地持久化</string>
<string name="cloud_data_manager">云数据管理</string>
<string name="cloud_data_manager_desc">云数据账号配置/备份/还原</string>
<string name="fix_tag">标签修复</string>
<string name="fix_tag_desc">修正标签与笔记之间的关系</string>
<string name="tips_and_support_desc">关于</string>
<string name="data_backup">数据备份</string>
<string name="data_backup_desc">将数据进行备份</string>
<string name="data_restore">数据导出</string>
<string name="data_restore_desc">还原已经备份过的数据</string>
<string name="appearance">外观</string>
<string name="dark_theme">深色主题</string>
<string name="use_device_theme">跟随系统设置</string>
<string name="on">开启</string>
<string name="off">关闭</string>
<string name="amoled_dark_theme">AMOLED 深色主题</string>
<string name="other">其他</string>
<string name="wallpaper_colors">壁纸颜色</string>
<string name="basic_colors">基本颜色</string>
<string name="no_palettes">暂无色板</string>
<string name="only_android_8.1_plus">仅限 Android 8.1+</string>
<string name="clear">清除</string>
<string name="paste">粘贴</string>
<string name="primary_color">强调色</string>
<string name="primary_color_hint">例如 #666666 或 666666</string>
<string name="sponsor">捐赠</string>
<string name="help">帮助</string>
<string name="cloud_data_config">云盘账号配置</string>
<string name="cloud_data_config_desc">云盘的账号密码配置</string>
<string name="server_url">服务器地址</string>
<string name="add">添加</string>
<string name="tos_tips">在此之前，请阅读并同意服务条款与隐私政策。</string>
<string name="browse_tos_tips">查看《<i><u>服务条款与隐私政策</u></i>》</string>
<string name="agree">同意</string>
</resources>
82 changes: 41 additions & 41 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<string name="search">Search</string>
<string name="back">Back</string>
<string name="memos">Memos</string>
<string name="new_memo">New Memo</string>
<string name="new_memo">New</string>
<string name="compose">Compose</string>
<string name="remove">Remove</string>
<string name="resources">Resources</string>
Expand Down Expand Up @@ -44,45 +44,45 @@
<string name="qq">QQ: 670831931</string>
<string name="about_icon">Icon</string>

<string name="json_export">Json导出</string>
<string name="json_export_summary">导出为 Json 数据，不支持图片附件</string>
<string name="color_and_style">颜色和样式</string>
<string name="color_and_style_desc">主题、色调样式</string>
<string name="local_data_manager">本地数据管理</string>
<string name="local_data_manager_desc">本地数据备份/还原/Json导出</string>
<string name="local_data_manager_subtitle">数据本地持久化</string>
<string name="cloud_data_manager">云数据管理</string>
<string name="cloud_data_manager_desc">云数据账号配置/备份/还原</string>
<string name="fix_tag">标签修复</string>
<string name="fix_tag_desc">修正标签与笔记之间的关系</string>
<string name="tips_and_support_desc">关于、开源</string>
<string name="data_backup">数据备份</string>
<string name="data_backup_desc">将数据进行备份</string>
<string name="data_restore">数据导出</string>
<string name="data_restore_desc">还原已经备份过的数据</string>
<string name="appearance">外观</string>
<string name="dark_theme">深色主题</string>
<string name="use_device_theme">跟随系统设置</string>
<string name="on">开启</string>
<string name="off">关闭</string>
<string name="amoled_dark_theme">AMOLED 深色主题</string>
<string name="other">其他</string>
<string name="wallpaper_colors">壁纸颜色</string>
<string name="basic_colors">基本颜色</string>
<string name="no_palettes">暂无色板</string>
<string name="only_android_8.1_plus">仅限 Android 8.1+</string>
<string name="clear">清除</string>
<string name="paste">粘贴</string>
<string name="primary_color">强调色</string>
<string name="primary_color_hint">例如 #666666 或 666666</string>
<string name="sponsor">捐赠</string>
<string name="help">帮助</string>
<string name="cloud_data_config">云盘账号配置</string>
<string name="cloud_data_config_desc">云盘的账号密码配置</string>
<string name="server_url">服务器地址</string>
<string name="add">添加</string>
<string name="welcome">Welcome</string>
<string name="tos_tips">在此之前，请阅读并同意服务条款与隐私政策。</string>
<string name="browse_tos_tips">查看《<i><u>服务条款与隐私政策</u></i>》</string>
<string name="json_export">Json Export</string>
<string name="json_export_summary">Export as Json data, does not support image attachments</string>
<string name="color_and_style">Color and Style</string>
<string name="color_and_style_desc">Themes, Color Styles</string>
<string name="local_data_manager">Local Data</string>
<string name="local_data_manager_desc">Local data backup/restore/Json export</string>
<string name="local_data_manager_subtitle">Data local persistence</string>
<string name="cloud_data_manager">Cloud Data</string>
<string name="cloud_data_manager_desc">Cloud data configuration/backup/restore</string>
<string name="fix_tag">Tag Repair</string>
<string name="tips_and_support_desc">About</string>
<string name="data_backup">Data Backup</string>
<string name="data_backup_desc">Backup Data</string>
<string name="data_restore_desc">Restoring data that has been backed up</string>
<string name="appearance">Exterior</string>
<string name="use_device_theme">Follow System</string>
<string name="amoled_dark_theme">AMOLED Dark Theme</string>
<string name="other">Other</string>
<string name="wallpaper_colors">Wallpaper Color</string>
<string name="basic_colors">Basic Color</string>
<string name="no_palettes">No Color Palette</string>
<string name="only_android_8.1_plus">Android 8.1+ Only</string>
<string name="primary_color_hint">For example #666666 or 666666</string>
<string name="cloud_data_config_desc">Cloud disk account password configuration</string>
<string name="welcome" translatable="false">Welcome</string>
<string name="browse_tos_tips">Browse the &lt;i&gt;&lt;u&gt;Terms of Service and Privacy Policy&lt;/u&gt;&lt;/i&gt;</string>
<string name="agree">Agree</string>
<string name="fix_tag_desc">Fix relationship between tags and notes</string>
<string name="data_restore">Data Export</string>
<string name="dark_theme">Dark Theme</string>
<string name="on">On</string>
<string name="off">Off</string>
<string name="clear">Clear</string>
<string name="paste">Paste</string>
<string name="primary_color">Primary Color</string>
<string name="sponsor">Sponsor</string>
<string name="help">Help</string>
<string name="cloud_data_config">Cloud Data Config</string>
<string name="server_url">Server Address</string>
<string name="add">Add</string>
<string name="tos_tips">Before doing so, please read and agree to the Terms of Service and Privacy Policy.</string>
</resources>
8 changes: 0 additions & 8 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,8 @@ buildscript {
accompanist = '0.30.0'
// https://developer.android.com/jetpack/androidx/releases/compose-material3
material3 = '1.1.0-beta01'
// https://square.github.io/okhttp/changelogs/changelog/
okhttp_version = '4.10.0'
// https://github.com/square/retrofit/tags
retrofit_version = '2.9.0'
// https://developer.android.com/jetpack/androidx/releases/datastore
datastore = "1.0.0"
// https://github.com/skydoves/sandwich/releases
sandwich = "1.3.5"
// https://github.com/square/moshi/tags
moshi = "1.14.0"
// https://developer.android.com/jetpack/androidx/releases/paging
paging_version = "3.1.1"
accompanist = '0.24.7-alpha'
Expand Down

0 comments on commit d5895c7

Please sign in to comment.