diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 26e63596..44f60da8 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -21,13 +21,13 @@
   <string name="short_app_name">KP2A</string>
   <string name="app_name_nonet">Keepass2Android Offline</string>
   <string name="short_app_name_nonet">KP2A Offline</string>
-  <string name="app_timeout">Application timeout</string>
-  <string name="app_timeout_summary">Time before locking database when the application is inactive.</string>
-  <string name="kill_app_label">Kill application process</string>
+  <string name="app_timeout">App timeout</string>
+  <string name="app_timeout_summary">Time before locking database when the app is inactive.</string>
+  <string name="kill_app_label">Kill app process</string>
   <string name="show_kill_app">Close-Button</string>
-  <string name="show_kill_app_summary">Show a button in password screen to kill the application process (for paranoid users)</string>
-  <string name="application">Application</string>
-  <string name="application_settings">Application settings</string>
+  <string name="show_kill_app_summary">Show a button in password screen to kill the app process (for paranoid users)</string>
+  <string name="application">App</string>
+  <string name="application_settings">App settings</string>
   <string name="ShowGroupnameInSearchResult_title">Display group name in search result</string>
   <string name="ShowGroupnameInSearchResult_resume">Display group name below entry titles in search results. Useful if several entries have the same name.</string>
   <string name="NavigationToGroupCompleted_message">Display group is now: %1$s</string>
@@ -366,7 +366,7 @@
 
   
   <string name="UseOfflineCache_title">Database caching</string>
-	<string name="UseOfflineCache_summary">Keep a copy of the database files in the application cache directory. This allows to use databases even while the database file is not accessible.</string>
+	<string name="UseOfflineCache_summary">Keep a copy of the database files in the app's cache directory. This allows to use databases even while the database file is not accessible.</string>
 
   <string name="CreateBackups_title">Local backups</string>
   <string name="CreateBackups_summary">Create a local backup copy after successfully loading a database.</string>
@@ -496,7 +496,7 @@
 
 	<string name="ErrorOcurred">An error occured:</string>
 	<string name="DuplicateUuidsError">Database is corrupt: Duplicate IDs found. (Did you save with Minikeepass?) Please re-import to a new database with Keepass 2 for PC and select \'Create new IDs\'.</string>
-	<string name="DuplicateUuidsErrorAdditional">You can disable this error message in Settings/Application settings/File handling/Check for duplicate UUIDs. Please note that you might experience unexpected behavior. It is recommended to fix the database.</string>
+	<string name="DuplicateUuidsErrorAdditional">You can disable this error message in Settings/App settings/File handling/Check for duplicate UUIDs. Please note that you might experience unexpected behavior. It is recommended to fix the database.</string>
 
 	<string name="synchronize_database_menu">Synchronize database…</string>
 
@@ -635,10 +635,10 @@
 	<string name="SCOPE_CURRENT_ENTRY_explanation">Plugin will receive all data about the current database entry and will be allowed to offer actions and modify the display of it.</string>
 	
 	<string name="SCOPE_QUERY_CREDENTIALS_FOR_OWN_PACKAGE_title">Query own credentials</string>
-	<string name="SCOPE_QUERY_CREDENTIALS_FOR_OWN_PACKAGE_explanation">Plugin will be allowed to query the credentials associated with its own application package.</string>
+	<string name="SCOPE_QUERY_CREDENTIALS_FOR_OWN_PACKAGE_explanation">Plugin will be allowed to query the credentials associated with its own app package.</string>
 	
 	<string name="SCOPE_QUERY_CREDENTIALS_title">Query credentials</string>
-	<string name="SCOPE_QUERY_CREDENTIALS_explanation">Plugin will be allowed to query credentials for deliberate web sites or applications.</string>
+	<string name="SCOPE_QUERY_CREDENTIALS_explanation">Plugin will be allowed to query credentials for deliberate web sites or apps.</string>
 
 
 	<string name="get_regular_version">Get more storage types</string>
@@ -767,7 +767,7 @@
 
   <string name="ErrorReportTitle">Keepass2Android: An error occurred.</string>
   <string name="ErrorReportText">An unexpected error occurred while running Keepass2Android. Please help us fix this by allowing the app to send error reports.</string>
-  <string name="ErrorReportPromise">Error reports will never contain any contents of your database or master password. You can disable them in the application settings.</string>
+  <string name="ErrorReportPromise">Error reports will never contain any contents of your database or master password. You can disable them in the app settings.</string>
   <string name="ErrorReportEnable">Enable</string>
   <string name="ErrorReportDisable">Disable</string>
   <string name="ErrorReportAsk">Ask after error</string>
@@ -954,7 +954,7 @@
 		* allow to import key file and/or local database file to app internal directory (see settings)\n
 		* allow different sorting options\n
 		* improved preferences for automatic keyboard switching\n
-		* updated application logo and notification design, design by Stefano Pignataro (http://www.spstudio.at)\n
+		* updated app logo and notification design, design by Stefano Pignataro (http://www.spstudio.at)\n
 		* password generator remembers last settings\n
 		* set notification visibility for Android 5 lock screen\n
 		* now clearing master password field when leaving the app without clicking OK\n
@@ -1052,7 +1052,7 @@
 
 	<string name="ChangeLog_0_8_5">
 		<b>Version 0.8.5</b>\n
-		* Remote files are stored in the local application cache to allow offline usage (including editing and later synchronization). See settings. \n
+		* Remote files are stored in the local app cache to allow offline usage (including editing and later synchronization). See settings. \n
 		* Notification icon to visualize the lock-state of the database (see settings)\n
 		* Improved determination of lock-state in some situations\n
 		* Database files are loaded to memory while you are typing your password for increased loading speed (see settings)\n