Cleaning up recent merge problems

app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java

@@ -173,14 +173,14 @@ public class LightningDialogBuilder {
                 @Override
                 public void onClick() {
                     mDownloadsModel.deleteAllDownloads()
-                            .subscribeOn(Schedulers.io())
+                        .subscribeOn(Schedulers.io())
-                            .observeOn(Schedulers.main())
+                        .observeOn(Schedulers.main())
-                            .subscribe(new CompletableOnSubscribe() {
+                        .subscribe(new CompletableOnSubscribe() {
-                                @Override
+                            @Override
-                                public void onComplete() {
+                            public void onComplete() {
-                                    uiController.handleDownloadDeleted();
+                                uiController.handleDownloadDeleted();
-                                }
+                            }
-                            });
+                        });
                 }
             });
     }
@@ -363,7 +363,7 @@ public class LightningDialogBuilder {
                     uiController.handleNewTab(NewTab.BACKGROUND, url);
                 }
             },
-            new BrowserDialog.Item(R.string.dialog_open_incognito_tab) {
+            new BrowserDialog.Item(R.string.dialog_open_incognito_tab, activity instanceof MainActivity) {
                 @Override
                 public void onClick() {
                     uiController.handleNewTab(NewTab.INCOGNITO, url);

app/src/main/res/values-it/strings.xml

@@ -36,7 +36,6 @@
     <string name="download">Scegli un percorso</string>
     <string name="settings_advanced">Avanzate</string>
     <string name="apache">Apache License 2.0</string>
-    <string name="version">Versione App</string>
     <string name="cache">Cancella la cache in chiusura</string>
     <string name="reflow">Abilità il reflow del testo</string>
     <string name="block">Blocca immagini</string>
@@ -104,6 +103,7 @@
     <string name="action_back">Indietro</string>
     <string name="action_find">Trova nella pagina</string>
     <string name="download_pending">Avvio download\u2026</string>
+    <string name="cannot_download">È possibile scaricare solo da URL \"http\" o \"https\".</string>
     <string name="problem_download">URL non supportato: scaricamento fallito</string>
     <string name="problem_location_download">Impssibile scaricare nella posizione scelta</string>
     <string name="download_no_sdcard_dlg_title" >Nessuna scheda SD trovata.</string>

app/src/main/res/values/strings.xml

@@ -243,8 +243,6 @@
     <string name="dialog_remove_bookmark">Remove bookmark</string>
     <string name="dialog_edit_bookmark">Edit bookmark</string>
     <string name="dialog_remove_from_history">Remove from history</string>
-    <string name="dialog_image_new_tab">Open image in new tab</string>
-    <string name="dialog_image_background_tab">Open image in background tab</string>
     <string name="dialog_download_image">Download image</string>
     <string name="dialog_copy_link">Copy link</string>
     <string name="dialog_rename_folder">Rename folder</string>