diff options
Diffstat (limited to 'resources/locales/en.yml')
| -rw-r--r-- | resources/locales/en.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/resources/locales/en.yml b/resources/locales/en.yml index be88c60..d3c7085 100644 --- a/resources/locales/en.yml +++ b/resources/locales/en.yml @@ -646,7 +646,6 @@ jv: init_create_dir_not_empty: | The current directory is not empty! - If you are certain you want to create here, please use --force to force execution! create: Failed to create local workspace! init: Failed to create workspace here! @@ -1083,8 +1082,7 @@ jv: Successfully merged share `%{share_id}` into your sheet `%{sheet}` Upstream information has changed, please use `jv update` to sync to the latest information - success_reject: - Rejected share `%{share_id}` + success_reject: Rejected share `%{share_id}` has_conflicts: | Conflicts occurred when merging structure from share `%{share_id}` into your sheet! |