|
@@ -142,6 +142,7 @@
|
|
|
<string name="confirmation_remove_folders_alert">确定删除选中项及其内容?</string>
|
|
|
<string name="confirmation_remove_local">仅本地</string>
|
|
|
<string name="conflict_already_existing_file">已经存在的文件</string>
|
|
|
+ <string name="conflict_dialog_error">创建冲突会话时出错!</string>
|
|
|
<string name="conflict_message_description">如果您选择两个版本,则本地文件的名称后面将附加一个数字。</string>
|
|
|
<string name="conflict_message_headline">请选择需要保留的文件?</string>
|
|
|
<string name="conflict_new_file">新文件</string>
|
|
@@ -260,6 +261,7 @@
|
|
|
<string name="etm_background_job_progress">进度</string>
|
|
|
<string name="etm_background_job_started">已开始</string>
|
|
|
<string name="etm_background_job_state">状况</string>
|
|
|
+ <string name="etm_background_job_user">用户</string>
|
|
|
<string name="etm_background_job_uuid">UUID</string>
|
|
|
<string name="etm_background_jobs">后台任务</string>
|
|
|
<string name="etm_background_jobs_cancel_all">取消所有工作</string>
|