Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

shared_strings_download (2)

Browse source
This commit is contained in:
sonora 2015-03-08 20:08:46 +01:00
parent ffdd0f8710
commit cce59ca597
7 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/download.xml
View file

@ -101,7 +101,7 @@
android:layout_height="@dimen/bottom_tool_bar_size" android:layout_height="@dimen/bottom_tool_bar_size"
android:background="?attr/downloadButtonBackground" android:background="?attr/downloadButtonBackground"
android:gravity="center" android:gravity="center"
android:text="@string/download_files" android:text="@string/shared_string_download"
android:textColor="?attr/pstsTextColor" android:textColor="?attr/pstsTextColor"
android:visibility="gone" /> android:visibility="gone" />

1
OsmAnd/res/values/strings.xml
View file

@ -1812,7 +1812,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="download_type_to_filter">type to filter</string> <string name="download_type_to_filter">type to filter</string>
<string name="use_high_res_maps">High resolution display</string> <string name="use_high_res_maps">High resolution display</string>
<string name="use_high_res_maps_descr">Do not stretch (and blur) map tiles on high density displays</string> <string name="use_high_res_maps_descr">Do not stretch (and blur) map tiles on high density displays</string>
<string name="download_files">Download</string>
<string name="context_menu_item_search_transport">Search public transport</string> <string name="context_menu_item_search_transport">Search public transport</string>
<string name="transport_searching_transport">Transport results (no destination):</string> <string name="transport_searching_transport">Transport results (no destination):</string>
<string name="transport_searching_route">Transport results ({0} to destination):</string> <string name="transport_searching_route">Transport results ({0} to destination):</string>

2
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -173,7 +173,7 @@ public class AppInitializer implements IProgress {
} else { } else {
return; return;
} }
builder.setPositiveButton(R.string.download_files, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.shared_string_download, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {

2
OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java
View file

@ -100,7 +100,7 @@ public class DownloadTilesDialog {
}); });
builder.setPositiveButton(R.string.download_files, new DialogInterface.OnClickListener(){ builder.setPositiveButton(R.string.shared_string_download, new DialogInterface.OnClickListener(){
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.dismiss(); dialog.dismiss();

2
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -310,7 +310,7 @@ public class DownloadActivity extends BaseDownloadActivity {
String text; String text;
int downloads = DownloadActivity.downloadListIndexThread.getDownloads(); int downloads = DownloadActivity.downloadListIndexThread.getDownloads();
if (!running) { if (!running) {
text = getString(R.string.download_files) + " (" + downloads + ")"; //$NON-NLS-1$ text = getString(R.string.shared_string_download) + " (" + downloads + ")"; //$NON-NLS-1$
} else { } else {
text = getString(R.string.downloading_file_new) + " (" + downloads + ")"; //$NON-NLS-1$ text = getString(R.string.downloading_file_new) + " (" + downloads + ")"; //$NON-NLS-1$
} }

2
OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java
View file

@ -65,7 +65,7 @@ public class LocalOpenstreetmapActivity extends OsmandListActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.local_openstreetmap); setContentView(R.layout.local_openstreetmap);
getSupportActionBar().setTitle(R.string.download_files); getSupportActionBar().setTitle(R.string.shared_string_download);
setSupportProgressBarIndeterminateVisibility(false); setSupportProgressBarIndeterminateVisibility(false);
listAdapter = new LocalOpenstreetmapAdapter(); listAdapter = new LocalOpenstreetmapAdapter();

4
OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
View file

@ -256,11 +256,11 @@ public class DownloadedRegionsLayer extends OsmandMapLayer {
filter.setLength(0); filter.setLength(0);
filter.append("basemap"); filter.append("basemap");
downloadBtn.setVisibility(View.VISIBLE); downloadBtn.setVisibility(View.VISIBLE);
downloadBtn.setText(view.getResources().getString(R.string.download_files) + " " downloadBtn.setText(view.getResources().getString(R.string.shared_string_download) + " "
+ view.getResources().getString(R.string.base_world_map)); + view.getResources().getString(R.string.base_world_map));
} else if(zoom >= ZOOM_TO_SHOW_MAP_NAMES && noMapsPresent && Math.abs(queriedBox.getZoom() - zoom) <= ZOOM_THRESHOLD && } else if(zoom >= ZOOM_TO_SHOW_MAP_NAMES && noMapsPresent && Math.abs(queriedBox.getZoom() - zoom) <= ZOOM_THRESHOLD &&
currentObjects != null){ currentObjects != null){
StringBuilder s = new StringBuilder(view.getResources().getString(R.string.download_files)); StringBuilder s = new StringBuilder(view.getResources().getString(R.string.shared_string_download));
filter.setLength(0); filter.setLength(0);
Set<String> set = new TreeSet<String>(); Set<String> set = new TreeSet<String>();
if ((currentObjects != null && currentObjects.size() > 0)) { if ((currentObjects != null && currentObjects.size() > 0)) {