diff options
author | sembrestels <sembrestels@riseup.net> | 2011-10-13 15:23:11 +0200 |
---|---|---|
committer | sembrestels <sembrestels@riseup.net> | 2011-10-13 15:23:11 +0200 |
commit | 74bd6999c5e5c23ebbf90dbb6bdaabbddd7594cf (patch) | |
tree | 834c120d692be288f261bcae169eedd3d6b31d74 /vendors/dokuwiki/inc/lang/zh/conflict.txt | |
parent | f8be8643f0faadb2c0ce87d553b7b9d569af5afd (diff) | |
download | elgg-74bd6999c5e5c23ebbf90dbb6bdaabbddd7594cf.tar.gz elgg-74bd6999c5e5c23ebbf90dbb6bdaabbddd7594cf.tar.bz2 |
Rename lib/dokuwiki to vendors/dokuwiki
Diffstat (limited to 'vendors/dokuwiki/inc/lang/zh/conflict.txt')
-rw-r--r-- | vendors/dokuwiki/inc/lang/zh/conflict.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vendors/dokuwiki/inc/lang/zh/conflict.txt b/vendors/dokuwiki/inc/lang/zh/conflict.txt new file mode 100644 index 000000000..92eedf45b --- /dev/null +++ b/vendors/dokuwiki/inc/lang/zh/conflict.txt @@ -0,0 +1,5 @@ +====== 存在一个更新的版本 ====== + +您编辑的文档存在一个更新的版本。这种情况的发生是因为在您编辑时有另一个用户更改了该文档。 + +请仔细检查下面列出的差别,并决定保留哪个版本。如果您选择“保存”,您的版本将被保留。点击“取消”将保留当前版本。 |