Some cleanups prompted by linter.

Wilm0r · Dec 11, 2023 · 5dbb0fd · 5dbb0fd
1 parent d660d65
commit 5dbb0fd
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 61 deletions.
diff --git a/app/src/main/res/drawable/qr_scan.png b/app/src/main/res/drawable/qr_scan.png
diff --git a/app/src/main/res/values-cs/arrays.xml b/app/src/main/res/values-cs/arrays.xml
@@ -5,10 +5,4 @@
 		<item>3 řádky</item>
 		<item>2 řádky</item>
 	</string-array>
-	<string-array name="import_selections_options">
-		<item>Zachovat stávající připomínky</item>
-		<item>Zachovat výmazy</item>
-		<item>Importovat nové připomínky</item>
-		<item>Importovat výmazy</item>
-	</string-array>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -10,10 +10,7 @@
 	<string name="default_view">Výchozí pohled</string>
 	<string name="font_size">Velikost písma blokového programu</string>
 
-	<string name="block_schedule_style">Styl</string>
 	<string name="block_schedule">Blokový program</string>
-	<string name="block_schedule_element_size_sub">Velikost bloku v blokovém programu</string>
-	<string name="block_schedule_element_size">Velikost bloku</string>
 
 	<string name="reminder">Připomínky eventů</string>
 	<string name="reminder_enabled_sub_on">Zobrazit připomínku před začátkem eventu</string>
@@ -40,10 +37,7 @@
 	<string name="loading_image">Načítání obrázků...</string>
 	<string name="loading_error">Chyba při načítání</string>
 	<string name="no_viewer_error">Není nainstalován prohlížeč pro tento typ souboru</string>
-	<string name="export_selections">Exportovat výběr</string>
 	<string name="home_shortcut">Přidat odkaz na domovskou obrazovku</string>
-	<string name="import_selections">Importovat výběr</string>
-	<string name="no_selections">Žádný výběr k exportování</string>
 	<string name="schedule_empty">Program se jeví jako prázdný</string>
 	<string name="format_unknown">Formát souboru nebyl rozpoznám</string>
 	<string name="no_json_data">Nepovedlo se načíst JSON data z URL</string>
@@ -99,7 +93,6 @@
 	<!--  Widget -->
 	<string name="widg_longdate">EEEE d MMMM \'v\' HH:mm</string>
 	<string name="widg_shortdate">EEEE \'v\' HH:mm</string>
-	<string name="widg_in_room">v</string>
 	<string name="widg_soon">Již brzy</string>
 	<string name="widg_no_upcoming">Žádný nadcházející event :-(</string>
 	<string name="reminder_enabled_sub_off">Připomínky vypnuty</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -10,10 +10,7 @@
 	<string name="default_view">Standardansicht</string>
 	<string name="font_size">Schriftgröße bei der Programmübersicht</string>
 
-	<string name="block_schedule_style">Stil</string>
 	<string name="block_schedule">Programmübersicht</string>
-	<string name="block_schedule_element_size_sub">Größe der Zeitabschnitte</string>
-	<string name="block_schedule_element_size">Abschnittsgröße</string>
 
 	<string name="reminder">Veranstaltungserinnerungen</string>
 	<string name="reminder_enabled_sub_on">An markierte Veranstaltungen erinnern</string>
@@ -40,10 +37,7 @@
 	<string name="loading_image">Lade Bild...</string>
 	<string name="loading_error">Fehler beim Laden</string>
 	<string name="no_viewer_error">Kein Anzeigeprogramm für den Dateityp installiert</string>
-	<string name="export_selections">Ausgewählte exportieren</string>
 	<string name="home_shortcut">Verknüpfung auf dem Startbildschirm</string>
-	<string name="import_selections">Ausgewählte importieren</string>
-	<string name="no_selections">Nichts ausgewählt zum Exportieren</string>
 	<string name="schedule_empty">Das Programm scheint leer zu sein</string>
 	<string name="format_unknown">Dateiformat nicht erkannt</string>
 	<string name="no_network">Keine Netzwerkverbindung verfügbar</string>
@@ -91,6 +85,5 @@
 	<!--  Widget -->
 	<string name="widg_longdate">EEEE d MMMM \'um\' HH:mm</string>
 	<string name="widg_shortdate">EEEE \'um\' HH:mm</string>
-	<string name="widg_in_room">in</string>
 	<string name="widg_soon">Demnächst</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -10,10 +10,7 @@
 	<string name="default_view">Vue par défaut</string>
 	<string name="font_size">Taille de police pour la grille</string>
 
-	<string name="block_schedule_style">Style</string>
 	<string name="block_schedule">Grille</string>
-	<string name="block_schedule_element_size_sub">Taille d\'un bloc de la grille</string>
-	<string name="block_schedule_element_size">Taille de bloc</string>
 
 	<string name="reminder">Rappel d\'évènements</string>
 	<string name="reminder_enabled_sub_on">Me rappeler les évènements sélectionnés</string>
@@ -40,10 +37,7 @@
 	<string name="loading_image">Chargement des images...</string>
 	<string name="loading_error">Erreur de chargement</string>
 	<string name="no_viewer_error">Aucune application ne prend en charge ce type de fichier</string>
-	<string name="export_selections">Exporter les sélections</string>
 	<string name="home_shortcut">Raccourci sur l\'accueil</string>
-	<string name="import_selections">Importer les sélections</string>
-	<string name="no_selections">Aucune sélection à exporter</string>
 	<string name="schedule_empty">Le programme semble vide</string>
 	<string name="format_unknown">Format de fichier non reconnu</string>
 	<string name="no_network">Aucune connexion réseau</string>
@@ -91,7 +85,6 @@
 	<!--  Widget -->
 	<string name="widg_longdate">EEEE d MMMM \'à\' HH:mm</string>
 	<string name="widg_shortdate">EEEE \'à\' HH:mm</string>
-	<string name="widg_in_room">dans</string>
 	<string name="widg_soon">Bientôt</string>
 	<string name="widg_no_upcoming">Aucun évènement à venir :-(</string>
 </resources>
diff --git a/app/src/main/res/values-it/arrays.xml b/app/src/main/res/values-it/arrays.xml
@@ -5,10 +5,4 @@
 		<item>3 righe</item>
 		<item>2 righe</item>
 	</string-array>
-	<string-array name="import_selections_options">
-	    <item>Mantieni i promemoria esistenti</item>
-		<item>Mantieni elementi cancellati</item>
-		<item>Importa nuovi promemoria</item>
-		<item>Impora elementi cancellati</item>
-	</string-array>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -10,10 +10,7 @@
 	<string name="default_view">Vista predefinita</string>
 	<string name="font_size">Dimensione font programma a blocchi</string>
 
-	<string name="block_schedule_style">Stile</string>
 	<string name="block_schedule">Programma a blocchi</string>
-	<string name="block_schedule_element_size_sub">Dimensione del blocco nel programma a blocchi</string>
-	<string name="block_schedule_element_size">Dimensione blocco</string>
 
 	<string name="reminder">Promemoria eventi</string>
 	<string name="reminder_enabled_sub_on">Ricordami gli eventi segnati</string>
@@ -39,10 +36,7 @@
 	<string name="loading_image">Caricamento immagine...</string>
 	<string name="loading_error">Errore di caricamento</string>
 	<string name="no_viewer_error">Nessun programma installato per visualizzare il file</string>
-	<string name="export_selections">Esporta selezioni</string>
 	<string name="home_shortcut">Crea shortcut</string>
-	<string name="import_selections">Importa selezioni</string>
-	<string name="no_selections">Nessuna selezione da esportare</string>
 	<string name="schedule_empty">Il programma sembra essere vuoto</string>
 	<string name="format_unknown">Formato del file non riconosciuto</string>
 	<string name="no_json_data">Estrazione dati JSON da URL fallita</string>
@@ -98,7 +92,6 @@
 	<!--  Widget -->
 	<string name="widg_longdate">EEEE d MMMM \'alle\' HH:mm</string>
 	<string name="widg_shortdate">EEEE \'alle\' HH:mm</string>
-	<string name="widg_in_room">in</string>
 	<string name="widg_soon">Prossimamente</string>
 	<string name="widg_no_upcoming">Nessun evento in vista :-(</string>
 	<string name="reminder_enabled_sub_off">Non ricordarmi gli eventi segnati</string>

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -10,10 +10,7 @@
 	<string name="default_view">Standaard weergave</string>
 	<string name="font_size">Lettergrootte blokkenschema</string>
 
-	<string name="block_schedule_style">Stijl</string>
 	<string name="block_schedule">Blokkenschema</string>
-	<string name="block_schedule_element_size_sub">Blok- en lettergrootte</string>
-	<string name="block_schedule_element_size">Blokgrootte</string>
 
 	<string name="reminder">Herinneringen</string>
 	<string name="reminder_enabled">Notificaties</string>
@@ -41,9 +38,6 @@
 	<string name="loading_error">Laadfout</string>
 	<string name="no_viewer_error">Geen lezer geïnstalleerd voor bestandstype</string>
 	<string name="open_link_with_browser_instead">In browser openen</string>
-	<string name="export_selections">Selecties exporteren</string>
-	<string name="import_selections">Selecties importeren</string>
-	<string name="no_selections">Geen exporteerbare data</string>
 	<string name="schedule_empty">Programma lijkt (nog) leeg</string>
 	<string name="format_unknown">Onbekend bestandsformaat</string>
 	<string name="no_network">Geen netwerkverbinding beschikbaar</string>
@@ -93,7 +87,6 @@
 	<!--  Widget -->
 	<string name="widg_longdate">EEEE d MMMM \'om\' HH:mm</string>
 	<string name="widg_shortdate">EEEE \'om\' HH:mm</string>
-	<string name="widg_in_room">in</string>
 	<string name="widg_soon">Binnenkort</string>
 	<string name="widg_no_upcoming">Niks op komst :-(</string>
 	<string name="home_shortcut">Aan thuisscherm toevoegen</string>

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -5,12 +5,6 @@
 		<item>3 lines</item>
 		<item>2 lines</item>
 	</string-array>
-	<string-array name="import_selections_options">
-		<item>Preserve existing reminders</item>
-		<item>Preserve deletions</item>
-		<item>Import new reminders</item>
-		<item>Import deletions</item>
-	</string-array>
 	<!-- Only the two above need translation. In the future, I should probably just put string refs in this file and not have per-language arrays at all. -->
 	<string-array name="default_view">
 		<item>@string/block_schedule</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -10,10 +10,7 @@
 	<string name="default_view">Default view</string>
 	<string name="font_size">Block schedule font size</string>
 
-	<string name="block_schedule_style">Style</string>
 	<string name="block_schedule">Block schedule</string>
-	<string name="block_schedule_element_size_sub">Size of a block schedule block</string>
-	<string name="block_schedule_element_size">Block size</string>
 
 	<string name="reminder">Event reminders</string>
 	<string name="reminder_enabled_sub_on">Notifications before my events start</string>
@@ -41,10 +38,7 @@
 	<string name="loading_error">Load error</string>
 	<string name="no_viewer_error">No viewer installed for filetype</string>
 	<string name="open_link_with_browser_instead">Open in browser</string>
-	<string name="export_selections">Export selections</string>
 	<string name="home_shortcut">Home shortcut</string>
-	<string name="import_selections">Import selections</string>
-	<string name="no_selections">No selections to be exported</string>
 	<string name="schedule_empty">Schedule appears to be empty</string>
 	<string name="format_unknown">File format not recognised</string>
 	<string name="no_json_data">Could not extract JSON data from URL</string>
@@ -101,7 +95,6 @@
 	<!--  Widget -->
 	<string name="widg_longdate">EEEE d MMMM \'at\' HH:mm</string>
 	<string name="widg_shortdate">EEEE \'at\' HH:mm</string>
-	<string name="widg_in_room">in</string>
 	<string name="widg_soon">Coming soon</string>
 	<string name="widg_no_upcoming">No upcoming events :-(</string>
 	<string name="reminder_enabled_sub_off">Notifications suppressed</string>

diff --git a/tools/menu-schema.json b/tools/menu-schema.json
@@ -101,7 +101,7 @@
               "2016-08-21"
             ]
           },
-          "title": {
+          "timezone": {
             "$id": "/properties/schedules/items/properties/timezone",
             "type": "string",
             "title": "POSIX timezone identifier where the event is held",