diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_fr.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_fr.properties
index d9314695..3bdb0040 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_fr.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_fr.properties
@@ -1,12 +1,12 @@
 #X-Generator: crowdin.com
 #X-Generator: crowdin.net
-msg_1=Une erreur arithm\u00e9tique s'est produite \: {0}
-msg_2=L'expression est trop complexe
-msg_3=Temps d'ex\u00e9cution trop long - V\u00e9rifiez l'expression
-msg_4=L'\u00e9valuation a \u00e9t\u00e9 annul\u00e9e
-msg_5=Aucun param\u00e8tre n'est sp\u00e9cifi\u00e9 pour la fonction \: {0}
-msg_6=Une boucle infinie a \u00e9t\u00e9 d\u00e9tect\u00e9e dans l'expression
-msg_7=Certaines donn\u00e9es utilisateur n'ont pas pu \u00eatre charg\u00e9es. Veuillez contacter les d\u00e9veloppeurs.\n\nImpossible de charger \: \n{0}
+msg_1=Une erreur arithm\u00e9tique s''est produite \: {0}
+msg_2=L''expression est trop complexe
+msg_3=Temps d''ex\u00e9cution trop long - V\u00e9rifiez l''expression
+msg_4=L''\u00e9valuation a \u00e9t\u00e9 annul\u00e9e
+msg_5=Aucun param\u00e8tre n''est sp\u00e9cifi\u00e9 pour la fonction \: {0}
+msg_6=Une boucle infinie a \u00e9t\u00e9 d\u00e9tect\u00e9e dans l''expression
+msg_7=Certaines donn\u00e9es utilisateur n''ont pas pu \u00eatre charg\u00e9es. Veuillez contacter les d\u00e9veloppeurs.\n\nImpossible de charger \: \n{0}
 
 syntax_error=Erreur
 result_copied=Le r\u00e9sultat a \u00e9t\u00e9 copi\u00e9 dans le presse-papier \!
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_it.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_it.properties
index d9811923..fe80bd65 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_it.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_it.properties
@@ -1,12 +1,12 @@
 #X-Generator: crowdin.com
 #X-Generator: crowdin.net
 msg_1=Errore aritmetico\: {0}
-msg_2=L'espressione \u00e8 troppo complessa
-msg_3=Tempo di esecuzione troppo lungo - controlla l'espressione
+msg_2=L''espressione \u00e8 troppo complessa
+msg_3=Tempo di esecuzione troppo lungo - controlla l''espressione
 msg_4=La valutazione \u00e8 stata annullata
 msg_5=Nessun parametro specificato per la funzione\: {0}
-msg_6=\u00c8 stato rilevato un ciclo infinito nell'espressione
-msg_7=Alcuni dati dell'utente non hanno potuto essere caricati. Si prega di contattare gli sviluppatori.\n\nImpossibile caricare\: \n{0}
+msg_6=\u00c8 stato rilevato un ciclo infinito nell''espressione
+msg_7=Alcuni dati dell''utente non hanno potuto essere caricati. Si prega di contattare gli sviluppatori.\n\nImpossibile caricare\: \n{0}
 
 syntax_error=Errore
 result_copied=Il risultato \u00e8 stato copiato negli appunti\!
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
index 0f7dceff..605f2c47 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
@@ -6,7 +6,7 @@ msg_3=\u041e\u0431\u0447\u0438\u0441\u043b\u0435\u043d\u043d\u044f \u0432\u0438\
 msg_4=\u041e\u0431\u0447\u0438\u0441\u043b\u0435\u043d\u043d\u044f \u0441\u043a\u0430\u0441\u043e\u0432\u0430\u043d\u043e
 msg_5=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u043d\u0435 \u0432\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u0456 \u0434\u043b\u044f \u0444\u0443\u043d\u043a\u0446\u0456\u0457\: {0}
 msg_6=\u041d\u0435\u0441\u043a\u0456\u043d\u0447\u0435\u043d\u043d\u0438\u0439 \u0446\u0438\u043a\u043b \u0432\u0438\u044f\u0432\u043b\u0435\u043d\u043e \u0443 \u0432\u0438\u0440\u0430\u0437\u0456 - \u043f\u0435\u0440\u0435\u0432\u0456\u0440\u0442\u0435 \u0432\u0438\u0440\u0430\u0437
-msg_7=\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u0437\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438 \u0434\u0435\u044f\u043a\u0456 \u0434\u0430\u043d\u0456 \u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430. \u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0437\u0432'\u044f\u0436\u0456\u0442\u044c\u0441\u044f \u0437 \u0440\u043e\u0437\u0440\u043e\u0431\u043d\u0438\u043a\u0430\u043c\u0438. \u041d\u0435 \u0432\u0434\u0430\u0454\u0442\u044c\u0441\u044f \u0437\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438\: {0}
+msg_7=\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u0437\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438 \u0434\u0435\u044f\u043a\u0456 \u0434\u0430\u043d\u0456 \u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430. \u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0437\u0432''\u044f\u0436\u0456\u0442\u044c\u0441\u044f \u0437 \u0440\u043e\u0437\u0440\u043e\u0431\u043d\u0438\u043a\u0430\u043c\u0438. \u041d\u0435 \u0432\u0434\u0430\u0454\u0442\u044c\u0441\u044f \u0437\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438\: {0}
 
 syntax_error=\u041f\u043e\u043c\u0438\u043b\u043a\u0430
 result_copied=\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0432\u0436\u0435 \u0441\u043a\u043e\u043f\u0456\u0439\u043e\u0432\u0430\u043d\u0438\u0439 \u0434\u043e \u0431\u0443\u0444\u0435\u0440\u0443 \u043e\u0431\u043c\u0456\u043d\u0443\!
diff --git a/core/src/test/java/org/solovyev/android/calculator/CalculatorMessagesTest.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorMessagesTest.java
index 4d7c6b51..1762fff9 100644
--- a/core/src/test/java/org/solovyev/android/calculator/CalculatorMessagesTest.java
+++ b/core/src/test/java/org/solovyev/android/calculator/CalculatorMessagesTest.java
@@ -56,9 +56,9 @@ public class CalculatorMessagesTest {
 	@Nonnull
 	private List<String> makeMessageArguments(@Nonnull String id) {
 		switch (id) {
-			case "1":
-			case "5":
-			case "7":
+			case CalculatorMessages.msg_001:
+			case CalculatorMessages.msg_005:
+			case CalculatorMessages.msg_007:
 				return Arrays.asList("param0");
 		}
 		return Collections.emptyList();