make the checkbox at importing events from .ics files clearer

app/src/main/res/layout/dialog_import_events.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/import_events_holder"
     android:layout_width="match_parent"
@@ -15,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/activity_margin"
         android:text="@string/default_event_type"
-        android:textSize="@dimen/smaller_text_size"/>
+        android:textSize="@dimen/smaller_text_size" />
 
     <RelativeLayout
         android:id="@+id/import_event_type_holder"
@@ -31,19 +30,17 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toStartOf="@+id/import_event_type_color"
-            android:paddingStart="@dimen/medium_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingEnd="@dimen/medium_margin"
-            tools:text="@string/regular_event"/>
+            tools:text="@string/regular_event" />
 
         <ImageView
             android:id="@+id/import_event_type_color"
             android:layout_width="@dimen/color_sample_size"
             android:layout_height="@dimen/color_sample_size"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
             android:layout_marginEnd="@dimen/medium_margin"
-            android:layout_marginRight="@dimen/medium_margin"
+            android:clickable="false" />
-            android:clickable="false"/>
 
     </RelativeLayout>
 
@@ -54,6 +51,6 @@
         android:layout_marginStart="@dimen/normal_margin"
         android:paddingTop="@dimen/activity_margin"
         android:paddingBottom="@dimen/activity_margin"
-        android:text="@string/override_event_types"/>
+        android:text="@string/ignore_event_types" />
 
 </LinearLayout>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">تصدير الأحداث السابقة أيضاً</string>
     <string name="include_event_types">أضف أنواع الأحداث</string>
     <string name="filename_without_ics">اسم ملف (بدون ics)</string>
-    <string name="override_event_types">تجاوز أنواع الأحداث في الملف</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">الموقع</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Keçmiş hadisələri də xaric et</string>
     <string name="include_event_types">Hadisə tiplərini ehtiva et</string>
     <string name="filename_without_ics">Fayl adı (.ics\'sız)</string>
-    <string name="override_event_types">Faylın içərisində hadisə tiplərini üstünə yaz</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Məkan</string>

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

@@ -130,7 +130,7 @@
     <string name="export_past_events_too">আগের ইভেন্টগুলোও এক্সপোর্ট করুন</string>
     <string name="include_event_types">ইভেন্ট টাইপ অন্তর্ভুক্ত করুন</string>
     <string name="filename_without_ics">ফাইলের নাম (.ics ছাড়া)</string>
-    <string name="override_event_types">ফাইলটিতে ইভেন্ট টাইপগুলি ওভাররাইড করুন</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">লোকেশন</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Ezporzhiañ an darvoudoù tremenet ivez</string>
     <string name="include_event_types">Enkorfañ doareoù an darvoudoù ivez</string>
     <string name="filename_without_ics">Anv ar restr (hep .ics)</string>
-    <string name="override_event_types">Override event types in the file</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Lec\'hiadur</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Exportovat i dřívější události</string>
     <string name="include_event_types">Zahrnout typy událostí</string>
     <string name="filename_without_ics">Název souboru (bez .ics)</string>
-    <string name="override_event_types">Přepsat typy událostí v souboru</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Lokace</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Eksporter også tidligere begivenheder</string>
     <string name="include_event_types">Inkluder begivenhedstyper</string>
     <string name="filename_without_ics">Filnavn (uden .ics)</string>
-    <string name="override_event_types">Overskriv begivenhedstyper i filen</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Sted</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Vergangene Termine auch exportieren</string>
     <string name="include_event_types">Termintypen miteinbeziehen</string>
     <string name="filename_without_ics">Dateiname (ohne .ics)</string>
-    <string name="override_event_types">Termintypen in der Datei überschreiben</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Ort</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Εξαγωγή προηγούμενων εκδηλώσεων επίσης</string>
     <string name="include_event_types">Συμπερίληψη τύπων εκδηλώσεων</string>
     <string name="filename_without_ics">Όνομα αρχείου (χωρίς .ics)</string>
-    <string name="override_event_types">Κατάργηση τύπων εκδηλώσεων στο αρχείο</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Τοποθεσία</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Exportar también eventos pasados</string>
     <string name="include_event_types">Incluir tipos de evento</string>
     <string name="filename_without_ics">Nombre del archivo (sin extensión .ics)</string>
-    <string name="override_event_types">Sobreescribir tipos de evento en el archivo</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Ubicación</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Esportatu iraganeko gertaerak ere bai</string>
     <string name="include_event_types">Gehitu gertaera motak</string>
     <string name="filename_without_ics">Fitxategi-izena (.ics gabe)</string>
-    <string name="override_event_types">Gainidatzi fitxategiko gertaera motak</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Kokalekua</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Vie myös menneet tapahtumat</string>
     <string name="include_event_types">Sisällytä tapahtumatyypit</string>
     <string name="filename_without_ics">Tiedostonimi (ilman .ics)</string>
-    <string name="override_event_types">Ohita tiedoston tapahtumatyypit</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Sijainti</string>

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

@@ -127,7 +127,7 @@
     <string name="export_past_events_too">Exporter les événements passés</string>
     <string name="include_event_types">Inclure les types d\’événement</string>
     <string name="filename_without_ics">Nom du fichier (sans .ics)</string>
-    <string name="override_event_types">Ecraser les types d\’événement dans le fichier</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Lieu</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Exportar tamén eventos pasados</string>
     <string name="include_event_types">Incluír tipos de eventos</string>
     <string name="filename_without_ics">Nome do ficheiro (sen .ics)</string>
-    <string name="override_event_types">Sobrescribir tipos de evento no ficheiro</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Localización</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">ייצוא אירועי עבר בנוסף</string>
     <string name="include_event_types">כלול סוגי אירוע</string>
     <string name="filename_without_ics">שם הקובץ (ללא סיומת .ics)</string>
-    <string name="override_event_types">שנה סוגי אירועים בקובץ</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">מיקום</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Export past events too</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
-    <string name="override_event_types">Override event types in the file</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Location</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Izvoz prošlih događaja</string>
     <string name="include_event_types">Uključi vrste događaja</string>
     <string name="filename_without_ics">Naziv datoteke (bez .ics)</string>
-    <string name="override_event_types">Override event types in the file</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Lokacija</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Export past events too</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
-    <string name="override_event_types">Override event types in the file</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Location</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Ekspor juga acara yang sudah lewat</string>
     <string name="include_event_types">Sertakan kategori acara</string>
     <string name="filename_without_ics">Nama berkas (tanpa .ics)</string>
-    <string name="override_event_types">Timpa kategori acara di dalam berkas</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Lokasi</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Ekspor juga acara yang sudah lewat</string>
     <string name="include_event_types">Sertakan kategori acara</string>
     <string name="filename_without_ics">Nama berkas (tanpa .ics)</string>
-    <string name="override_event_types">Timpa kategori acara di dalam berkas</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Lokasi</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Esporta anche gli eventi passati</string>
     <string name="include_event_types">Includi i tipi di evento</string>
     <string name="filename_without_ics">Nome file (senza .ics)</string>
-    <string name="override_event_types">Sovrascrivi i tipi di eventi nel file</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Posizione</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">ייצוא אירועי עבר בנוסף</string>
     <string name="include_event_types">כלול סוגי אירוע</string>
     <string name="filename_without_ics">שם הקובץ (ללא סיומת .ics)</string>
-    <string name="override_event_types">שנה סוגי אירועים בקובץ</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">מיקום</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">過去の予定もエクスポートする</string>
     <string name="include_event_types">予定の種類を含める</string>
     <string name="filename_without_ics">ファイル名 (.ics を除く)</string>
-    <string name="override_event_types">ファイル内の予定の種類を上書きする</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">場所</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">과거 일정들 내보내기</string>
     <string name="include_event_types">일정 유형 포함</string>
     <string name="filename_without_ics">파일이름 (.ics 없이)</string>
-    <string name="override_event_types">파일에서 일정 유형 재정의</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">위치</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Taip pat eksportuoti praėjusius įvykius</string>
     <string name="include_event_types">Įtraukti įvykių tipus</string>
     <string name="filename_without_ics">Bylos pavadinimas (be .ics)</string>
-    <string name="override_event_types">Override event types in the file</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Vieta</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Eksportēt arī pagājušos notikumus</string>
     <string name="include_event_types">Ietvert notikumu veidus</string>
     <string name="filename_without_ics">Faila nosaukums (bez .ics)</string>
-    <string name="override_event_types">Ignorēt/nesaglabāt notikumu tipus failā</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Vieta</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Eksporter fortidige hendelser også</string>
     <string name="include_event_types">Inkluder hendelsestyper</string>
     <string name="filename_without_ics">Filnavn (uten .ics)</string>
-    <string name="override_event_types">Overstyr hendelsestyper i filen</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Sted</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Afspraken uit verleden ook exporteren</string>
     <string name="include_event_types">Afspraaktypes weergeven</string>
     <string name="filename_without_ics">Bestandsnaam (zonder .ics)</string>
-    <string name="override_event_types">Afspraaktypes uit het bestand negeren</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Locatie</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Eksporter fortidige hendelser også</string>
     <string name="include_event_types">Inkluder hendelsestyper</string>
     <string name="filename_without_ics">Filnavn (uten .ics)</string>
-    <string name="override_event_types">Override event types in the file</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Sted</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Eksportuj także wydarzenia z przeszłości</string>
     <string name="include_event_types">Dołącz typy wydarzeń</string>
     <string name="filename_without_ics">Nazwa pliku (bez końcówki „.ics”)</string>
-    <string name="override_event_types">Nadpisz typy wydarzeń w pliku</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Lokalizacja</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Exportar eventos passados também</string>
     <string name="include_event_types">Incluir tipos de eventos</string>
     <string name="filename_without_ics">Nome do arquivo (sem .ics)</string>
-    <string name="override_event_types">Substituir os tipos de eventos no arquivo</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Localização</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Exportar eventos antigos</string>
     <string name="include_event_types">Incluir tipos de eventos</string>
     <string name="filename_without_ics">Nome do ficheiro (sem .ics)</string>
-    <string name="override_event_types">Substituir tipo de eventos no ficheiro</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Localização</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Exportă și evenimentele din trecut</string>
     <string name="include_event_types">Include tipurile de eveniment</string>
     <string name="filename_without_ics">Numefisier (fără .ics)</string>
-    <string name="override_event_types">Înlocuiți tipurile de eveniment din fișier</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Locație</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Экспортировать прошедшие события</string>
     <string name="include_event_types">Включать типы событий</string>
     <string name="filename_without_ics">Имя файла (без .ics)</string>
-    <string name="override_event_types">Переопределять типы событий в файле</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Место</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Exportovať aj minulé udalosti</string>
     <string name="include_event_types">Zahrnúť typy udalostí</string>
     <string name="filename_without_ics">Názov súboru (bez .ics)</string>
-    <string name="override_event_types">Nahradiť typy udalostí v súbore</string>
+    <string name="ignore_event_types">Ignorovať typy udalostí v súbore, stále použiť predvolený</string>
 
     <!-- Event details -->
     <string name="location">Miesto</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Exportera även tidigare händelser</string>
     <string name="include_event_types">Inkludera händelsetyper</string>
     <string name="filename_without_ics">Filnamn (utan .ics)</string>
-    <string name="override_event_types">Ignorera händelsetyper i filen</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Plats</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Geçmiş etkinlikleri de dışa aktar</string>
     <string name="include_event_types">Etkinlik türlerini ekle</string>
     <string name="filename_without_ics">Dosya adı (.ics olmadan)</string>
-    <string name="override_event_types">Dosyadaki etkinlik türlerini geçersiz kıl</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Konum</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Експортувати також події, що відбулися</string>
     <string name="include_event_types">Приєднати тип подій</string>
     <string name="filename_without_ics">Назва файлу (без .ics)</string>
-    <string name="override_event_types">Змінити тип подій у файлі</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Місце</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -125,8 +125,10 @@
     <string name="default_event_type">预设活动类型</string>
     <string name="export_past_events_too">也导出过去的活动</string>
     <string name="include_event_types">包含活动类型</string>
-    <string name="filename_without_ics">文件名称 (不含.ics)</string>
+    <string name="filename_without_ics">文件名称 (不含.ics)</string><![CDATA[
-    <string name="override_event_types">覆盖文件内的活动类型</string>
+    
+    ]]>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">地点</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">也匯出過去的活動</string>
     <string name="include_event_types">包含活動類型</string>
     <string name="filename_without_ics">檔案名稱 (不含.ics)</string>
-    <string name="override_event_types">覆寫檔案內的活動類型</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">地點</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">也匯出過去的活動</string>
     <string name="include_event_types">包含活動類型</string>
     <string name="filename_without_ics">檔案名稱 (不含 .ics )</string>
-    <string name="override_event_types">覆寫檔案內的活動類型</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">地點</string>

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

@@ -126,7 +126,7 @@
     <string name="export_past_events_too">Export past events too</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
-    <string name="override_event_types">Override event types in the file</string>
+    <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
 
     <!-- Event details -->
     <string name="location">Location</string>