diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 3ca192d132..acd2213a91 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2196,4 +2196,7 @@
Hej tomme fragment
Vælg hvor kortfilerne skal gemmes.
\'Fra\' starter direkte på kortet
-
+Kort hentet
+ Kort over %1$ s er hentet. Gå tilbage til kortet for at begynde at bruge det.
+ Gå til kortet
+
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index ea52338216..c89648f219 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -2181,4 +2181,8 @@
Atnaujinti viską (%1$s MB)
Kontūro linijos išjungtos
Siųsti
+ Žemėlapis atsiųstas
+ %1$s žemėlapio jau atsiųsta. Norėdami pradėti juo naudotis, grįžkite į žemėlapį.
+ Atidaryti žemėlapį
+ Pasirinkite vietą, kurioje norėsite išsaugoti žemėlapius.
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index ecb9f78686..729cc62f87 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -2337,4 +2337,9 @@
Клуб парусного спорта
Клуб скаутов
+ Историческое гумно
+ Историческая виселица
+ Историческая железная дорога
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 89819612ce..09eb40d588 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2148,4 +2148,7 @@
Imbia
Sabuna/Inneta su segmentu
Issèbera in ue boles pònnere sos documentos de sas mapas.
-
+Mapa iscarrigada
+ Sa mapa de %1$s est istada iscarrigada. Torra a sa mapa pro incumintzare a l’impreare.
+ Bae a sa mapa
+
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index b7022d3978..7c40b8b1fc 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -2341,5 +2341,8 @@
Sailing club
Scout club
+ Historic threshing floor
+ Historic gallows
+ Historic railway
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 5a2273eb22..0819d84db3 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -222,6 +222,7 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl
initSettingsFirstMap(downloadItem);
}
showGoToMap(downloadItem);
+ downloadItem = null;
}
for (WeakReference ref : fragSet) {
Fragment f = ref.get();
diff --git a/OsmAnd/src/net/osmand/plus/download/ui/GoToMapFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/GoToMapFragment.java
index cd7be417bc..06ddf7bedd 100644
--- a/OsmAnd/src/net/osmand/plus/download/ui/GoToMapFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/ui/GoToMapFragment.java
@@ -14,6 +14,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
+import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
@@ -42,6 +43,8 @@ public class GoToMapFragment extends DialogFragment {
: R.style.OsmandDarkTheme_BottomSheet;
final Dialog dialog = new Dialog(getActivity(), themeId);
dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+ dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+ dialog.getWindow().setDimAmount(0.3f);
dialog.getWindow().getAttributes().windowAnimations = R.style.Animations_PopUpMenu_Bottom;
return dialog;
}
@@ -66,13 +69,14 @@ public class GoToMapFragment extends DialogFragment {
((TextView) view.findViewById(R.id.descriptionTextView))
.setText(getActivity().getString(R.string.map_downloaded_descr, regionName));
- view.findViewById(R.id.closeImageButton)
- .setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- dismiss();
- }
- });
+ final ImageButton closeImageButton = (ImageButton) view.findViewById(R.id.closeImageButton);
+ closeImageButton.setImageDrawable(getContentIcon(R.drawable.ic_action_remove_dark));
+ closeImageButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dismiss();
+ }
+ });
view.findViewById(R.id.actionButton)
.setOnClickListener(new View.OnClickListener() {
@@ -80,6 +84,7 @@ public class GoToMapFragment extends DialogFragment {
public void onClick(View v) {
OsmandApplication app = (OsmandApplication) getActivity().getApplication();
app.getSettings().setMapLocationToShow(regionCenter.getLatitude(), regionCenter.getLongitude(), 5, null);
+ dismiss();
MapActivity.launchMapActivityMoveToTop(getActivity());
}
});
@@ -113,6 +118,10 @@ public class GoToMapFragment extends DialogFragment {
return getMyApplication().getIconsCache().getIcon(drawableRes, color);
}
+ private Drawable getContentIcon(@DrawableRes int drawableRes) {
+ return getMyApplication().getIconsCache().getContentIcon(drawableRes);
+ }
+
public static void showInstance(WorldRegion region, DownloadActivity activity) {
GoToMapFragment fragment = new GoToMapFragment();
fragment.regionCenter = region.getRegionCenter();