Skip to content

Commit 45a14d7

Browse files
committed
Merge branch 'tagfiltericon' into release/13.1.0
2 parents 97f004a + c5322b0 commit 45a14d7

35 files changed

+215
-52
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ npm-debug.log.*
3434
/flashpoint.sqlite
3535
/extensions/test
3636
/src/shared/version.ts
37-
Data/flashpoint.sqlite
37+
Data
3838

3939
# Jest related files
4040
/.coveralls.yml

lang/cs-CZ.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,8 @@
380380
"openGameDataBrowser": "Otevřít prohlížeč herních dat",
381381
"notArchived": "Nearchivováno",
382382
"archived": "Archivováno",
383-
"playOnline": "Hrát online"
383+
"playOnline": "Hrát online",
384+
"tagFilterIcon": ""
384385
},
385386
"tags": {
386387
"name": "Název",
@@ -403,7 +404,8 @@
403404
"makeAliasWhenMerged": "Udělat z tohoto alias Štítku?",
404405
"deleteTag": "Odstranit Štítek",
405406
"deleteTagCategory": "Odstranit Kategorii Štítků",
406-
"locked": "Uzamčeno během zpracovávání..."
407+
"locked": "Uzamčeno během zpracovávání...",
408+
"filterIcon": ""
407409
},
408410
"curate": {
409411
"noCurationSelected": "Není vybrána žádná kurace",
@@ -518,6 +520,7 @@
518520
"misc": {
519521
"noBlankFound": "Žádn(ý/á) {0} nenalezen(a)",
520522
"addBlank": "Přidat {0}",
523+
"removeBlank": "",
521524
"deleteAllBlankImages": "Odstranit VŠECHNY {0} k této hře",
522525
"yes": "Ano",
523526
"no": "Ne",

lang/de-DE.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,8 @@
380380
"openGameDataBrowser": "Spieldaten-Browser öffnen",
381381
"notArchived": "Nicht archiviert",
382382
"archived": "Archiviert",
383-
"playOnline": "Online spielen"
383+
"playOnline": "Online spielen",
384+
"tagFilterIcon": ""
384385
},
385386
"tags": {
386387
"name": "Name",
@@ -403,7 +404,8 @@
403404
"makeAliasWhenMerged": "Dies zum Alias des Tags machen?",
404405
"deleteTag": "Tag löschen",
405406
"deleteTagCategory": "Tag-Kategorie löschen",
406-
"locked": "Während der Verarbeitung gesperrt..."
407+
"locked": "Während der Verarbeitung gesperrt...",
408+
"filterIcon": ""
407409
},
408410
"curate": {
409411
"noCurationSelected": "Keine Kuration ausgewählt",
@@ -518,6 +520,7 @@
518520
"misc": {
519521
"noBlankFound": "Kein {0} gefunden",
520522
"addBlank": "{0} hinzufügen",
523+
"removeBlank": "",
521524
"deleteAllBlankImages": "Lösche ALLE {0} Bilder für dieses Spiel",
522525
"yes": "Ja",
523526
"no": "Nein",

lang/en.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,8 @@
398398
"showFilters": "Show Filters",
399399
"notArchived": "Not Archived",
400400
"archived": "Archived",
401-
"playOnline": "Play Online"
401+
"playOnline": "Play Online",
402+
"tagFilterIcon": "Tag Filter Icon"
402403
},
403404
"tags": {
404405
"name": "Name",
@@ -421,7 +422,8 @@
421422
"makeAliasWhenMerged": "Make this an alias of the tag?",
422423
"deleteTag": "Delete Tag",
423424
"deleteTagCategory": "Delete Tag Category",
424-
"locked": "Locked while processing..."
425+
"locked": "Locked while processing...",
426+
"filterIcon": "Icon Thumbnail"
425427
},
426428
"curate": {
427429
"noCurationSelected": "No Curation Selected",
@@ -538,6 +540,7 @@
538540
"misc": {
539541
"noBlankFound": "No {0} Found",
540542
"addBlank": "Add {0}",
543+
"removeBlank": "Remove {0}",
541544
"deleteAllBlankImages": "Delete ALL {0} images for this game",
542545
"yes": "Yes",
543546
"no": "No",

lang/es-ES.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,8 @@
380380
"openGameDataBrowser": "Open Game Data Browser",
381381
"notArchived": "Not Archived",
382382
"archived": "Archived",
383-
"playOnline": "Play Online"
383+
"playOnline": "Play Online",
384+
"tagFilterIcon": ""
384385
},
385386
"tags": {
386387
"name": "Nombre",
@@ -403,7 +404,8 @@
403404
"makeAliasWhenMerged": "¿Hacer esto una alias de la etiqueta?",
404405
"deleteTag": "Eliminar etiqueta",
405406
"deleteTagCategory": "Eliminar categoría de etiqueta",
406-
"locked": "Bloqueado mientras se procesa..."
407+
"locked": "Bloqueado mientras se procesa...",
408+
"filterIcon": ""
407409
},
408410
"curate": {
409411
"noCurationSelected": "Ninguna curación seleccionada",
@@ -518,6 +520,7 @@
518520
"misc": {
519521
"noBlankFound": "Ninguna {0} Encontrada",
520522
"addBlank": "Añadir {0}",
523+
"removeBlank": "Remove {0}",
521524
"deleteAllBlankImages": "Borrar todas las {0} imágenes para este juego",
522525
"yes": "",
523526
"no": "No \t",

lang/et-EE.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,8 @@
380380
"openGameDataBrowser": "Ava Mängu Andmete Brauser",
381381
"notArchived": "Pole Arhiveeritud",
382382
"archived": "Arhiveeritud",
383-
"playOnline": "Mängi võrgus"
383+
"playOnline": "Mängi võrgus",
384+
"tagFilterIcon": ""
384385
},
385386
"tags": {
386387
"name": "Nimi",
@@ -403,7 +404,8 @@
403404
"makeAliasWhenMerged": "Kas muuta see uueks märksõna alternatiiviks?",
404405
"deleteTag": "Kustuta Märksõna",
405406
"deleteTagCategory": "Kustuta Märksõna Kategooria",
406-
"locked": "Lukus protsessi ajal..."
407+
"locked": "Lukus protsessi ajal...",
408+
"filterIcon": ""
407409
},
408410
"curate": {
409411
"noCurationSelected": "Ühtegi Kureeringut Pole Valitud",
@@ -518,6 +520,7 @@
518520
"misc": {
519521
"noBlankFound": "{0} ei Leitud",
520522
"addBlank": "Lisa {0}",
523+
"removeBlank": "",
521524
"deleteAllBlankImages": "Kustuta KÕIK {0} pildid sellel mängul",
522525
"yes": "Jah",
523526
"no": "Ei",

lang/fi-FI.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,8 @@
380380
"openGameDataBrowser": "Avaa Pelitietojen Selain",
381381
"notArchived": "Ei Arkistoitu",
382382
"archived": "Arkistoitu",
383-
"playOnline": "Pelaa verkossa"
383+
"playOnline": "Pelaa verkossa",
384+
"tagFilterIcon": ""
384385
},
385386
"tags": {
386387
"name": "Nimi",
@@ -403,7 +404,8 @@
403404
"makeAliasWhenMerged": "Tee tästä tunnisteen alias?",
404405
"deleteTag": "Poista tunniste",
405406
"deleteTagCategory": "Poista tunnistekategoria",
406-
"locked": "Lukittu käsittelyn aikana..."
407+
"locked": "Lukittu käsittelyn aikana...",
408+
"filterIcon": ""
407409
},
408410
"curate": {
409411
"noCurationSelected": "Ei Kuraatiota Valittu",
@@ -518,6 +520,7 @@
518520
"misc": {
519521
"noBlankFound": "{0} ei löydy",
520522
"addBlank": "Lisää {0}",
523+
"removeBlank": "",
521524
"deleteAllBlankImages": "Tuhoa kaikki {0} kuvaa tästä pelistä",
522525
"yes": "Kyllä",
523526
"no": "Ei",

lang/fr-FR.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,8 @@
380380
"openGameDataBrowser": "Ouvrir le navigateur de données du jeu",
381381
"notArchived": "Not Archived",
382382
"archived": "Archived",
383-
"playOnline": "Play Online"
383+
"playOnline": "Play Online",
384+
"tagFilterIcon": ""
384385
},
385386
"tags": {
386387
"name": "Nom",
@@ -403,7 +404,8 @@
403404
"makeAliasWhenMerged": "Faire un alias de ce tag ?",
404405
"deleteTag": "Supprimer le tag",
405406
"deleteTagCategory": "Supprimer la catégorie tag",
406-
"locked": "Protégé pendant le traitement..."
407+
"locked": "Protégé pendant le traitement...",
408+
"filterIcon": ""
407409
},
408410
"curate": {
409411
"noCurationSelected": "Aucune conservation sélectionnée",
@@ -518,6 +520,7 @@
518520
"misc": {
519521
"noBlankFound": "Aucune {0} trouvée",
520522
"addBlank": "Ajouter une {0}",
523+
"removeBlank": "",
521524
"deleteAllBlankImages": "Supprimer TOUTES les {0} pour ce jeu",
522525
"yes": "Oui",
523526
"no": "Non",

lang/hu-HU.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,8 @@
380380
"openGameDataBrowser": "Játékadat Böngésző Megnyitása",
381381
"notArchived": "Not Archived",
382382
"archived": "Archived",
383-
"playOnline": "Play Online"
383+
"playOnline": "Play Online",
384+
"tagFilterIcon": ""
384385
},
385386
"tags": {
386387
"name": "Név",
@@ -403,7 +404,8 @@
403404
"makeAliasWhenMerged": "Kíván nevet készíteni a címkéből?",
404405
"deleteTag": "Címke törlése",
405406
"deleteTagCategory": "Címke kategória törlése",
406-
"locked": "Zárolva a feldolgozás alatt.."
407+
"locked": "Zárolva a feldolgozás alatt..",
408+
"filterIcon": ""
407409
},
408410
"curate": {
409411
"noCurationSelected": "Nincsen kiválasztott Kurátor",
@@ -518,6 +520,7 @@
518520
"misc": {
519521
"noBlankFound": "Nem Található",
520522
"addBlank": "Hozzáad",
523+
"removeBlank": "",
521524
"deleteAllBlankImages": "Összes kép törlése ehhez a játékhoz",
522525
"yes": "Igen",
523526
"no": "Nem",

lang/it-IT.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,8 @@
380380
"openGameDataBrowser": "Apri il browser dei dati di gioco",
381381
"notArchived": "Non Archiviato",
382382
"archived": "Archiviato",
383-
"playOnline": "Gioca in Rete"
383+
"playOnline": "Gioca in Rete",
384+
"tagFilterIcon": ""
384385
},
385386
"tags": {
386387
"name": "Nome",
@@ -403,7 +404,8 @@
403404
"makeAliasWhenMerged": "Imposta come alias dell'etichetta?",
404405
"deleteTag": "Elimina l'Etichetta",
405406
"deleteTagCategory": "Elimina la Categoria Etichette",
406-
"locked": "Bloccato durante l'elaborazione..."
407+
"locked": "Bloccato durante l'elaborazione...",
408+
"filterIcon": ""
407409
},
408410
"curate": {
409411
"noCurationSelected": "Nessun Contenuto Curato Selezionato",
@@ -518,6 +520,7 @@
518520
"misc": {
519521
"noBlankFound": "Nessuna {0} Trovata",
520522
"addBlank": "Aggiungi {0}",
523+
"removeBlank": "",
521524
"deleteAllBlankImages": "Elimina TUTTE le immagini {0} per questo gioco",
522525
"yes": "",
523526
"no": "No",

0 commit comments

Comments
 (0)