From 2626fa36168f4024fdc2e39955fabb58b51dd3ac Mon Sep 17 00:00:00 2001
From: Inderjeet Singh <inderjeetuiet@gmail.com>
Date: Sun, 26 Jul 2015 20:41:56 +0200
Subject: [PATCH] fixed issue 570

---
 app/src/main/AndroidManifest.xml                          | 2 +-
 app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java        | 4 ++--
 .../java/com/SecUpwN/AIMSICD/constants/DrawerMenu.java    | 4 ++--
 .../AIMSICD/drawer/DrawerMenuActivityConfiguration.java   | 4 ++--
 .../java/com/SecUpwN/AIMSICD/drawer/DrawerMenuItem.java   | 8 ++++----
 app/src/main/res/values-de/translatable_strings.xml       | 4 ++--
 app/src/main/res/values-fr/translatable_strings.xml       | 4 ++--
 app/src/main/res/values-ja/translatable_strings.xml       | 4 ++--
 app/src/main/res/values-pl/translatable_strings.xml       | 4 ++--
 app/src/main/res/values-ru/translatable_strings.xml       | 4 ++--
 app/src/main/res/values/translatable_strings.xml          | 4 ++--
 11 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 21beae28..5df74799 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.SecUpwN.AIMSICD"
           android:versionCode="32"
-          android:versionName="0.1.32-alpha-b08">
+          android:versionName="0.1.32-alpha-b09">
 
     <!-- If we ever wanna make this a system app, we can add the following 2 lines above:
           coreApp="true"
diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java b/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java
index f6b6f233..7d189be1 100644
--- a/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java
+++ b/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java
@@ -277,7 +277,7 @@ public class AIMSICD extends BaseActivity implements AsyncResponse {
                 getSupportFragmentManager().beginTransaction()
                         .replace(R.id.content_frame, new AboutFragment()).commit();
                 break;
-            case DrawerMenu.ID.APPLICATION.UPLOAD_LOCAL_BST_DATA:
+            case DrawerMenu.ID.APPLICATION.UPLOAD_LOCAL_BTS_DATA:
                 // Request uploading here?
                 new RequestTask(mContext, com.SecUpwN.AIMSICD.utils.RequestTask.DBE_UPLOAD_REQUEST).execute(""); // no string needed for csv based upload
                 break;
@@ -308,7 +308,7 @@ public class AIMSICD extends BaseActivity implements AsyncResponse {
             // or what did you mean?
             // "If it ain't broke, don't fix."
 
-        } else if (selectedItem.getId() == DrawerMenu.ID.APPLICATION.DOWNLOAD_LOCAL_BST_DATA) {
+        } else if (selectedItem.getId() == DrawerMenu.ID.APPLICATION.DOWNLOAD_LOCAL_BTS_DATA) {
             if (CellTracker.OCID_API_KEY != null && !CellTracker.OCID_API_KEY.equals("NA")) {
 
                 // Trying to fix issue #525 by using DJaeger's comment in:
diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/constants/DrawerMenu.java b/app/src/main/java/com/SecUpwN/AIMSICD/constants/DrawerMenu.java
index 2a0371b9..544f1e48 100644
--- a/app/src/main/java/com/SecUpwN/AIMSICD/constants/DrawerMenu.java
+++ b/app/src/main/java/com/SecUpwN/AIMSICD/constants/DrawerMenu.java
@@ -71,8 +71,8 @@ public class DrawerMenu {
          */
         public static class APPLICATION {
             //FIXME     Is this should be "Download Local OCID Data" ?
-            public static final int DOWNLOAD_LOCAL_BST_DATA = 400; //Download Local BST Data
-            public static final int UPLOAD_LOCAL_BST_DATA = 410; //Upload Local BST Data
+            public static final int DOWNLOAD_LOCAL_BTS_DATA = 400; //Download Local BST Data
+            public static final int UPLOAD_LOCAL_BTS_DATA = 410; //Upload Local BST Data
             //TODO need to implement
             public static final int ADD_GET_OCID_API_KEY = 420; // Add/Get OCID API key
             public static final int ABOUT = 430; //About AIMSICD
diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/drawer/DrawerMenuActivityConfiguration.java b/app/src/main/java/com/SecUpwN/AIMSICD/drawer/DrawerMenuActivityConfiguration.java
index 1324f0fd..5a3ee8f0 100644
--- a/app/src/main/java/com/SecUpwN/AIMSICD/drawer/DrawerMenuActivityConfiguration.java
+++ b/app/src/main/java/com/SecUpwN/AIMSICD/drawer/DrawerMenuActivityConfiguration.java
@@ -149,8 +149,8 @@ public class DrawerMenuActivityConfiguration {
 
             //Section Application
             menu.add(DrawerMenuSection.create(DrawerMenu.ID.SECTION_APPLICATION, mContext.getString(R.string.application)));
-            menu.add(DrawerMenuItem.create(DrawerMenu.ID.APPLICATION.DOWNLOAD_LOCAL_BST_DATA, mContext.getString(R.string.get_opencellid), R.drawable.stat_sys_download_anim0, false));   // "Download Local BTS data"
-            menu.add(DrawerMenuItem.create(DrawerMenu.ID.APPLICATION.UPLOAD_LOCAL_BST_DATA, mContext.getString(R.string.upload_bts), R.drawable.stat_sys_upload_anim0, false));      // "Upload Local BTS data"
+            menu.add(DrawerMenuItem.create(DrawerMenu.ID.APPLICATION.DOWNLOAD_LOCAL_BTS_DATA, mContext.getString(R.string.get_opencellid), R.drawable.stat_sys_download_anim0, false));   // "Download Local BTS data"
+            menu.add(DrawerMenuItem.create(DrawerMenu.ID.APPLICATION.UPLOAD_LOCAL_BTS_DATA, mContext.getString(R.string.upload_bts), R.drawable.stat_sys_upload_anim0, false));      // "Upload Local BTS data"
             menu.add(DrawerMenuItem.create(DrawerMenu.ID.APPLICATION.ABOUT, mContext.getString(R.string.about_aimsicd), R.drawable.ic_action_about, true));         // About
             menu.add(DrawerMenuItem.create(DrawerMenu.ID.APPLICATION.SEND_DEBUGGING_LOG, mContext.getString(R.string.send_logs), R.drawable.ic_action_computer, false));         // Debugging
             menu.add(DrawerMenuItem.create(DrawerMenu.ID.APPLICATION.QUIT, mContext.getString(R.string.quit), R.drawable.ic_action_remove, false));                // Quit
diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/drawer/DrawerMenuItem.java b/app/src/main/java/com/SecUpwN/AIMSICD/drawer/DrawerMenuItem.java
index 5526f093..605182ef 100644
--- a/app/src/main/java/com/SecUpwN/AIMSICD/drawer/DrawerMenuItem.java
+++ b/app/src/main/java/com/SecUpwN/AIMSICD/drawer/DrawerMenuItem.java
@@ -146,11 +146,11 @@ public class DrawerMenuItem implements NavDrawerItem {
             case APPLICATION.ABOUT:
                 return R.string.help_app_about;
 
-            case APPLICATION.DOWNLOAD_LOCAL_BST_DATA:
-                return R.string.help_app_download_local_bst;
+            case APPLICATION.DOWNLOAD_LOCAL_BTS_DATA:
+                return R.string.help_app_download_local_bts;
 
-            case APPLICATION.UPLOAD_LOCAL_BST_DATA:
-                return R.string.help_app_upload_local_bst;
+            case APPLICATION.UPLOAD_LOCAL_BTS_DATA:
+                return R.string.help_app_upload_local_bts;
 
             case APPLICATION.SEND_DEBUGGING_LOG:
                 return R.string.help_app_debugging;
diff --git a/app/src/main/res/values-de/translatable_strings.xml b/app/src/main/res/values-de/translatable_strings.xml
index 57e23b33..9e01d237 100644
--- a/app/src/main/res/values-de/translatable_strings.xml
+++ b/app/src/main/res/values-de/translatable_strings.xml
@@ -327,8 +327,8 @@
     <!-- Section Application-->
     <string name="help_app_add_get_ocid_api_key">API-Schlüssel für die Nutzung der OpenCellID-Datenbanken sowie hoch- und herunterladen der Daten anfordern…</string>
     <string name="help_app_about">Status-Symbole und Erklärung des Projekts.</string>
-    <string name="help_app_download_local_bst">OCID-Datenbank herunterladen.</string>
-    <string name="help_app_upload_local_bst">Eigene BTS-Daten zu OCID hochladen.</string>
+    <string name="help_app_download_local_bts">OCID-Datenbank herunterladen.</string>
+    <string name="help_app_upload_local_bts">Eigene BTS-Daten zu OCID hochladen.</string>
     <string name="help_app_debugging">Fehlerprotokolle sammeln und versenden.</string>
     <string name="help_app_quit">Diese App verlassen.</string>
     <string name="waiting_for_location">Standort wird ermittelt…</string>
diff --git a/app/src/main/res/values-fr/translatable_strings.xml b/app/src/main/res/values-fr/translatable_strings.xml
index 7a31c21d..065365d0 100755
--- a/app/src/main/res/values-fr/translatable_strings.xml
+++ b/app/src/main/res/values-fr/translatable_strings.xml
@@ -331,8 +331,8 @@
     <!-- Section Application-->
     <string name="help_app_add_get_ocid_api_key">obtenir une clé pour utiliser la base de donnée d\'OpenCellID et pour uploader vos données…</string>
     <string name="help_app_about">Explication des icônes de statut et du projet.</string>
-    <string name="help_app_download_local_bst">Télécharger la Base de Données OpenCellID.</string>
-    <string name="help_app_upload_local_bst">Uploader vos BTS vers OpenCellID.</string>
+    <string name="help_app_download_local_bts">Télécharger la Base de Données OpenCellID.</string>
+    <string name="help_app_upload_local_bts">Uploader vos BTS vers OpenCellID.</string>
     <string name="help_app_debugging">Afficher et envoyer les logs d\'application.</string>
     <string name="help_app_quit">Quitter cette application.</string>
     <string name="waiting_for_location">Recherche de votre localisation en cours…</string>
diff --git a/app/src/main/res/values-ja/translatable_strings.xml b/app/src/main/res/values-ja/translatable_strings.xml
index 35199f1a..248165a7 100644
--- a/app/src/main/res/values-ja/translatable_strings.xml
+++ b/app/src/main/res/values-ja/translatable_strings.xml
@@ -288,8 +288,8 @@
 
     <string name="help_app_add_get_ocid_api_key">OpenCellID データベースを使用してデータをアップロードおよびダウンロードするために API キーを取得…</string>
     <string name="help_app_about">ステータス アイコンとプロジェクトの説明。</string>
-    <string name="help_app_download_local_bst">OCID データベースをダウンロードします。</string>
-    <string name="help_app_upload_local_bst">あなたの BTS を OCID データベースにアップロードします。</string>
+    <string name="help_app_download_local_bts">OCID データベースをダウンロードします。</string>
+    <string name="help_app_upload_local_bts">あなたの BTS を OCID データベースにアップロードします。</string>
     <string name="help_app_debugging">エラー ログを収集して送信します。</string>
     <string name="help_app_quit">このアプリを終了します。</string>
     <string name="waiting_for_location">位置情報の待機中…</string>
diff --git a/app/src/main/res/values-pl/translatable_strings.xml b/app/src/main/res/values-pl/translatable_strings.xml
index 73404418..44a5ce4f 100644
--- a/app/src/main/res/values-pl/translatable_strings.xml
+++ b/app/src/main/res/values-pl/translatable_strings.xml
@@ -325,8 +325,8 @@
     <!-- Section Application-->
     <string name="help_app_add_get_ocid_api_key">Uzyskaj klucz API do OpenCellID by pobierać i wysyłać dane…</string>
     <string name="help_app_about">O nas i kogo wspieramy.</string>
-    <string name="help_app_download_local_bst">Pobierz bazÄ™ danych OCID.</string>
-    <string name="help_app_upload_local_bst">Wyślij dane o lokalnych BTS do OCID.</string>
+    <string name="help_app_download_local_bts">Pobierz bazÄ™ danych OCID.</string>
+    <string name="help_app_upload_local_bts">Wyślij dane o lokalnych BTS do OCID.</string>
     <string name="help_app_debugging">Wczytaj i wyślij logi.</string>
     <string name="help_app_quit">Zakończ działanie aplikacji.</string>
     <string name="waiting_for_location">Oczekiwanie na lokalizację…</string>
diff --git a/app/src/main/res/values-ru/translatable_strings.xml b/app/src/main/res/values-ru/translatable_strings.xml
index eb84adb3..9567e522 100644
--- a/app/src/main/res/values-ru/translatable_strings.xml
+++ b/app/src/main/res/values-ru/translatable_strings.xml
@@ -311,8 +311,8 @@
     <!-- Section Application-->
     <string name="help_app_add_get_ocid_api_key">Get an API key for using the OpenCellID database to upload and download data…</string>
     <string name="help_app_about">Status Icons and Project explained.</string>
-    <string name="help_app_download_local_bst">Downloads the OCID Database.</string>
-    <string name="help_app_upload_local_bst">Uploads your BTS to the OCID Database.</string>
+    <string name="help_app_download_local_bts">Downloads the OCID Database.</string>
+    <string name="help_app_upload_local_bts">Uploads your BTS to the OCID Database.</string>
     <string name="help_app_debugging">Collect and send error logs.</string>
     <string name="help_app_quit">Exit this app.</string>
     <string name="waiting_for_location">Waiting for location…</string>
diff --git a/app/src/main/res/values/translatable_strings.xml b/app/src/main/res/values/translatable_strings.xml
index 342a2a5a..70c49da0 100644
--- a/app/src/main/res/values/translatable_strings.xml
+++ b/app/src/main/res/values/translatable_strings.xml
@@ -333,8 +333,8 @@
     <!-- Section Application-->
     <string name="help_app_add_get_ocid_api_key">Get an API key for using the OpenCellID database to upload and download data…</string>
     <string name="help_app_about">Status Icons and Project explained.</string>
-    <string name="help_app_download_local_bst">Downloads the OCID Database.</string>
-    <string name="help_app_upload_local_bst">Uploads your BTS to the OCID Database.</string>
+    <string name="help_app_download_local_bts">Downloads the OCID Database.</string>
+    <string name="help_app_upload_local_bts">Uploads your BTS to the OCID Database.</string>
     <string name="help_app_debugging">Collect and send error logs.</string>
     <string name="help_app_quit">Exit this app.</string>
     <string name="waiting_for_location">Waiting for location…</string>
-- 
GitLab