diff --git a/calculatorpp/res/values-es/text_about.xml b/calculatorpp/res/values-es/text_about.xml
index 7e51df5d..05d9c847 100644
--- a/calculatorpp/res/values-es/text_about.xml
+++ b/calculatorpp/res/values-es/text_about.xml
@@ -13,7 +13,7 @@
 		Para más información, por favor,\ncontacte con el autor al mail\n<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>\n
 		o visite\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
 		Si desea apoyar el proyecto,\npuede hacer una donación vía\n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=se%2esolovyev%40gmail%2ecom&amp;lc=RU&amp;item_name=Android%20Calculator&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">\nhttp://paypal.com</a>\n\n
-		Si le gusta la aplicación\nvalórela con 5 estrellas en\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">android.market</a>\n\n
+		Si le gusta la aplicación\nvalórela con 5 estrellas en\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
 		Gracias a las personas que han traducido Calculadora++ a los diferentes idiomas:\n
 		Español - Jordi Luna\n
 		Italiano - Gabriele Ravanetti\n\n
diff --git a/calculatorpp/res/values-es/text_donate.xml b/calculatorpp/res/values-es/text_donate.xml
index 29350878..d34a4787 100644
--- a/calculatorpp/res/values-es/text_donate.xml
+++ b/calculatorpp/res/values-es/text_donate.xml
@@ -11,7 +11,7 @@
 	<string name="c_donate_text" formatted="false">Puede dar las gracias por mail al autor de este programa\n\n
 		<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>\n\n
 		donar dinero a través de\n\n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=se%2esolovyev%40gmail%2ecom&amp;lc=RU&amp;item_name=Android%20Calculator&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">http://paypal.com</a>\n\n
-		o evaluar el programa con 5 estrellas en\n\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">android.market</a>\n
+		o evaluar el programa con 5 estrellas en\n\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n
 	</string>
 
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values-it/text_about.xml b/calculatorpp/res/values-it/text_about.xml
index b54eafb7..09920adb 100644
--- a/calculatorpp/res/values-it/text_about.xml
+++ b/calculatorpp/res/values-it/text_about.xml
@@ -13,7 +13,7 @@
 		Per ulteriori informazioni contatta\nl\'autore via email\n<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>
 		\no visita\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
 		Se vuoi aiutare il progetto\npuoi effettuare una donazione via\n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=se%2esolovyev%40gmail%2ecom&amp;lc=RU&amp;item_name=Android%20Calculator&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">http://paypal.com</a>\n\n
-		Se ti piace l\'applicazione\nvota 5 stelle nel\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">android.market</a>\n\n
+		Se ti piace l\'applicazione\nvota 5 stelle nel\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
 		Grazie a persone che traducono Calculator++ in diverse lingue:\n
 		Italiano - Gabriele Ravanetti\n
 		Spagnolo - Jordi Luna\n\n
diff --git a/calculatorpp/res/values-it/text_donate.xml b/calculatorpp/res/values-it/text_donate.xml
index b07f58da..1ac37f79 100644
--- a/calculatorpp/res/values-it/text_donate.xml
+++ b/calculatorpp/res/values-it/text_donate.xml
@@ -11,7 +11,7 @@
 	<string name="c_donate_text">Puoi ringraziare l\'autore di questo programma per email\n\n
 		<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>\n\n
 		o donando su\n\n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=se%2esolovyev%40gmail%2ecom&amp;lc=RU&amp;item_name=Android%20Calculator&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">http://paypal.com</a>\n\n
-		oppure votando l\'applicazione con 5 stelle nell\'\n\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">android.market</a>
+		oppure votando l\'applicazione con 5 stelle nell\'\n\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>
 	</string>
 
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values-ru/text_about.xml b/calculatorpp/res/values-ru/text_about.xml
index 34655dfb..1623de1f 100644
--- a/calculatorpp/res/values-ru/text_about.xml
+++ b/calculatorpp/res/values-ru/text_about.xml
@@ -15,10 +15,11 @@
 		или посетите сайт \n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
 		Если вы хотите поддержать проект материально\nвы можете купить специальную опцию из настроек приложения\n
 		перевести средства через \n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=se%2esolovyev%40gmail%2ecom&amp;lc=RU&amp;item_name=Android%20Calculator&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">http://paypal.com</a>\n\n
-		Если вам понравилось приложение -\nпоставьте 5 звёздочек в\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">андроид.маркете</a>\n\n
+		Если вам понравилось приложение -\nпоставьте 5 звёздочек в\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
 		Спасибо тем, кто переводил Калькулятор++:\n
 		на итальянский - Gabriele Ravanetti\n
 		на испанский - Jordi Luna\n\n
+        на украинский - Андрій Бандура\n\n
 		Это приложение использует следующие открытые библиотеки:\n
 		<a href="http://simple.sourceforge.net">Simple (XML serialization)</a>\n
 		<a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a>\n
diff --git a/calculatorpp/res/values-ru/text_donate.xml b/calculatorpp/res/values-ru/text_donate.xml
index 174b79c3..0e501e29 100644
--- a/calculatorpp/res/values-ru/text_donate.xml
+++ b/calculatorpp/res/values-ru/text_donate.xml
@@ -12,7 +12,7 @@
 		<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>\n\n
 		купить специальную опцию из настроек приложения\n\n
 		пожертвовать денег через\n\n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=se%2esolovyev%40gmail%2ecom&amp;lc=RU&amp;item_name=Android%20Calculator&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">http://paypal.com</a>\n\n
-		или поставить 5 звёздочек в\n\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">андроид.маркете</a>
+		или поставить 5 звёздочек в\n\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>
 	</string>
 
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values-ru/text_strings.xml b/calculatorpp/res/values-ru/text_strings.xml
index d8d6ee07..ebce49e7 100644
--- a/calculatorpp/res/values-ru/text_strings.xml
+++ b/calculatorpp/res/values-ru/text_strings.xml
@@ -189,7 +189,7 @@
 	<string name="c_feedback_title">Отзыв</string>
 	<string name="c_feedback_text">Вы используете Калькулятор++ некоторое время\n
 		и для нас важно узнать ваше мнение о приложении.\n\n
-		Пожалуйста, оцените Калькулятор++ \nна <a href="https://market.android.com/details?id=org.solovyev.android.calculator">андроид.маркете</a>,\n оставьте комментарий или \nобсудите приложение \nна нашем <a href="http://calculatorpp.com/forum/">форуме</a>
+		Пожалуйста, оцените Калькулятор++ \nна <a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>,\n оставьте комментарий или \nобсудите приложение \nна нашем <a href="http://calculatorpp.com/forum/">форуме</a>
 	</string>
 
 	<string name="c_angle_units_changed_to">Единицы измерения углов изменены на \'%s\'!</string>
diff --git a/calculatorpp/res/values-uk/text_about.xml b/calculatorpp/res/values-uk/text_about.xml
index 575f69fb..2690cee3 100644
--- a/calculatorpp/res/values-uk/text_about.xml
+++ b/calculatorpp/res/values-uk/text_about.xml
@@ -15,7 +15,7 @@
 		\nабо відвідайте сайт\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
 		Якщо хочете підтримати проект фінансово,\nто ви  можете купити спеціальну опцію у налаштуваннях програми\n
 		переказати гроші через \n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=se%2esolovyev%40gmail%2ecom&amp;lc=RU&amp;item_name=Android%20Calculator&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">http://paypal.com</a>\n\n
-		Якщо вам сподобалася програма,\n то оцініть її у 5 зірочок на\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google.Play</a>\n\n
+		Якщо вам сподобалася програма,\n то оцініть її у 5 зірочок на\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
 		Дякую усім, хто переклав Калькулятор++ на інші мови:\n
 		італійську - Gabriele Ravanetti\n
 		іспанську - Jordi Luna\n
diff --git a/calculatorpp/res/values/text_about.xml b/calculatorpp/res/values/text_about.xml
index 48aafd04..44bfeddb 100644
--- a/calculatorpp/res/values/text_about.xml
+++ b/calculatorpp/res/values/text_about.xml
@@ -15,7 +15,7 @@
 		\nor visit\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
 		If you want to support the project\n\nyou can buy a special option from application preferences\n\n
 		donate money via\n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=se%2esolovyev%40gmail%2ecom&amp;lc=RU&amp;item_name=Android%20Calculator&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">http://paypal.com</a>\n\n
-		If you like the application\nrank it with 5 stars in\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">android.market</a>\n\n
+		If you like the application\nrank it with 5 stars in\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
 		Thanks to people who translate Calculator++ in different languages:\n
 		Italian - Gabriele Ravanetti\n
 		Spanish - Jordi Luna\n\n
@@ -141,11 +141,11 @@
 	<string name="c_release_notes_for_24">
 		Note from developer\n\n
 		Sorry to inform you but this version of application brings built-in ads.\n
-		I haven\'t seen in android.market calculator with similar capabilities and I don\'t think I will see it in the close future.\n
+		I haven\'t seen in Google Play calculator with similar capabilities and I don\'t think I will see it in the close future.\n
 		But still I want to extend it\'s functionality and support already implemented. The thing is that I cannot do it anymore for free - it takes too much time and great efforts from me as
 		application has become rather big and complex.\n
 		If you want to support the project and remove the ads please purchase special option from application preferences,\n
-		if you don\'t want to pay or can\'t do it - you still can thank the author of this program by email: se.solovyev@gmail.com, rate application with high mark in android.market\n
+		if you don\'t want to pay or can\'t do it - you still can thank the author of this program by email: se.solovyev@gmail.com, rate application with high mark in Google Play\n
 		or help to translate the application to your native language.
 	</string>
 
diff --git a/calculatorpp/res/values/text_donate.xml b/calculatorpp/res/values/text_donate.xml
index 7ffdd179..1fb8d7b7 100644
--- a/calculatorpp/res/values/text_donate.xml
+++ b/calculatorpp/res/values/text_donate.xml
@@ -12,7 +12,7 @@
 		<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>\n\n
 		buying a special option from application preferences\n\n
 		donating money via\n\n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=se%2esolovyev%40gmail%2ecom&amp;lc=RU&amp;item_name=Android%20Calculator&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">http://paypal.com</a>\n\n
-		or setting 5 stars in\n\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">android.market</a>
+		or setting 5 stars in\n\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>
 	</string>
 
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values/text_strings.xml b/calculatorpp/res/values/text_strings.xml
index 80242e51..5ddd44ac 100644
--- a/calculatorpp/res/values/text_strings.xml
+++ b/calculatorpp/res/values/text_strings.xml
@@ -190,7 +190,7 @@
 	<string name="c_feedback_title">Feedback</string>
 	<string name="c_feedback_text">You have been using Calculator++ for some time \n
 		and it\'s important for us to know your opinion about application.\n\n
-		Please rate Calculator++ \non <a href="https://market.android.com/details?id=org.solovyev.android.calculator">android.market</a>,\n leave a comment or \ndiscuss application \non our <a href="http://calculatorpp.com/forum/">forum</a>
+		Please rate Calculator++ \non <a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>,\n leave a comment or \ndiscuss application \non our <a href="http://calculatorpp.com/forum/">forum</a>
 	</string>
 
 	<string name="c_angle_units_changed_to">Angle units changed to \'%s\'!</string>