diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2013-12-29 20:45:58 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2013-12-29 20:45:58 -0200 |
commit | 97e689213ff4e829f251af526ed4e796a3cc2b71 (patch) | |
tree | b04d03ec56305041216b72328fc9b5afde27bc76 /mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/conflict.txt | |
parent | 0ab6351abb7a602d96c62b0ad35413c88113a6cf (diff) | |
parent | 69e2d8c5d8732042c9319aef1fdea45a82b63e42 (diff) | |
download | elgg-97e689213ff4e829f251af526ed4e796a3cc2b71.tar.gz elgg-97e689213ff4e829f251af526ed4e796a3cc2b71.tar.bz2 |
Merge branch 'master' into saravea
Conflicts:
.gitmodules
mod/admins
mod/assemblies
mod/audio_html5
mod/beechat
mod/crud
mod/elgg-activitystreams
mod/elggman
mod/elggpg
mod/favorites
mod/federated-objects
mod/friendly_time
mod/group_alias
mod/group_operators
mod/languages
mod/lightpics
mod/openid_client
mod/spotlight
mod/suicide
mod/tasks
mod/videolist
Diffstat (limited to 'mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/conflict.txt')
-rw-r--r-- | mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/conflict.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/conflict.txt new file mode 100644 index 000000000..92eedf45b --- /dev/null +++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/conflict.txt @@ -0,0 +1,5 @@ +====== 存在一个更新的版本 ====== + +您编辑的文档存在一个更新的版本。这种情况的发生是因为在您编辑时有另一个用户更改了该文档。 + +请仔细检查下面列出的差别,并决定保留哪个版本。如果您选择“保存”,您的版本将被保留。点击“取消”将保留当前版本。 |