Commit f10e11ac authored by Daniel Wolf's avatar Daniel Wolf
Browse files

Removed the abort string (provided by android)

parent 1a5584cb
Pipeline #4873 passed with stage
in 6 minutes and 53 seconds
......@@ -82,7 +82,7 @@ class RuleExportService : Service() {
PendingIntent.FLAG_CANCEL_CURRENT
)
val abortAction =
NotificationCompat.Action(R.drawable.ic_times, getString(R.string.all_abort), abortPendingAction)
NotificationCompat.Action(R.drawable.ic_times, getString(android.R.string.cancel), abortPendingAction)
notification!!.addAction(abortAction)
}
startForeground(5, notification!!.build())
......
......@@ -109,7 +109,7 @@ class RuleImportService : Service() {
PendingIntent.FLAG_CANCEL_CURRENT
)
val abortAction =
NotificationCompat.Action(R.drawable.ic_times, getString(R.string.all_abort), abortPendingAction)
NotificationCompat.Action(R.drawable.ic_times, getString(android.R.string.cancel), abortPendingAction)
notification!!.addAction(abortAction)
}
startForeground(3, notification!!.build())
......
......@@ -62,7 +62,6 @@
<string name="activity_label_dns_rules">Dns Regeln</string>
<string name="all_abort">Abbrechen</string>
<string name="error_no_webbrowser_installed">Du hast keine App zum ansehen dieses Links installiert.</string>
<string name="button_main_dnsrules">Dns Regeln</string>
......
......@@ -52,7 +52,6 @@
<string name="activity_label_speed_test">Server snelheidsvergelijking</string>
<string name="activity_label_dns_rules">Dns regels</string>
<string name="all_abort">Afbreken</string>
<string name="window_speedtest_runtest">Start de test</string>
<string name="window_speedtest_useserver">Gebruik deze server</string>
......
......@@ -55,7 +55,6 @@
<string name="activity_label_speed_test">Sunucu hızı karşılaştırması</string>
<string name="activity_label_dns_rules">DNS kuralları</string>
<string name="all_abort">İptal et</string>
<string name="window_speedtest_runtest">Testi başlat</string>
<string name="window_speedtest_useserver">Bu sunucuyu kullan</string>
......
......@@ -14,7 +14,6 @@
<string name="all_resume">Resume</string>
<string name="all_no">No</string>
<string name="all_yes">Yes</string>
<string name="all_abort">Abort</string>
<string name="information">Information</string>
<string name="open_app">Open app</string>
<string name="all_close">Close</string>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment