From d71d10a97f60934338ca5c10fe12d23eacfd9992 Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Mon, 24 May 2021 15:02:25 +0100 Subject: [PATCH] Improved translations for CollectorNumber in Italian and Spanish, and while at it... ...I got rid of duplication for the lblSet col, while also improving translations. In particular, the "lblSetEdition" column was translated as the "Mistery column" (for some reason :D), whereas a second lblSet2 was instead defined and used, namely "the label tooltip for the Set Columndef". On this note, this col was also mistranslated in ES, IT, DE - those are the language I could handle so far. In fact "Set" was intended (and so translated) as "to set" instead as for "Expansion/Edition". Corrected accordingly! :) --- .../deckeditor/controllers/CEditorConstructed.java | 8 ++++---- forge-gui/res/languages/de-DE.properties | 5 ++--- forge-gui/res/languages/en-US.properties | 5 ++--- forge-gui/res/languages/es-ES.properties | 5 ++--- forge-gui/res/languages/it-IT.properties | 7 +++---- forge-gui/src/main/java/forge/itemmanager/ColumnDef.java | 2 +- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java index 34391e0d5de..ff262bc676d 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java @@ -314,18 +314,18 @@ public final class CEditorConstructed extends CDeckEditor { if (gameType == GameType.Oathbreaker) { PaperCard pc = cmb.getItemManager().getSelectedItem(); if (pc != null && pc.getRules().canBeSignatureSpell()) { - cmb.addMoveItems(localizer.getMessage("lblSet2"), localizer.getMessage("lblassignaturespell")); + cmb.addMoveItems(localizer.getMessage("lblSetEdition"), localizer.getMessage("lblassignaturespell")); } else { - cmb.addMoveItems(localizer.getMessage("lblSet2"), localizer.getMessage("lblasoathbreaker")); + cmb.addMoveItems(localizer.getMessage("lblSetEdition"), localizer.getMessage("lblasoathbreaker")); } } else { - cmb.addMoveItems(localizer.getMessage("lblSet2"), localizer.getMessage("lblascommander")); + cmb.addMoveItems(localizer.getMessage("lblSetEdition"), localizer.getMessage("lblascommander")); } break; case Avatar: - cmb.addMoveItems(localizer.getMessage("lblSet2"), localizer.getMessage("lblasavatar")); + cmb.addMoveItems(localizer.getMessage("lblSetEdition"), localizer.getMessage("lblasavatar")); break; case Schemes: cmb.addMoveItems(localizer.getMessage("lblAdd"), localizer.getMessage("lbltoschemedeck")); diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index 1e1617327cc..91273950142 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -874,8 +874,7 @@ lblSaveLayout=Sichere Layout #GroupDef.java lblColor=Farbe lblColorIdentity=Farbidentität -lblSet=Set -lblSet2=Set +lblSet=Auflage #Set word has different meanings in other languages lblDefault=Standard lblType=Typ @@ -932,7 +931,7 @@ lblCost=Kosten ttCost=Kosten lblDecks=Decks lblDeleteEdit=Löschen/Bearbeiten -lblSetEdition=Mysteriöse Spalte. Wir wissen nicht, wozu sie gut ist. +lblSetEdition=Auflage ttFavorite=Favorit lblFolder=Ordner ttFormats=In welchem Format das Deck legal ist diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index 746e2ce0f07..1f3a4af6e07 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -875,7 +875,6 @@ lblSaveLayout=Save Layout lblColor=Color lblColorIdentity=Color Identity lblSet=Set -lblSet2=Set #Set word has different meanings in other languages lblDefault=Default lblType=Type @@ -926,13 +925,13 @@ lblAIStatus=AI Status lblCMC=Mana Value ttCMC=Mana Value lblCN=CN -ttCN=Collector Number Order +ttCN=Collector Number ttColor=Color lblCost=Cost ttCost=Cost lblDecks=Decks lblDeleteEdit=Delete/Edit -lblSetEdition=Mystery column. We don''t know what it does or if that''s what it should do. +lblSetEdition=Set ttFavorite=Favorite lblFolder=Folder ttFormats=Formats deck is legal in diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index 2313f34e8e4..7d24f3feda1 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -875,7 +875,6 @@ lblSaveLayout=Guardar disposición de elementos lblColor=Color lblColorIdentity=Identidad de color lblSet=Edición -lblSet2=Establecer #Set word has different meanings in other languages lblDefault=por defecto lblType=Tipo @@ -926,13 +925,13 @@ lblAIStatus=Estado de la IA lblCMC=CMC ttCMC=Coste de maná convertido lblCN=CN -ttCN=Orden de número de coleccionista +ttCN=Número de coleccionista ttColor=Color lblCost=Coste ttCost=Coste lblDecks=Mazos lblDeleteEdit=Borrar/Editar -lblSetEdition=Columna de misterio. No sabemos lo que hace o si eso es lo que debería hacer. +lblSetEdition=Edición ttFavorite=Favorito lblFolder=Carpeta ttFormats=Formatos de mazo en los que es legal diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index 76ba702ba34..bb1852373fa 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -874,8 +874,7 @@ lblSaveLayout=Salva layout #GroupDef.java lblColor=Colore lblColorIdentity=Identità del colore -lblSet=Impostato -lblSet2=Impostato +lblSet=Espansione #Set word has different meanings in other languages lblDefault=Predefinito lblType=genere @@ -926,13 +925,13 @@ lblAIStatus=Stato AI lblCMC=CMC ttCMC=CMC lblCN=CN -ttCN=Ordine numero collezionisti +ttCN=Indice Carta nell''Espansione ttColor=Colore lblCost=Costo ttCost=Costo lblDecks=Decks lblDeleteEdit=Cancella / Modifica -lblSetEdition=Colonna misteriosa. Non sappiamo cosa fa o se è quello che dovrebbe fare. +lblSetEdition=Espansione ttFavorite=Preferito lblFolder=Cartella ttFormats=Il mazzo dei formati è legale diff --git a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java index 2ad4003f9de..3484a8800b0 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java +++ b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java @@ -451,7 +451,7 @@ public enum ColumnDef { /** * The deck edition column, a mystery to us all. */ - DECK_EDITION("lblSet", "lblSetEdition", 38, true, SortState.DESC, + DECK_EDITION("lblSet", "lblSet", 38, true, SortState.DESC, new Function, Comparable>() { @Override public Comparable apply(final Entry from) {