The problem here is that this directory was added and committed by someone but still existed as a local modification in the anon tree. I don't know how to resolve this without simply reverting the changes to the anon tree and losing all the edits so he'll have to start over.
>________________________________ > From: Michal Hriň <michalh...@aol.com> >To: ooo-dev@incubator.apache.org >Sent: Tuesday, August 7, 2012 12:04 PM >Subject: Re: CMS diff: Why Apache OpenOffice: Great Software > >Hi , > >This patch gives me errors, M+ on file and R_+_C on directories, >Kay, Joe or someone , can you look at this, is it my bug ? > >I can't find in hurry what this status means ... > >Regards, Michal Hriň > > > > > >Clone URL (Committers only): >https://cms.apache.org/redirect?new=anonymous;action=diff;uri=http://ooo-site.apache.org/zh-cn%2Fwhy%2Fwhy_great.mdtext > >Shenfeng Liu > >Index: trunk/content/zh-cn/why/why_great.mdtext >=================================================================== >--- trunk/content/zh-cn/why/why_great.mdtext (working copy) >+++ trunk/content/zh-cn/why/why_great.mdtext (working copy) >@@ -1,4 +1,4 @@ >-Title: Why Apache OpenOffice: Great Software >+Title: 为何选择Apache OpenOffice：杰出的软件 >Notice: Licensed to the Apache Software Foundation (ASF) under one > or more contributor license agreements. See the NOTICE file > distributed with this work for additional information >@@ -16,18 +16,18 @@ > specific language governing permissions and limitations > under the License. > >- # >{.rfloatimg} >+ # {.rfloatimg} > >-Great Software requires great people. Apache OpenOffice is the result of over >twenty years' continuous high quality software engineering. Designed from the >start as a **single piece of software**, Apache OpenOffice has a consistency >and >a quality that is world class. Its **open-source** development model means >there >are no secrets. >+杰出的软件依赖于杰出的人。Apache OpenOffice凝聚了二十多年持续高质量软件工程的结晶。从最初的**单一软件**开始，Apache >OpenOffice秉承一致，具有世界级的质量。它的**开源**开发模式意味着没有秘密。 > >- - **Better by design** >+ - **更好的设计** > >- Developed over twenty years, Apache OpenOffice is a mature, reliable, >product. OpenOffice was designed from the start as a single piece of software - >not bolted together from separate software packages. This makes it very >consistent and easy to use - what you learn in one application is immediately >usable in another. The context-sensitive help works across all applications, >unobtrusively providing the precise help you need. You can even open any type >of >document from any application - OpenOffice is really one piece of software. It >also runs on all major computing platforms - Microsoft Windows, GNU/Linux, Sun >Solaris, Apple Mac - isn't that great! >+ 历经二十余年开发，Apache >OpenOffice是一款成熟可靠的产品。OpenOffice是从单一软件为设计起点——而不是将来自不同地方的软件包囫囵拼装到一起。这使它非常一致并易于使用——你在一个应用中学到的能够立即应用到另一个应用。在所有应用中都有基于上下文的帮助，恰到好处地为你提供所需的精确帮助信息。你甚至可以在任何一个应用中打开任何一种类型的文档——这就叫单一软件。并且它可以在所有主要计算机平台上运行——微软视窗、GNU/Linux、Sun >Solaris、苹果Mac——是不是很棒！ > >- - **Better for you** >+ - **更适合你** > >- Apache OpenOffice contains all the office software you need, in one single >package. You don't have to worry which version to install: one installation >program provides everything. The installation also includes features which some >expensive rivals do not - for example, the ability to create .pdf files when >you >want to guarantee what the recipient sees on their computer. There is also a >growing range of extensions: additional features that any developer can >provide. >The Apache OpenOffice project releases software several times a year so you can >take advantage of new features as quickly as possible. >+ Apache >OpenOffice在一个单一软件包中包含了所有你需要的办公软件。你不必苦恼于应选择安装什么：一个安装程序就包含了所有应用。所安装的内容中还包含一些那些昂贵的竞争对手所没有的功能——比如，创建pdf文件的功能，使你能够确保文件接收者可以在它们的机器上浏览你的文件。而大量的扩展包提供了许多额外的功能，这样的扩展包来自不同的开发者，而且还在不断增加。Apache >OpenOffice项目每年会发布多个版本，这样你就能够尽快享受到新的功能。 > >- - **Honest software** >+ - **诚信软件** > >- Apache OpenOffice is developed using an open-software, "no secrets" >approach. Anyone can look at the programs and suggest improvements, or fix >bugs. >Anyone can report problems or request enhancements, and anyone can see the >response from other users or developers. The status of current and future >releases is displayed on a public wiki, so you can decide if and when you want >to upgrade to take advantage of new features. Anyone used to commercial >software >and its hyping and marketing speak will find Apache OpenOffice refreshingly >different. Enjoy the benefits of open-source! >+ Apache >OpenOffice是使用开放软件开发的，遵循“没有秘密”的方式。任何人都可以查看这个项目并提出改进建议或修复缺陷。任何人都可以报告问题或者提出功能增强的要求，并看到来自其他用户或开发员的反馈。当前和未来版本都在wiki页面公布，这样你就可以决定是否想升级以利用新功能，何时升级。所有习惯于商业软件和相关市场宣传和广告的人都会发现Apache >OpenOffice完全不同。享受开源之美吧！ > >
