summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--locales/help_docs/en.yml22
-rw-r--r--locales/help_docs/zh-CN.yml12
2 files changed, 17 insertions, 17 deletions
diff --git a/locales/help_docs/en.yml b/locales/help_docs/en.yml
index 70e8044..074b232 100644
--- a/locales/help_docs/en.yml
+++ b/locales/help_docs/en.yml
@@ -638,11 +638,11 @@ jv:
here:
items:
- name: Name
- version: Version
- holder: Holder
- size: Size
- editing: Status
+ name: NAME
+ version: VERSION
+ holder: HOLDER
+ size: SIZE
+ editing: STATUS
path_info: |
CURRENT: %{upstream}/%{account}/%{sheet_name}/%{path} (%{minutes} min age)
@@ -717,13 +717,14 @@ jv:
- Lost: %{path}
moved_item: |
- > Moved: %{from} -> %{to}
+ > Moved: %{from}
+ To: %{to}
modified_item: |
* Modified: %{path}
invalid_modified_item: |
- * Modified: %{path} (%{reason})
+ x Modified: %{path} (%{reason})
invalid_modified_reasons:
not_holder: Modified without holding
@@ -781,7 +782,7 @@ jv:
Upstream changed, use `jv update` to get the latest information
sheet_already_exists: |
- Sheet `%{name}` already exists!
+ Sheet `%{name}` already exists and is held by other members!
sheet_creation_failed: |
Sheet creation failed: `%{error}`
@@ -814,9 +815,8 @@ jv:
**Total**: %{created} Created, %{updated} Updated, %{synced} Synced
structure_changes_not_solved: |
- There are unresolved local structure changes!
- This indicates there are unconfirmed move or delete operations in your local workspace
- **Tip**: Use `jv status` to view structure changes
+ There are unresolved local lost and moved items!
+ **Tip**: Use `jv align` to view items that need to be resolved
create_failed:
sheet_not_found: |
diff --git a/locales/help_docs/zh-CN.yml b/locales/help_docs/zh-CN.yml
index fab838d..22de88f 100644
--- a/locales/help_docs/zh-CN.yml
+++ b/locales/help_docs/zh-CN.yml
@@ -723,13 +723,14 @@ jv:
- 丢失: %{path}
moved_item: |
- > 移动: %{from} 至 %{to}
+ > 移动: %{from}
+ 至: %{to}
modified_item: |
* 修改: %{path}
invalid_modified_item: |
- * 修改: %{path}(%{reason})
+ x 修改: %{path}(%{reason})
invalid_modified_reasons:
not_holder: 不持有但被修改
@@ -787,7 +788,7 @@ jv:
上游信息已变更,请使用 `jv update` 同步至最新信息
sheet_already_exists: |
- 表 `%{name}` 已存在!
+ 表 `%{name}` 已存在,并由其他成员所持有!
sheet_creation_failed: |
表创建失败:`%{err}`
@@ -820,9 +821,8 @@ jv:
其中,创建 %{created},更新 %{updated},同步 %{synced}
structure_changes_not_solved: |
- 本地有结构变更未解决!
- 这说明您的本地工作区存在未确认的移动或删除操作
- **提示**:使用 `jv status` 查看结构变更
+ 本地存在丢失项和移动项未解决!
+ **提示**:使用 `jv align` 查看需要解决的项
create_failed:
sheet_not_found: |