From 63987721542fcd6ff6b049aea33845bb283d78ff Mon Sep 17 00:00:00 2001 From: ExMix Date: Fri, 25 Apr 2014 12:33:22 +0300 Subject: [PATCH] [AND] review fix --- .../mapswithme/maps/StoragePathManager.cpp | 24 ++++----- android/res/values/strings.xml | 8 +-- .../src/com/mapswithme/maps/MWMActivity.java | 8 +-- .../maps/settings/StoragePathActivity.java | 2 - .../mapswithme/util/StoragePathManager.java | 54 ++++++++++--------- iphone/Maps/cs.lproj/Localizable.strings | 8 +++ iphone/Maps/de.lproj/Localizable.strings | 8 +++ iphone/Maps/en.lproj/Localizable.strings | 8 +++ iphone/Maps/es.lproj/Localizable.strings | 8 +++ iphone/Maps/fr.lproj/Localizable.strings | 8 +++ iphone/Maps/hu.lproj/Localizable.strings | 8 +++ iphone/Maps/it.lproj/Localizable.strings | 8 +++ iphone/Maps/ja.lproj/Localizable.strings | 8 +++ iphone/Maps/ko.lproj/Localizable.strings | 8 +++ iphone/Maps/nl.lproj/Localizable.strings | 8 +++ iphone/Maps/pl.lproj/Localizable.strings | 8 +++ iphone/Maps/pt.lproj/Localizable.strings | 8 +++ iphone/Maps/ru.lproj/Localizable.strings | 8 +++ iphone/Maps/uk.lproj/Localizable.strings | 8 +++ iphone/Maps/zh-Hant.lproj/Localizable.strings | 8 +++ strings.txt | 12 ++--- 21 files changed, 173 insertions(+), 55 deletions(-) diff --git a/android/jni/com/mapswithme/maps/StoragePathManager.cpp b/android/jni/com/mapswithme/maps/StoragePathManager.cpp index e75c50c724..972a48c93f 100644 --- a/android/jni/com/mapswithme/maps/StoragePathManager.cpp +++ b/android/jni/com/mapswithme/maps/StoragePathManager.cpp @@ -1,9 +1,3 @@ -/* - * StoragePathManager.cpp - * - * Created on: 23 ???. 2014 ?. - * Author: ExMix - */ #include "../platform/Platform.hpp" #include "../core/jni_helper.hpp" #include "Framework.hpp" @@ -31,7 +25,7 @@ namespace void operator() (string const & name) { - m_set.insert(m_dirPath + "/" + name); + m_set.insert(m_dirPath + name); } private: @@ -108,17 +102,17 @@ JNIEXPORT jboolean JNICALL Java_com_mapswithme_util_StoragePathManager_nativeMoveBookmarks(JNIEnv * env, jclass thiz, jobjectArray pathArray, jlong storageAvSize) { set fullBookmarkSet; - Platform * pl = &GetPlatform(); - string settingsDir = pl->SettingsDir(); - string writableDir = pl->WritableDir(); + Platform & pl = GetPlatform(); + string const settingsDir = pl.SettingsDir(); + string const writableDir = pl.WritableDir(); if (writableDir != settingsDir) { Platform::FilesList list; - pl->GetFilesByExt(writableDir, BOOKMARKS_FILE_EXTENSION, list); + pl.GetFilesByExt(writableDir, BOOKMARKS_FILE_EXTENSION, list); for_each(list.begin(), list.end(), PathInserter(writableDir, fullBookmarkSet)); } - int arraySize = env->GetArrayLength(pathArray); + int const arraySize = env->GetArrayLength(pathArray); for (int i = 0; i < arraySize; ++i) { jstring jPath = (jstring)env->GetObjectArrayElement(pathArray, i); @@ -127,7 +121,7 @@ Java_com_mapswithme_util_StoragePathManager_nativeMoveBookmarks(JNIEnv * env, jc if (path != settingsDir) { Platform::FilesList list; - pl->GetFilesByExt(path, BOOKMARKS_FILE_EXTENSION, list); + pl.GetFilesByExt(path, BOOKMARKS_FILE_EXTENSION, list); for_each(list.begin(), list.end(), PathInserter(path, fullBookmarkSet)); } } @@ -147,11 +141,11 @@ Java_com_mapswithme_util_StoragePathManager_nativeMoveBookmarks(JNIEnv * env, jc for (fileIt it = fullBookmarkSet.begin(); it != fullBookmarkSet.end(); ++it) { - string oldFilePath = *it; + string const oldFilePath = *it; string fileName = oldFilePath; my::GetNameFromFullPath(fileName); my::GetNameWithoutExt(fileName); - string newFilePath = BookmarkCategory::GenerateUniqueFileName(settingsDir, fileName); + string const newFilePath = BookmarkCategory::GenerateUniqueFileName(settingsDir, fileName); if (my::CopyFileX(oldFilePath, newFilePath)) my::DeleteFileX(oldFilePath); diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index f300728d05..2720b1a993 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -343,8 +343,8 @@ Coordinates Unsorted View on map - All maps been copyed. You can delete MapsWithMe folder from your sdcard - Not enough space for maps - Not enough space for bookmarks - Optimization. This can take several minutes.\nPlease wait… + Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it. + Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode. + We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available. + Your map storage is being optimized now. Please wait, it may take a few minutes. diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java index 4d50b2dd63..e25c00f831 100644 --- a/android/src/com/mapswithme/maps/MWMActivity.java +++ b/android/src/com/mapswithme/maps/MWMActivity.java @@ -321,7 +321,7 @@ public class MWMActivity extends NvEventQueueActivity { new AlertDialog.Builder(this) .setCancelable(false) - .setTitle(tittleID) + .setMessage(tittleID) .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { @Override @@ -335,8 +335,8 @@ public class MWMActivity extends NvEventQueueActivity { final String KmlMovedFlag = "KmlBeenMoved"; final String KitKatMigrationCompleted = "KitKatMigrationCompleted"; - boolean kmlMoved = MWMApplication.get().nativeGetBoolean(KmlMovedFlag, false); - boolean mapsCpy = MWMApplication.get().nativeGetBoolean(KitKatMigrationCompleted, false); + final boolean kmlMoved = MWMApplication.get().nativeGetBoolean(KmlMovedFlag, false); + final boolean mapsCpy = MWMApplication.get().nativeGetBoolean(KitKatMigrationCompleted, false); if (!kmlMoved) { @@ -361,7 +361,7 @@ public class MWMActivity extends NvEventQueueActivity } }; if (StoragePathManager.CheckWritableDir(this, listener) == false) - ShowAlertDlg(R.string.kitkat_migrate_filed); + ShowAlertDlg(R.string.kitkat_migrate_failed); } } diff --git a/android/src/com/mapswithme/maps/settings/StoragePathActivity.java b/android/src/com/mapswithme/maps/settings/StoragePathActivity.java index 2ccb1a40e5..6317380543 100644 --- a/android/src/com/mapswithme/maps/settings/StoragePathActivity.java +++ b/android/src/com/mapswithme/maps/settings/StoragePathActivity.java @@ -238,12 +238,10 @@ public class StoragePathActivity extends MapsWithMeBaseListActivity oldItem = m_items.get(m_current); StoragePathManager.SetStoragePath(m_context, new StoragePathManager.SetStoragePathListener() { - @Override public void MoveFilesFinished(String newPath) { doUpdateAfterMove(newPath); - } }, m_items.get(index), oldItem); diff --git a/android/src/com/mapswithme/util/StoragePathManager.java b/android/src/com/mapswithme/util/StoragePathManager.java index 2aba4ade71..ffcb3abcf9 100644 --- a/android/src/com/mapswithme/util/StoragePathManager.java +++ b/android/src/com/mapswithme/util/StoragePathManager.java @@ -63,7 +63,10 @@ public class StoragePathManager File primaryStorageDir = context.getExternalFilesDir(null); for(File f : files) { - if (!f.equals(primaryStorageDir)) + // On kitkat and Greater we ignore private folder on primary storage + // like "PrimaryStorage/Android/data/com.mapswithme.maps.pro/file/" because + // we can write to root of PrimaryStorage/ + if (f != null && !f.equals(primaryStorageDir)) pathes.add(f.getPath()); } } @@ -127,7 +130,7 @@ public class StoragePathManager approvedPathes.add(mwmPath); } String tmp[] = approvedPathes.toArray(new String[approvedPathes.size()]); - return nativeMoveBookmarks(tmp, getAvailablePath(nativeGetBookmarkDir())); + return nativeMoveBookmarks(tmp, getFreeBytesAtPath(nativeGetBookmarkDir())); } static public boolean CheckWritableDir(Context context, SetStoragePathListener listener) @@ -135,24 +138,18 @@ public class StoragePathManager if (Utils.apiLowerThan(android.os.Build.VERSION_CODES.KITKAT)) return true; - String settingsDir = nativeGetSettingsDir(); - String writableDir = nativeGetWritableDir(); + final String settingsDir = nativeGetSettingsDir(); + final String writableDir = nativeGetWritableDir(); - if (settingsDir == writableDir) + if (settingsDir.equals(writableDir)) return true; - File f = new File(writableDir + "testDir"); - f.mkdir(); - if (f.exists()) - { - // this path is writable. Don't try copy maps - f.delete(); + if (isDirWritable(writableDir)) return true; - } - ArrayList items = GetStorages(context, writableDir.replace(MWM_DIR_POSTFIX, ""), + final ArrayList items = GetStorages(context, writableDir.replace(MWM_DIR_POSTFIX, ""), settingsDir.replace(MWM_DIR_POSTFIX, "")); - long size = getDirSizeImpl(writableDir); + final long size = getDirSizeImpl(writableDir); for (StorageItem item : items) { if (item.m_size > size) @@ -182,6 +179,21 @@ public class StoragePathManager task.execute(""); } + static private boolean isDirWritable(String path) + { + final File f = new File(path + "/testDir"); + f.mkdir(); + // we can't only call canWrite, because on KitKat (Samsung S4) this return true + // for sdcard but actually it's read only + if (f.exists()) + { + f.delete(); + return true; + } + + return false; + } + private static int VOLD_MODE = 1; private static int MOUNTS_MODE = 2; @@ -252,22 +264,16 @@ public class StoragePathManager final File f = new File(path + "/"); if (f.exists() && f.isDirectory() && f.canWrite()) { - // we can't only call canWrite, because on KitKat (Samsung S4) this return true - // for sdcard but actually it's read only - File ff = new File(path + "/" + "TestDir"); - ff.mkdir(); - if (!ff.exists()) + if (!isDirWritable(path)) return false; - else - ff.delete(); + for (StorageItem item : items) { if (item.m_path.equals(path)) return true; } - final long size = getAvailablePath(path); - Log.i(TAG, "Available size = " + size); + final long size = getFreeBytesAtPath(path); final StorageItem item = new StorageItem(); item.m_path = path; @@ -290,7 +296,7 @@ public class StoragePathManager @SuppressWarnings("deprecation") @SuppressLint("NewApi") - static private long getAvailablePath(String path) + static private long getFreeBytesAtPath(String path) { final StatFs stat = new StatFs(path); final long size = Utils.apiLowerThan(android.os.Build.VERSION_CODES.JELLY_BEAN_MR2) diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings index c3edee5c7e..a239fc64f2 100644 --- a/iphone/Maps/cs.lproj/Localizable.strings +++ b/iphone/Maps/cs.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Nezařazené"; "search_show_on_map" = "Zobrazit a mapě"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings index 27df0ef619..830d16fc47 100644 --- a/iphone/Maps/de.lproj/Localizable.strings +++ b/iphone/Maps/de.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Unsortiert"; "search_show_on_map" = "Auf der Karte ansehen"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings index 0fc6756e9b..0046d6fb27 100644 --- a/iphone/Maps/en.lproj/Localizable.strings +++ b/iphone/Maps/en.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Unsorted"; "search_show_on_map" = "View on map"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings index aa2bee495f..403216c64d 100644 --- a/iphone/Maps/es.lproj/Localizable.strings +++ b/iphone/Maps/es.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Sin clasificar"; "search_show_on_map" = "Ver en el mapa"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings index 95f32e981a..d32eefca98 100644 --- a/iphone/Maps/fr.lproj/Localizable.strings +++ b/iphone/Maps/fr.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Non classé"; "search_show_on_map" = "Afficher sur la carte"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings index ef291211a6..acdf3483e9 100644 --- a/iphone/Maps/hu.lproj/Localizable.strings +++ b/iphone/Maps/hu.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Osztályozatlan"; "search_show_on_map" = "Megtekintés a térképen"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings index bd3d87ba1c..00e1560b9a 100644 --- a/iphone/Maps/it.lproj/Localizable.strings +++ b/iphone/Maps/it.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Non classificato"; "search_show_on_map" = "Visualizza sulla mappa"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings index 79a8c301f1..2e53a9fde3 100644 --- a/iphone/Maps/ja.lproj/Localizable.strings +++ b/iphone/Maps/ja.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "未分類"; "search_show_on_map" = "地図に表示"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings index 3766352997..0c48f16ffb 100644 --- a/iphone/Maps/ko.lproj/Localizable.strings +++ b/iphone/Maps/ko.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "분류되지 않음"; "search_show_on_map" = "지도 보기"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings index 8100af8ddb..cc1a4930d8 100644 --- a/iphone/Maps/nl.lproj/Localizable.strings +++ b/iphone/Maps/nl.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Ongeclassificeerd"; "search_show_on_map" = "Op kaart bekijken"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings index 99fb754331..760a1d2510 100644 --- a/iphone/Maps/pl.lproj/Localizable.strings +++ b/iphone/Maps/pl.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Niesklasyfikowane"; "search_show_on_map" = "Zobacz na mapie"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings index 5d86a23cab..5588e3d2c3 100644 --- a/iphone/Maps/pt.lproj/Localizable.strings +++ b/iphone/Maps/pt.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Não classificado"; "search_show_on_map" = "Ver no mapa"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings index 0a6cd2c571..517e74eb35 100644 --- a/iphone/Maps/ru.lproj/Localizable.strings +++ b/iphone/Maps/ru.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Без категории"; "search_show_on_map" = "Посмотреть на карте"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings index 199cfd37ff..c750e4b602 100644 --- a/iphone/Maps/uk.lproj/Localizable.strings +++ b/iphone/Maps/uk.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "Без категорії"; "search_show_on_map" = "Подивитись на карті"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings index 304bfa90ae..4e4a720d6e 100644 --- a/iphone/Maps/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings @@ -532,3 +532,11 @@ "placepage_unsorted" = "未分类的"; "search_show_on_map" = "在地图上查看"; + +"kitkat_migrate_ok" = "Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it."; + +"kitkat_migrate_failed" = "Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode."; + +"bookmark_move_fail" = "We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available."; + +"kitkat_optimization_in_progress" = "Your map storage is being optimized now. Please wait, it may take a few minutes."; diff --git a/strings.txt b/strings.txt index 2c5dab4330..5df54c2739 100644 --- a/strings.txt +++ b/strings.txt @@ -2355,7 +2355,7 @@ zh-Hant = 下載您目前所在位置的國家 (%@) 地圖 pl = Pobierz mapę kraju (%@), w którym aktualnie przebywasz pt = Descarregue o país (%@) da sua localização atual - hu = Töltse le az aktuális helyzet országát (%@) + hu = Töltse le az aktuális helyzet országát (%@) [download_viewport_country_to_search] en = Download the country (%@) you are searching on tags = ios,android @@ -3123,10 +3123,10 @@ ru = Посмотреть на карте hu = Megtekintés a térképen [kitkat_migrate_ok] - en = All maps been copyed. You can delete MapsWithMe folder from your sdcard - [kitkat_migrate_filed] - en = Not enough space for maps + en = Map data storage has been optimized. Please restart the app.\n\nMapsWithMe folder in the root of SD card is not needed anymore, you can delete it. + [kitkat_migrate_failed] + en = Due to changes in Android 4.4, we need to optimize map data storage, but there is no enough space to copy map data.\n\nPlease free up the memory, otherwise maps will be available in read-only mode. [bookmark_move_fail] - en = Not enough space for bookmarks + en = We need to move your bookmarks to internal memory, but there is no available space for them. Please free up the memory, otherwise bookmarks won’t be available. [kitkat_optimization_in_progress] - en = Optimization. This can take several minutes.\nPlease wait… + en = Your map storage is being optimized now. Please wait, it may take a few minutes.