TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	android-app-core/res/values-ru/text_about.xml
	android-app-core/res/values-ru/text_wizard.xml
	android-app-core/res/values/text_about.xml
	android-app-core/res/values/text_wizard.xml
	pom.xml
This commit is contained in:
Sergey Solovyev
2013-07-03 00:08:50 +04:00
parent 572f151d24 e53d72fc04
commit c772a4e429
33 changed files with 568 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
android-app-core/res/values/text_about.xml
View File

@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.net-->
<resources>
<string name="c_about">About</string>
<string name="c_about_content">Copyright © 2009–2013\n\n<b>Created by serso aka se.solovyev</b>\n\n
We are on Facebook:<a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
<string name="c_about">About</string>
<string name="c_about_content">Copyright © 2009–2013\n\n<b>Created by serso aka se.solovyev</b>\n\n
We are on Facebook: <a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
This program is distributed under Apache 2.0 License:\nsource code can be found on\n
<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n
For more information please\ncontact the author by email\n
@@ -16,6 +18,9 @@
<a href="http://simple.sourceforge.net">Simple (XML serialization)</a>\n
<a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a>
</string>
<string name="c_release_notes">Release notes</string>
<string name="c_release_notes_for_title">"Release notes for version "</string>
</resources>
<string name="c_release_notes">Release notes</string>
<string name="c_release_notes_for_title">"Release notes for version "</string>
<string name="cpp_share_link">http://www.facebook.com/calculatorpp</string>
</resources>

18
android-app-core/res/values/text_wizard.xml
View File

@@ -34,7 +34,17 @@
</string>
<string name="cpp_wizard_final_ways_to_help">There are several ways how you can help to make this app better:
</string>
<string name="cpp_wizard_final_donate">Donating money</string>
<string name="cpp_wizard_final_translate">Translating</string>
<string name="cpp_wizard_final_contribute">Contributing source code</string>
</resources>
<string name="cpp_wizard_final_donate">Donating money</string>
<string name="cpp_wizard_final_translate">Translating</string>
<string name="cpp_wizard_final_contribute">Contributing source code</string>
<string name="cpp_wizard_onscreen_description">Calculator in separate window allows you to do calculations while
using other apps on your device
</string>
<string name="cpp_wizard_onscreen_checkbox">Enable calculator in separate window (second icon will appear in the
apps list)
</string>
<string name="cpp_wizard_dragbutton_description">Drag button is an exclusive feature of Calculator++ which provides
fast access to the secondary functions
</string>
</resources>