From 802f61cf64a1b3b0b59772fc1aae9f84bb4ba537 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 21 Aug 2016 20:39:16 +0200
Subject: [PATCH] use our own strings for OK and Cancel

---
 .../simplemobiletools/gallery/activities/MainActivity.java    | 4 ++--
 .../gallery/activities/ViewPagerActivity.java                 | 4 ++--
 .../com/simplemobiletools/gallery/dialogs/ChangeSorting.java  | 4 ++--
 app/src/main/res/values-it/strings.xml                        | 2 ++
 app/src/main/res/values-ja/strings.xml                        | 2 ++
 app/src/main/res/values-sv/strings.xml                        | 2 ++
 app/src/main/res/values/strings.xml                           | 2 ++
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
index d3ea5cfe5..62f2bed54 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
@@ -355,8 +355,8 @@ public class MainActivity extends SimpleActivity
         final TextView dirPath = (TextView) renameDirView.findViewById(R.id.directory_path);
         dirPath.setText(dir.getParent() + "/");
 
-        builder.setPositiveButton(android.R.string.ok, null);
-        builder.setNegativeButton(android.R.string.cancel, null);
+        builder.setPositiveButton(R.string.ok, null);
+        builder.setNegativeButton(R.string.cancel, null);
 
         final AlertDialog alertDialog = builder.create();
         alertDialog.show();
diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
index 0ec966003..22e0cd1a2 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
@@ -228,8 +228,8 @@ public class ViewPagerActivity extends SimpleActivity
         builder.setTitle(getResources().getString(R.string.rename_file));
         builder.setView(renameFileView);
 
-        builder.setPositiveButton(android.R.string.ok, null);
-        builder.setNegativeButton(android.R.string.cancel, null);
+        builder.setPositiveButton(R.string.ok, null);
+        builder.setNegativeButton(R.string.cancel, null);
 
         final AlertDialog alertDialog = builder.create();
         alertDialog.show();
diff --git a/app/src/main/java/com/simplemobiletools/gallery/dialogs/ChangeSorting.java b/app/src/main/java/com/simplemobiletools/gallery/dialogs/ChangeSorting.java
index 174c2f4b6..5bf4cdfd0 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/dialogs/ChangeSorting.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/dialogs/ChangeSorting.java
@@ -32,8 +32,8 @@ public class ChangeSorting extends AlertDialog.Builder implements DialogInterfac
         setupSortRadio();
         setupOrderRadio();
 
-        builder.setPositiveButton(android.R.string.ok, this);
-        builder.setNegativeButton(android.R.string.cancel, null);
+        builder.setPositiveButton(R.string.ok, this);
+        builder.setNegativeButton(R.string.cancel, null);
         builder.show();
     }
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 34d383b94..9c6c247b0 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -26,6 +26,8 @@
     <string name="date">Date</string>
     <string name="ascending">Ascending</string>
     <string name="descending">Descending</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 cartella eliminata</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f21a4df01..a557c71d1 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -26,6 +26,8 @@
     <string name="date">Date</string>
     <string name="ascending">Ascending</string>
     <string name="descending">Descending</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 フォルダーを削除しました</item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 9a23192db..015b60a55 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -26,6 +26,8 @@
     <string name="date">Date</string>
     <string name="ascending">Ascending</string>
     <string name="descending">Descending</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 mapp borttagen</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 839595de3..a09eba680 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,6 +26,8 @@
     <string name="date">Date</string>
     <string name="ascending">Ascending</string>
     <string name="descending">Descending</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 folder deleted</item>