Clean up mistakes made by merging in windows directory
This commit is contained in:
Glen De Cauwsemaecker
parent
b954e70d85
commit
d052390eec
5 changed files with 1 additions and 837 deletions
scripts/windows/coco-dev-setup/batch/localization
|
|
@ -1,86 +1,3 @@
|
|||
<<<<<<< HEAD:scripts/windows/coco-dev-setup/batch/localisation/de.coco
|
||||
<?xml version="1.0" encoding="ISO-8859-1" ?>
|
||||
<variables>
|
||||
<global>
|
||||
<native>Deutsch</native>
|
||||
<intro>Ab jetzt senden wir unser Feedback in Englisch!</intro>
|
||||
</global>
|
||||
<install>
|
||||
<system>
|
||||
<bit>-Bit System erkannt.</bit>
|
||||
<prefix>Es wurde das Betriebssystem</prefix>
|
||||
<sufix>erkannt.</sufix>
|
||||
<xp>Windows XP wird nicht unterstützt. Installation abgebrochen.</xp>
|
||||
</system>
|
||||
<process>
|
||||
<sks>Sind die für CodeCombat benötigten Programme bereits installiert?</sks>
|
||||
<skq>Wir empfehlen Ihnen, mit „Nein“ zu antorten, falls Sie unsicher sind.</skq>
|
||||
<skc>Überspringe Installation der Programme...</skc>
|
||||
<s1>Ohne Software von Drittanbietern könnte CodeCombat nicht entwickelt werden.</s1>
|
||||
<s2>Aus diesem Grund müssen Sie diese Software installieren,</s2>
|
||||
<s3>um sich in der Community zu engagieren.</s3>
|
||||
<s4>Wenn Sie ein Programm bereits installiert haben, brechen Sie die Installation bitte ab.</s4>
|
||||
<winpath>Make sure to select the option that adds the application to your Windows Path, if the option is available.</winpath>
|
||||
<prefix>Haben Sie bereits die aktuellste Version von</prefix>
|
||||
<sufix>installiert?</sufix>
|
||||
<downloading>wird heruntergeladen...</downloading>
|
||||
<installing>wird installiert...</installing>
|
||||
<unzipping>wird entpackt...</unzipping>
|
||||
<cleaning>wird aufgeräumt...</cleaning>
|
||||
<mongodbpath>Bitte geben Sie den kompletten Pfad an, an dem MongoDB installiert werden soll</mongodbpath>
|
||||
</process>
|
||||
</install>
|
||||
<github>
|
||||
<intro>
|
||||
<opensource>Wie Du bereits weißt, ist CodeCombat Open Source.</opensource>
|
||||
<online>Unser Quellcode ist komplett auf Github.</online>
|
||||
<manual>Wenn Du möchtest, kannst du das komplette Git Repository selbst herunterladen und nach deinen wünschen einrichten.</manual>
|
||||
<norec>Allerdings empfehlen wir, dass du den Prozess statt dessen uns überlässt.</norec>
|
||||
</intro>
|
||||
<skip>
|
||||
<question>Willst du das lokale Git Setup selbst vornehmen?</question>
|
||||
<consequence>Bit vergewissere dich, dass das Repository korrekt heruntergeladen wurde, bevor du fortfährst.</consequence>
|
||||
<donotclose>Bitte schließe dieses Fenster nicht.</donotclose>
|
||||
<wait>Wenn du fertig bist, drücke eine beliebige Taste zum Fortfahren...</wait>
|
||||
</skip>
|
||||
<process>
|
||||
<path>Gebe bitte den kompletten Pfad zu deinem CodeCombat Git Repository ein: </path>
|
||||
<checkout>Bitte gib den kompletten Pfad ein, an dem du die CodeCombat Umgebung einrichten willst</checkout>
|
||||
<bashi>Diese Installation benötigt die Git Bash.</bashi>
|
||||
<bashp64>Die Git Bash ist standardmäßig in 'C:\Program Files (x86)\Git' installiert.</bashp64>
|
||||
<bashp32>Die Git Bash ist standardmäßig in 'C:\Program Files\Git' installiert.</bashp32>
|
||||
<bashq>Bitte gebe den kompletten Pfad zur Git Bash ein, oder drücke Enter, um den Standardpfad zu verwenden</bashq>
|
||||
<ssh>Willst du das Repository via SSH auschecken?</ssh>
|
||||
</process>
|
||||
</github>
|
||||
<npm>
|
||||
<install>Installing bower, brunch, nodemon and sendwithus...</install>
|
||||
<binstall>Installing bower packages...</binstall>
|
||||
<sass>Installing sass...</sass>
|
||||
<npm>Installing npm...</npm>
|
||||
<brnch>Starting brunch....</brnch>
|
||||
<mongodb>Setting up a MongoDB database for you...</mongodb>
|
||||
<database>Downloading the last version of the CodeCombat database...</database>
|
||||
<script>Preparing the automatic startup script for you...</script>
|
||||
</npm>
|
||||
<error>
|
||||
<path>Dieser Pfad existiert bereits. Willst du ihn wirklich überschreiben?</path>
|
||||
<exist>Dieser Pfad exisitert nicht. Bitte versuche es erneut...</exist>
|
||||
</error>
|
||||
<end>
|
||||
<succesfull>Die CodeCombat Entwicklungsumgebung wurde erfoglreich installiert.</succesfull>
|
||||
<thankyou>Vielen Dank für die Unterstützung und bis bald.</thankyou>
|
||||
<readme>Willst du das README lesen, um weitere Informationen zu erhalten?</readme>
|
||||
</end>
|
||||
<start>
|
||||
<s1>Von nun an kannst du die Entwicklungsumgebung starten unter</s1>
|
||||
<s2>einmal mit der Maus klicken.</s2>
|
||||
<s3> 1) Einfach Doppelklicken</s3>
|
||||
<s4>und warten bis die Entwicklungsumgebung fertig geladen hat.</s4>
|
||||
<s5> 2) Jetzt 'localhost:3000' in deinem bevorzugten Browser aufrufen.</s5>
|
||||
<s6>Fertig. Du bist nun bereit, bei CodeCombat mitzuarbeiten!</s6>
|
||||
</start>
|
||||
=======
|
||||
<?xml version="1.0" encoding="ISO-8859-1" ?>
|
||||
<variables>
|
||||
<global>
|
||||
|
|
@ -188,5 +105,4 @@
|
|||
<s5> 2) Jetzt 'localhost:3000' in deinem bevorzugten Browser aufrufen.</s5>
|
||||
<s6>Fertig. Du bist nun bereit, bei CodeCombat mitzuarbeiten!</s6>
|
||||
</start>
|
||||
>>>>>>> 072729acc34123c42250d361955438cfd8c210d7:scripts/windows/coco-dev-setup/batch/localization/de.coco
|
||||
</variables>
|
||||
|
|
@ -1,87 +1,3 @@
|
|||
<<<<<<< HEAD:scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
|
||||
<?xml version="1.0" encoding="ISO-8859-1" ?>
|
||||
<variables>
|
||||
<global>
|
||||
<native>简体中文</native>
|
||||
<intro>目前我们只能用英文给你反馈！</intro>
|
||||
</global>
|
||||
<install>
|
||||
<system>
|
||||
<bit>-位系统.</bit>
|
||||
<prefix>操作系统</prefix>
|
||||
<sufix>被侦测到.</sufix>
|
||||
<xp>我们不支持 Windows XP, 安装取消.</xp>
|
||||
</system>
|
||||
<process>
|
||||
<sks>你是否已经安装好运行 CodeCombat 所需的所有软件?</sks>
|
||||
<skq>如果你不确定的话请回答 No.</skq>
|
||||
<skc>正在跳过此软件的安装...</skc>
|
||||
<s1>CodeCombat 无法在不使用第三方服务的情况下开发.</s1>
|
||||
<s2>这就是为什么你需要安装这些软件,</s2>
|
||||
<s3>为了开始给我们的开源社区做贡献.</s3>
|
||||
<s4>如果你已经有了这些软件 请取消安装.</s4>
|
||||
<winpath>Make sure to select the option that adds the application to your Windows Path, if the option is available.</winpath>
|
||||
<prefix>你是否已经安装了最新版本的</prefix>
|
||||
<sufix>?</sufix>
|
||||
<downloading>正在下载...</downloading>
|
||||
<installing>正在安装...</installing>
|
||||
<unzipping>正在解压...</unzipping>
|
||||
<cleaning>正在清理...</cleaning>
|
||||
<mongodbpath>请输入你希望安装 mongodb 的文件夹的全路径<mongodbpath>
|
||||
</process>
|
||||
</install>
|
||||
<github>
|
||||
<intro>
|
||||
<opensource>CodeCombat 是开源的.</opensource>
|
||||
<online>我们的所有源代码都放在了 Github.</online>
|
||||
<manual>你可以选择自己手工安装 Git.</manual>
|
||||
<norec>但我们仍然建议让程序自动替你完成.</norec>
|
||||
</intro>
|
||||
<skip>
|
||||
<question>你是否想自己手工安装本地 Git 安装?</question>
|
||||
<consequence>请确保在开始处理前, 你有正确设置好你的库.</consequence>
|
||||
<donotclose>请不要关闭此窗口.</donotclose>
|
||||
<wait>如果你准备好了, 请按任意键继续...</wait>
|
||||
</skip>
|
||||
<process>
|
||||
<path>请输入你 CodeCombat git库的全路径: </path>
|
||||
<checkout>请输入你想安装 CodeCombat 环境的全路径</checkout>
|
||||
<bashi>这项安装需要 Git Bash.</bashi>
|
||||
<bashp64>Git bash 默认安装在 'C:\Program Files (x86)\Git'.</bashp64>
|
||||
<bashp32>Git bash 默认安装在 'C:\Program Files\Git'.</bashp32>
|
||||
<bashq>请输入 git bash 的安装全路径, 如果你安装的是默认路径, 那么直接输入回车即可</bashq>
|
||||
<ssh>你是否想使用 ssh 来检出(checkout)库(repository)?</ssh>
|
||||
</process>
|
||||
</github>
|
||||
<npm>
|
||||
<install>正在安装 bower, brunch, nodemon 和 sendwithus...</install>
|
||||
<binstall>正在用 bower 安装依赖包...</binstall>
|
||||
<sass>正在安装 sass...</sass>
|
||||
<npm>正在安装 npm...</npm>
|
||||
<brnch>正在开启 brunch....</brnch>
|
||||
<mongodb>正在为你设置 MongoDB 数据库...</mongodb>
|
||||
<db>正在下载 CodeCombat 数据库的最新版本...</db>
|
||||
<script>Preparing the automatic startup script for you...</script>
|
||||
</npm>
|
||||
<error>
|
||||
<path>这个路径已经存在, 你想要覆盖它吗?</path>
|
||||
<exist>这个路径不存在, 请再次尝试...</exist>
|
||||
</error>
|
||||
<end>
|
||||
<succesfull>CodeCombat 开发环境的搭建已成功.</succesfull>
|
||||
<thankyou>感谢~ 我们会很快再次见面的 :)</thankyou>
|
||||
<readme>你是否想阅读 README 文件以了解更多信息?</readme>
|
||||
</end>
|
||||
<start>
|
||||
<s1>From now on you can start the dev. environment at</s1>
|
||||
<s2>the touch of a single mouse click.</s2>
|
||||
<s3> 1) 双击文件</s3>
|
||||
<s4> 启动开发环境.</s4>
|
||||
<s5> 2) 在浏览器里访问 'localhost:3000' </s5>
|
||||
<s6>好了，你现在可以开始开发 CodeCombat 了!</s6>
|
||||
</start>
|
||||
</variables>
|
||||
=======
|
||||
<?xml version="1.0" encoding="ISO-8859-1" ?>
|
||||
<variables>
|
||||
<global>
|
||||
|
|
@ -189,5 +105,4 @@
|
|||
<s5> 2) 在浏览器里访问 'localhost:3000' </s5>
|
||||
<s6>好了，你现在可以开始开发 CodeCombat 了!</s6>
|
||||
</start>
|
||||
</variables>
|
||||
>>>>>>> 072729acc34123c42250d361955438cfd8c210d7:scripts/windows/coco-dev-setup/batch/localization/zh-HANS.coco
|
||||
</variables>
|
||||
|
|
@ -1,86 +1,3 @@
|
|||
<<<<<<< HEAD:scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco
|
||||
<?xml version="1.0" encoding="ISO-8859-1" ?>
|
||||
<variables>
|
||||
<global>
|
||||
<native>繁体中文</native>
|
||||
<intro>From now on we'll send our feedback in English!</intro>
|
||||
</global>
|
||||
<install>
|
||||
<system>
|
||||
<bit>-bit computer detected.</bit>
|
||||
<prefix>The operating system</prefix>
|
||||
<sufix>was detected.</sufix>
|
||||
<xp>We don't support Windows XP, installation cancelled.</xp>
|
||||
</system>
|
||||
<process>
|
||||
<sks>Have you already installed all the software needed for CodeCombat?</sks>
|
||||
<skq>We recommand that you reply negative in case you're not sure.</skq>
|
||||
<skc>Skipping the installation of the software...</skc>
|
||||
<s1>CodeCombat couldn't be developed without third-party software.</s1>
|
||||
<s2>That's why you'll need to install this software,</s2>
|
||||
<s3>in order to start contributing to our community.</s3>
|
||||
<s4>Cancel the installation if you already have the application.</s4>
|
||||
<winpath>Make sure to select the option that adds the application to your Windows Path, if the option is available.</winpath>
|
||||
<prefix>Do you already have the latest version of</prefix>
|
||||
<sufix>installed?</sufix>
|
||||
<downloading>is downloading...</downloading>
|
||||
<installing>is installing...</installing>
|
||||
<unzipping>is unzipping...</unzipping>
|
||||
<cleaning>is cleaning...</cleaning>
|
||||
<mongodbpath>Please define the full path where mongodb should be installed</mongodbpath>
|
||||
</process>
|
||||
</install>
|
||||
<github>
|
||||
<intro>
|
||||
<opensource>CodeCombat is opensource, like you already know.</opensource>
|
||||
<online>All our sourcecode can be found online at Github.</online>
|
||||
<manual>You can choose to do the entire Git setup yourself.</manual>
|
||||
<norec>However we recommend that you instead let us handle it instead.</norec>
|
||||
</intro>
|
||||
<skip>
|
||||
<question>Do you want to do the Local Git setup manually yourself?</question>
|
||||
<consequence>Make sure you have correctly setup your repository before processing.</consequence>
|
||||
<donotclose>Do not close this window please.</donotclose>
|
||||
<wait>When you're ready, press any key to continue...</wait>
|
||||
</skip>
|
||||
<process>
|
||||
<path>Please give the full path of your CodeCombat git repository: </path>
|
||||
<checkout>Please enter the full path where you want to install your CodeCombat environment</checkout>
|
||||
<bashi>This installation requires Git Bash.</bashi>
|
||||
<bashp64>Git bash is by default installed at 'C:\Program Files (x86)\Git'.</bashp64>
|
||||
<bashp32>Git bash is by default installed at 'C:\Program Files\Git'.</bashp32>
|
||||
<bashq>Please enter the full path where git bash is installed or just press enter if it's in the default location</bashq>
|
||||
<ssh>Do you want to checkout the repository via ssh?</ssh>
|
||||
</process>
|
||||
</github>
|
||||
<npm>
|
||||
<install>Installing bower, brunch, nodemon and sendwithus...</install>
|
||||
<binstall>Installing bower packages...</binstall>
|
||||
<sass>Installing sass...</sass>
|
||||
<npm>Installing npm...</npm>
|
||||
<brnch>Starting brunch....</brnch>
|
||||
<mongodb>Setting up a MongoDB database for you...</mongodb>
|
||||
<db>Downloading the last version of the CodeCombat database...</db>
|
||||
<script>Preparing the automatic startup script for you...</script>
|
||||
</npm>
|
||||
<error>
|
||||
<path>That path already exists, are you sure you want to overwrite it?</path>
|
||||
<exist>That path doesn't exist. Please try again...</exist>
|
||||
</error>
|
||||
<end>
|
||||
<succesfull>The setup of the CodeCombat Dev. Environment was succesfull.</succesfull>
|
||||
<thankyou>Thank you already for your contribution and see you soon.</thankyou>
|
||||
<readme>Do you want to read the README for more information?</readme>
|
||||
</end>
|
||||
<start>
|
||||
<s1>From now on you can start the dev. environment at</s1>
|
||||
<s2>the touch of a single mouse click.</s2>
|
||||
<s3> 1) Just double click</s3>
|
||||
<s4> and let the environment start up.</s4>
|
||||
<s5> 2) Now just open 'localhost:3000' in your prefered browser.</s5>
|
||||
<s6>That's it, you're now ready to start working on CodeCombat!</s6>
|
||||
</start>
|
||||
=======
|
||||
<?xml version="1.0" encoding="ISO-8859-1" ?>
|
||||
<variables>
|
||||
<global>
|
||||
|
|
@ -188,5 +105,4 @@
|
|||
<s5> 2) Now just open 'localhost:3000' in your prefered browser.</s5>
|
||||
<s6>That's it, you're now ready to start working on CodeCombat!</s6>
|
||||
</start>
|
||||
>>>>>>> 072729acc34123c42250d361955438cfd8c210d7:scripts/windows/coco-dev-setup/batch/localization/zh-HANT.coco
|
||||
</variables>
|
||||
Reference in a new issue