From 089c6f2653ae52046eba10885585c82c0a01bf1e Mon Sep 17 00:00:00 2001
From: Stanislav Petryakov <become.glory@yandex.ru>
Date: Tue, 22 Nov 2016 22:10:00 +0300
Subject: [PATCH] Change string name due to conflict

---
 app/src/main/java/com/nextgis/logger/SessionsActivity.java | 2 +-
 app/src/main/res/values-ru/strings.xml                     | 2 +-
 app/src/main/res/values/strings.xml                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextgis/logger/SessionsActivity.java b/app/src/main/java/com/nextgis/logger/SessionsActivity.java
index 046c409..29f7aac 100644
--- a/app/src/main/java/com/nextgis/logger/SessionsActivity.java
+++ b/app/src/main/java/com/nextgis/logger/SessionsActivity.java
@@ -628,7 +628,7 @@ protected void onProgressUpdate(Void... values) {
             super.onProgressUpdate(values);
 
             mProgress = new ProgressDialog(SessionsActivity.this);
-            mProgress.setTitle(R.string.export);
+            mProgress.setTitle(R.string.export_title);
             mProgress.setMessage(getString(R.string.preparing));
             mProgress.setCanceledOnTouchOutside(false);
             mProgress.setOnDismissListener(new DialogInterface.OnDismissListener() {
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c292c59..4f8c969 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -94,7 +94,7 @@
     <string name="mssdt">Метки отдельно от Сервис; Данные вместе (CSV)</string>
     <string name="mssds">Всё в разные файлы (CSV)</string>
     <string name="gpx">Только GPS-трек (GPX)</string>
-    <string name="export">Экспорт</string>
+    <string name="export_title">Экспорт</string>
     <string name="preparing">Подготовка данных…</string>
 
     <string name="ext_media_unmounted_msg">Нет доступа к внешней памяти</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2960b03..99b6b7c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,7 +99,7 @@
     <string name="mssdt">Marks separated with Service; Data together (CSV)</string>
     <string name="mssds">All separated (CSV)</string>
     <string name="gpx">Only GPS-track (GPX)</string>
-    <string name="export">Export</string>
+    <string name="export_title">Export</string>
     <string name="preparing">Preparing data…</string>
 
     <string name="ext_media_unmounted_msg">External Media is NOT MOUNTED</string>