From 7c727c1db92fd76302242446a9ce01e740a34d35 Mon Sep 17 00:00:00 2001
From: verdulo <cybertomek@openmailbox.org>
Date: Sat, 5 May 2018 12:50:31 +0200
Subject: [PATCH] add possibility to translate strings "OK" and "Cancel" (#773)

* Update translatable.xml

* Update permission_request.xml

* Update audiopicker.xml

* Update medialibrary_preferences.xml
---
 app/src/main/res/layout/audiopicker.xml              | 2 +-
 app/src/main/res/layout/medialibrary_preferences.xml | 2 +-
 app/src/main/res/layout/permission_request.xml       | 2 +-
 app/src/main/res/values/translatable.xml             | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/audiopicker.xml b/app/src/main/res/layout/audiopicker.xml
index 185440b9..e01285a9 100644
--- a/app/src/main/res/layout/audiopicker.xml
+++ b/app/src/main/res/layout/audiopicker.xml
@@ -68,7 +68,7 @@ THE SOFTWARE.
 			android:layout_width="0px"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:text="@android:string/cancel"
+			android:text="@string/cancel"
 			android:enabled="false"
 			android:singleLine="true" />
 		<Button
diff --git a/app/src/main/res/layout/medialibrary_preferences.xml b/app/src/main/res/layout/medialibrary_preferences.xml
index f0596c66..8e24b3bb 100644
--- a/app/src/main/res/layout/medialibrary_preferences.xml
+++ b/app/src/main/res/layout/medialibrary_preferences.xml
@@ -125,7 +125,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="end"
-			android:text="@android:string/cancel">
+			android:text="@string/cancel">
 		</Button>
 
 		<ProgressBar
diff --git a/app/src/main/res/layout/permission_request.xml b/app/src/main/res/layout/permission_request.xml
index 4d311fe3..9126d910 100644
--- a/app/src/main/res/layout/permission_request.xml
+++ b/app/src/main/res/layout/permission_request.xml
@@ -37,6 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 			android:clickable="false"
 			android:layout_marginRight="8dip"
 			android:layout_gravity="center"
-			android:text="@android:string/ok" />
+			android:text="@string/ok" />
 	</TableRow>
 </TableLayout>
diff --git a/app/src/main/res/values/translatable.xml b/app/src/main/res/values/translatable.xml
index 27330c09..24d76a2f 100644
--- a/app/src/main/res/values/translatable.xml
+++ b/app/src/main/res/values/translatable.xml
@@ -22,6 +22,8 @@ THE SOFTWARE.
 -->
 <resources>
 	<string name="app_name">Vanilla Music</string>
+	<string name="ok">OK</string>
+	<string name="cancel">Cancel</string>
 
 	<!-- Playback Activity (main screen) -->
 	<string name="no_songs">No tracks found on your device.</string>