From a6db35d070d8009abbee480c564e9e6e0ce03882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noelia=20Ruiz=20Mart=C3=ADnez?= Date: Mon, 10 May 2021 15:42:32 +0200 Subject: [PATCH] Prepare for version 2.0.4 with minor dictionary improvements --- CHANGELOG.md | 4 ++++ plover_spanish_mqd/dictionaries/initial.json | 1 - plover_spanish_mqd/dictionaries/user_es.json | 24 ++++++++++++++++---- plover_spanish_mqd/spanish_mqd_single.py | 4 ++-- setup.cfg | 2 +- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2054ca6..70b11c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/nvdaes/plover_spanish_mqd) - Minor improvements in dictionary contents +## [2.0.4](https://github.com/nvdaes/plover_spanish_mqd/releases/tag/v2.0.4) - 2021-05-10 +### Changed +- Minor improvements in dictionary contents + ## [2.0.3](https://github.com/nvdaes/plover_spanish_mqd/releases/tag/v2.0.3) - 2021-04-30 ### Changed diff --git a/plover_spanish_mqd/dictionaries/initial.json b/plover_spanish_mqd/dictionaries/initial.json index 46092e9..17fcf66 100644 --- a/plover_spanish_mqd/dictionaries/initial.json +++ b/plover_spanish_mqd/dictionaries/initial.json @@ -179,7 +179,6 @@ "NVRe": "{:initial:veloces | rre}", "PAce*": "{:initial:APACE | pacé}", "Pca": "{:initial:poca | pica}", - "PCAe*": "{:initial:Consejo General de la Abogacía Española | gaé}", "PCca": "{:initial:genética | gica}", "PCceo": "{:initial:genéticos | gicos}", "PCcia": "{:initial:genéticas | gicas}", diff --git a/plover_spanish_mqd/dictionaries/user_es.json b/plover_spanish_mqd/dictionaries/user_es.json index 14d9d06..b83a70e 100644 --- a/plover_spanish_mqd/dictionaries/user_es.json +++ b/plover_spanish_mqd/dictionaries/user_es.json @@ -142,6 +142,7 @@ "/CEnra*": "Celaá", "CEnria*": "Cecilia", "/CEOcspro*": "Coello", + "CEpa*": "Cecilia Pastor", "/CEsno*": "Cerezo", "CEsra*": "César", "/CEte*": "Celeste", @@ -188,7 +189,7 @@ "CNRAcsao*": "Marcus", "CNRAcsn*": "María José", "CNRAcsnra*": "Madrigal", - "/CNRAcso*": "Marika Gogoladze", + "/CNRAcso*": "Marcos", "CNRAcspa*": "Marika", "CNRAcspi*": "Malik", "/CNRAcspri*": "Martinelli", @@ -298,6 +299,7 @@ "CNROni*": "Moschini", "/CNROno*": "Moreno", "CNROnra*": "Morán", + "/CNROnre*": "Moliner", "/CNROra*": "Mora", "/CNROse*": "Moisés", "/CNROso*": "Moscoso", @@ -317,6 +319,7 @@ "CNRra*": "Maquieira", "CNRreo*": "Medeiros", "CNRria*": "María", + "CNRsnr*": "Marta Marcos", "CNRsnra*": "Malasmadres", "CNRt*": "Monika Tkacz", "CNRtni*": "Mikel Díez", @@ -480,6 +483,7 @@ "Esne*": "Estévez", "Esni*": "Estíbaliz", "Esnra*": "Eva María", + "Esnre*": "Episteme", "Estnia*": "Echevarría", "Estre*": "Ester", "Etno*": "Eduardo", @@ -751,6 +755,7 @@ "/PCAcspre*": "Ganzenmüller", "PCAcstpra*": "Gallart", "PCActa*": "Galván", + "/PCActnpre*": "Gambler", "/PCActnprie*": "Gabriel", "/PCActpo*": "Garrobo", "PCAna*": "Agustina", @@ -814,7 +819,7 @@ "PCnri*": "Gil", "/PCNROria*": "Gloria", "PCNROsne*": "Gogoladze", - "PCNRsr*": "Encuentro de Intercambio y Seguimiento", + "PCNRsr*": "jornada de género y adicciones", "PCNsr*": "COMPENSA", "PCNVRcnr*": "Promoción Cultural", "PCOcspa*": "Gorka", @@ -1166,6 +1171,7 @@ "PEpa*": "Pepa", "/PEpe*": "Pepe", "/PEra*": "Pedreira", + "/PEre*": "Pere", "/PEro*": "Peiró", "PEsa*": "Pedrosa", "PEsna*": "Pedraza", @@ -1243,6 +1249,7 @@ "/POsno*": "Pozo", "POtna*": "Pousada", "POtnia*": "Posadas", + "POtnp*": "Pons", "/POtre*": "Porter", "Ppe*": "Pablo Pérez", "/PRAcspro*": "Pradillo", @@ -1261,6 +1268,7 @@ "Psna*": "Paz", "Psnp*": "Pfizer", "Psnpr*": "iPhone", + "Psnr*": "Patricia Martínez", "Pso*": "Puerta del Sol", "PTNActnpro*": "de Pablo ", "PTNAEOnra*": "de Paula", @@ -1326,6 +1334,7 @@ "/PTVAtno*": "Barrondo", "/PTVAto*": "Basurto", "PTVcr*": "Plan de Recuperación", + "PTVcrao*": "Plan Nacional sobre Drogas", "PTVcsao": "Bulgaria", "PTVcsp": "Bizkaia", "PTVcspr": "bullying", @@ -1427,6 +1436,7 @@ "PTVsnrao": "Banco Mundial", "PTVsnri": "IBM", "PTVsnri*": "IBM Spain", + "PTVsr*": "Departamento de Psicología Básica", "PTVtnao*": "Bildu", "PTVtne": "Broker-dealer", "PTVtnpr*": "EH Bildu", @@ -1489,6 +1499,7 @@ "/REro*": "Requero", "REsne*": "Regúlez", "/REso*": "Reinoso", + "/REtno*": "Redondo", "REtnpe*": "Renfe", "/REtnra*": "Revuelta", "/REtnre*": "REDER", @@ -1529,7 +1540,7 @@ "ROnria*": "Rosalía", "/ROo*": "Rolando", "/ROra*": "Rovira", - "/ROro*": "Romero", + "/ROro*": "Oró", "ROsa*": "Rosa", "/ROseo*": "Ros", "ROsia*": "Rosas ", @@ -1546,6 +1557,7 @@ "Rs*": "Red.es", "Rteo*": "Regatos", "Rtna*": "Rafael de Asís", + "Rtnrao*": "Ordenación del Juego", "Rtnro*": "Rafael de Lorenzo", "Rtr*": "Retiro", "s*": "Suiza", @@ -1717,6 +1729,7 @@ "SP*#": "2021", "SPActnpro*": "San Pablo", "SPCAte*": "Gasset", + "SPcnrao*": "Inspección del Juego", "SPCNROto*": "Poyato", "SPcsao*": "PISCE", "SPcst*": "ASPAYM", @@ -2069,7 +2082,7 @@ "Ttnao": "Tudela", "Ttnp*": "Tabernero de Paz", "Ttpao": "Atenea", - "Ttpao*": "Teachers For Future Spain", + "Ttpao*": "Fundación Atenea", "Ttpe*": "Tomás Fernández", "Ttr*": "Fondos Estructurales", "TV*": "Fuenlabrada", @@ -2194,7 +2207,7 @@ "Vcstao": "Ávila", "Vcstao*": "Ayuntamiento de Valladolid", "Vctao": "Valencia", - "Vctao*": "Universitat de València", + "Vctao*": "Universidad de València", "Vctp*": "Vicky Bendito", "VEca*": "Verónica", "/VEco*": "Velasco", @@ -2227,6 +2240,7 @@ "VIctpa*": "Villalba", "/VIctpe*": "Vibe", "/VIctpeo*": "Villalobos", + "/VIctpi*": "Villalbí", "/VIctre*": "Viver", "/VIEra*": "Viera", "VIEsne*": "Vieitez", diff --git a/plover_spanish_mqd/spanish_mqd_single.py b/plover_spanish_mqd/spanish_mqd_single.py index 1b227e3..62a768d 100644 --- a/plover_spanish_mqd/spanish_mqd_single.py +++ b/plover_spanish_mqd/spanish_mqd_single.py @@ -6225,8 +6225,8 @@ "SCNRcnro": ("masculino ", "mayúsculo "), "SCNRcpe": ("ayudante ", ""), "SCNRcpeo": ("ayudantes ", ""), - "SCNRcr": ("Ministro de Sanidad, Consumo y Bienestar Social ", "manuscrit"), - "SCNRcr*": ("Ministerio de Sanidad, Consumo y Bienestar Social ", ""), + "SCNRcr": ("ministro de Consumo ", "manuscrit"), + "SCNRcr*": ("Ministerio de Consumo ", ""), "SCNRcreo": ("manuscritos ", ""), "SCNRcs": ("Ministro de Agricultura, Alimentación y Medio Ambiente ", ""), "SCNRcs*": ("Ministerio de Agricultura, Alimentación y Medio Ambiente ", ""), diff --git a/setup.cfg b/setup.cfg index 5e0d246..397cd21 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = plover_spanish_mqd -version = 2.0.3 +version = 2.0.4 description = Support for plover in Spanish (Melany system) long_description = file: README.md long_description_content_type = text/markdown