diff --git a/lang/gl/rules/rag.rules b/lang/gl/rules/rag.rules
index a2cdb855..de207858 100644
--- a/lang/gl/rules/rag.rules
+++ b/lang/gl/rules/rag.rules
@@ -1,170 +1,170 @@
 # Terminology based on resources from Real Academia Galega, the official
 # authority for the Galician language.
 # License: BSD 3-clause
 # © 2019 Adrián Chaves (Gallaecio) <adrian@chaves.io>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above copyright
 #       notice, this list of conditions and the following disclaimer in the
 #       documentation and/or other materials provided with the distribution.
 #     * Neither the name of the Proxecto Trasno nor the
 #       names of its contributors may be used to endorse or promote products
 #       derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED. IN NO EVENT SHALL PROXECTO TRASNO BE LIABLE FOR ANY
 # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 include file="filter.include"
 
 # Dicionario ##################################################################
 #
 # Regras baseadas no contido do dicionario da RAG. Nos comentarios indícase a
 # entrada do dicionario na que se apoian as regras.
 
 # aplicación
 
 {\bapplications?\b}i
 id="rag-en-application"
 hint="application → aplicación"
 valid msgstr="\baplicacións?\b"
 valid msgstr="\bapplications?\b"
 
 [\baplicacións?\b]i
 id="rag-gl-aplicación"
 hint="aplicación ← app, application"
 valid msgid="\bapplications?\b"
 valid msgid="\b(web)?apps?\b"
 valid msgid="\bapp_?icons?\b"  # icona de aplicación
 valid msgid="\bapp_?ids?\b"  # identificador de aplicación
 valid msgid="\bapp_?keys?\b"  # chave de aplicación
 valid msgid="\bapp_?names?\b"  # nome de aplicación
 valid msgid="\b(un)?apply(ing)?\b"
 valid msgid="\bmailers?\b"  # aplicación de correo
 valid msgid="\b(un)?styl(e|ing)\b"  # aplicación de estilo
 
 # contorno
 
 {\bdesktop\s+environments?\b}i
 id="rag-en-desktop-environment"
 hint="desktop environment → contorno de escritorio"
 valid msgstr="\bdesktop\s+environments?\b"
 valid msgstr="\bcontornos?\s+de\s+escritorio\b"
 
-{\benvironment\s+variables?\b}i
-id="rag-en-environment-variable"
-hint="environment variable → variábel de contorno"
-valid msgstr="\bvariábe(l|is)\s+de\s+contorno\b"
-
 [\bcontornos?\s+de\s+escritorio\b]i
 id="rag-gl-contorno-de-escritorio"
 hint="contorno de escritorio ← desktop environment"
 valid msgid="\bdesktop\s+environments?\b"
 
+{\benv(ironment)?\s*var(iable)?s?\b}i
+id="rag-en-environment-variable"
+hint="environment variable → variábel de contorno"
+valid msgstr="\bvariábe(l|is)\s+de\s+contorno\b"
+
 [\bvariábe(l|is)\s+de\s+contorno\b]i
 id="rag-gl-variábel-de-contorno"
 hint="variábel de contorno ← environment variable"
-valid msgid="\benvironment\s+variables?\b"
+valid msgid="\benv(ironment)?\s*var(iable)?s?\b"
 
 # en liña, Internet, rede, web
 
 {(?i)\bon(\s+|-)?line\b}
 id="rag-online"
 hint="online → en Internet, en liña, na Rede, na Web"
 valid msgstr="\b[eE][nN]\s+I[nN][tT][eE][rR][nN][eE][tT]\b"
 valid msgstr="(?i)\ben\s+liña\b"
 valid msgstr="\b[nN][aA]\s+R[eE][dD][eE]\b"
 valid msgstr="\b[nN][aA]\s+W[eE][bB]\b"
 
 # fonte
 
 {\bfont(?!\s+sizes?\b)s?\b}i
 id="rag-en-font"
 hint="font → fonte"
 valid msgstr="\bfontes?\b"
 
 {\bfont\s+sizes?\b}i
 id="rag-en-font-size"
 hint="font size → tamaño de letra"
 valid msgstr="\btamaños?\s+de\s+letra\b"
 
 {\btypefaces?\b}i
 id="rag-en-typeface"
 hint="typeface → fonte"
 valid msgstr="\bfontes?\b"
 
 [\bfontes?\b]i
 id="rag-gl-fonte"
 hint="fonte ← font, fountain, origin, source, typeface"
 valid msgid="\bfonts?\b"
 valid msgid="\bfountains?\b"
 valid msgid="\borigins?\b"
 valid msgid="\bsources?\b"
 valid msgid="\btypefaces?\b"
 
 # fonte monoespazo
 
 {\bmonospace\b}i
 id="rag-en-monospace"
 hint="monospace → monoespazo"
 valid msgstr="\bmonoespazo\b"
 
 [\bmonoespazo\b]i
 id="rag-gl-monoespazo"
 hint="monoespazo ← monospace"
 valid msgid="\bmonospace\b"
 
 # hardware
 
 {\bhardware\b}i
 id="rag-en-hardware"
 hint="hardware → soporte físico"
 valid msgstr="\bsoporte\s+físico\b"
 
 [\bhardware\b]i
 id="rag-gl-hardware"
 hint="hardware → soporte físico"
 
 [\bsoporte\s+físico\b]i
 id="rag-gl-soporte-físico"
 hint="soporte físico ← hardware"
 valid msgid="\bhardware\b"
 
 # separador, tabulador, tabulatura
 
 {\btabs?\b}i
 id="rag-en-tab"
 hint="tab → separador"
 valid msgstr="\btabs?\b"
 valid msgstr="\bseparador(es)?\b"
 valid msgstr="\btabulacións?\b"
 valid msgstr="\btabulador(es)?\b"
 valid msgstr="\btabulaturas?\b"
 
 # software
 
 {\bsoftware\b}i
 id="rag-en-software"
 hint="software → programa, programas, soporte lóxico"
 valid msgstr="\bsoporte\s+lóxico\b"
 valid msgstr="\bprogramas?\b"
 
 [\bsoftware\b]i
 id="rag-gl-software"
 hint="software → programa, programas, soporte lóxico"
 
 [\bsoporte\s+lóxico\b]i
 id="rag-gl-soporte-lóxico"
 hint="soporte lóxico ← software"
 valid msgid="\bsoftware\b"