1 files changed, 1745 insertions, 1497 deletions
diff --git a/po/pt.po b/po/pt.po
index f48fd68d..2f492c93 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.28.99\n"
+"Project-Id-Version: xkeyboard-config-2.29.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2020-01-25 00:19+0000\n"
-"PO-Revision-Date: 2020-01-27 07:01+0000\n"
+"POT-Creation-Date: 2020-05-12 23:00+0100\n"
+"PO-Revision-Date: 2020-05-13 10:56+0100\n"
 "Last-Translator: Pedro Albuquerque <pmra@protonmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
 "Language: pt\n"
@@ -20,4352 +20,4372 @@ msgstr ""
 "X-Generator: Geany / PoHelper 1.36\n"
 
 #: rules/base.xml:8
-msgid "Generic 101-key PC"
-msgstr "Genérico de 101 teclas PC"
+msgid "Generic 86-key PC"
+msgstr "Genérico de 86 teclas PC"
 
 #: rules/base.xml:15
-msgid "Generic 102-key PC (intl.)"
-msgstr "Genérico de 102 teclas PC (intl.)"
+msgid "Generic 101-key PC"
+msgstr "Genérico de 101 teclas PC"
 
 #: rules/base.xml:22
-msgid "Generic 104-key PC"
-msgstr "Genérico de 104 teclas PC"
+msgid "Generic 102-key PC"
+msgstr "Genérico de 102 teclas PC"
 
 #: rules/base.xml:29
-msgid "Generic 105-key PC (intl.)"
-msgstr "Genérico de 105 teclas PC (intl.)"
+msgid "Generic 104-key PC"
+msgstr "Genérico de 104 teclas PC"
 
 #: rules/base.xml:36
+msgid "Generic 104-key PC with L-shaped Enter key"
+msgstr "Genérico de 104 teclas PC com tecla Enter em L"
+
+#: rules/base.xml:43
+msgid "Generic 105-key PC"
+msgstr "Genérico de 105 teclas PC"
+
+#: rules/base.xml:50
 msgid "Dell 101-key PC"
 msgstr "Dell 101 teclas PC"
 
-#: rules/base.xml:43
+#: rules/base.xml:57
 msgid "Dell Latitude laptop"
 msgstr "Dell Latitude laptop"
 
-#: rules/base.xml:50
+#: rules/base.xml:64
 msgid "Dell Precision M65 laptop"
 msgstr "Dell Precision M65 laptop"
 
-#: rules/base.xml:57
+#: rules/base.xml:71
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: rules/base.xml:64
+#: rules/base.xml:78
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: rules/base.xml:71
+#: rules/base.xml:85
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: rules/base.xml:78
+#: rules/base.xml:92
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: rules/base.xml:85
+#: rules/base.xml:99
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: rules/base.xml:92
+#: rules/base.xml:106
 msgid "PC-98"
 msgstr "PC-98"
 
-#: rules/base.xml:99
+#: rules/base.xml:113
 msgid "A4Tech KB-21"
 msgstr "A4Tech KB-21"
 
-#: rules/base.xml:106
+#: rules/base.xml:120
 msgid "A4Tech KBS-8"
 msgstr "A4Tech KBS-8"
 
-#: rules/base.xml:113
+#: rules/base.xml:127
 msgid "A4Tech Wireless Desktop RFKB-23"
 msgstr "A4Tech Wireless Desktop RFKB-23"
 
-#: rules/base.xml:120
+#: rules/base.xml:134
 msgid "Acer AirKey V"
 msgstr "Acer AirKey V"
 
-#: rules/base.xml:127
+#: rules/base.xml:141
 msgid "Azona RF2300 wireless Internet"
 msgstr "Azona RF2300 wireless Internet"
 
-#: rules/base.xml:134
+#: rules/base.xml:148
 msgid "Advance Scorpius KI"
 msgstr "Advance Scorpius KI"
 
-#: rules/base.xml:141
+#: rules/base.xml:155
 msgid "Brother Internet"
 msgstr "Brother Internet"
 
-#: rules/base.xml:148
+#: rules/base.xml:162
 msgid "BTC 5113RF Multimedia"
 msgstr "BTC 5113RF Multimedia"
 
-#: rules/base.xml:155
+#: rules/base.xml:169
 msgid "BTC 5126T"
 msgstr "BTC 5126T"
 
-#: rules/base.xml:162
+#: rules/base.xml:176
 msgid "BTC 6301URF"
 msgstr "BTC 6301URF"
 
-#: rules/base.xml:169
+#: rules/base.xml:183
 msgid "BTC 9000"
 msgstr "BTC 9000"
 
-#: rules/base.xml:176
+#: rules/base.xml:190
 msgid "BTC 9000A"
 msgstr "BTC 9000A"
 
-#: rules/base.xml:183
+#: rules/base.xml:197
 msgid "BTC 9001AH"
 msgstr "BTC 9001AH"
 
-#: rules/base.xml:190
+#: rules/base.xml:204
 msgid "BTC 5090"
 msgstr "BTC 5090"
 
-#: rules/base.xml:197
+#: rules/base.xml:211
 msgid "BTC 9019U"
 msgstr "BTC 9019U"
 
-#: rules/base.xml:204
+#: rules/base.xml:218
 msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr "BTC 9116U Mini Wireless Internet e Gaming"
 
-#: rules/base.xml:210
+#: rules/base.xml:224
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: rules/base.xml:216
+#: rules/base.xml:230
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: rules/base.xml:223
+#: rules/base.xml:237
 msgid "Cherry Blue Line CyBo@rd (alt.)"
 msgstr "Cherry Blue Line CyBo@rd (alt.)"
 
-#: rules/base.xml:230
+#: rules/base.xml:244
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: rules/base.xml:237
+#: rules/base.xml:251
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: rules/base.xml:244
+#: rules/base.xml:258
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.ILIMITADO"
 
-#: rules/base.xml:251
+#: rules/base.xml:265
 msgid "Chicony Internet"
 msgstr "Chicony Internet"
 
-#: rules/base.xml:258
+#: rules/base.xml:272
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: rules/base.xml:265
+#: rules/base.xml:279
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: rules/base.xml:272
+#: rules/base.xml:286
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: rules/base.xml:279
+#: rules/base.xml:293
 msgid "Compaq Easy Access"
 msgstr "Compaq Easy Access"
 
-#: rules/base.xml:286
+#: rules/base.xml:300
 msgid "Compaq Internet (7 keys)"
 msgstr "Compaq Internet (7 teclas)"
 
-#: rules/base.xml:293
+#: rules/base.xml:307
 msgid "Compaq Internet (13 keys)"
 msgstr "Compaq Internet (13 teclas)"
 
-#: rules/base.xml:300
+#: rules/base.xml:314
 msgid "Compaq Internet (18 keys)"
 msgstr "Compaq Internet (18 teclas)"
 
-#: rules/base.xml:307
+#: rules/base.xml:321
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: rules/base.xml:314
+#: rules/base.xml:328
 msgid "Compaq Armada laptop"
 msgstr "Compaq Armada laptop"
 
-#: rules/base.xml:321
+#: rules/base.xml:335
 msgid "Compaq Presario laptop"
 msgstr "Compaq Presario laptop"
 
-#: rules/base.xml:328
+#: rules/base.xml:342
 msgid "Compaq iPaq"
 msgstr "Compaq iPaq"
 
-#: rules/base.xml:335
+#: rules/base.xml:349
 msgid "Dell"
 msgstr "Dell"
 
-#: rules/base.xml:342
+#: rules/base.xml:356
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: rules/base.xml:349
+#: rules/base.xml:363
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: rules/base.xml:356
+#: rules/base.xml:370
 msgid "Dell USB Multimedia"
 msgstr "Dell USB Multimedia"
 
-#: rules/base.xml:363
+#: rules/base.xml:377
 msgid "Dell Inspiron 6000/8000 laptop"
 msgstr "Dell Inspiron 6000/8000 laptop"
 
-#: rules/base.xml:370
+#: rules/base.xml:384
 msgid "Dell Precision M laptop"
 msgstr "Dell Precision M laptop"
 
-#: rules/base.xml:377
+#: rules/base.xml:391
 msgid "Dexxa Wireless Desktop"
 msgstr "Dexxa Wireless Desktop"
 
-#: rules/base.xml:384
+#: rules/base.xml:398
 msgid "Diamond 9801/9802"
 msgstr "Diamond 9801/9802"
 
-#: rules/base.xml:391
+#: rules/base.xml:405
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: rules/base.xml:397
+#: rules/base.xml:411
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: rules/base.xml:404
+#: rules/base.xml:418
 msgid "Fujitsu-Siemens Amilo laptop"
 msgstr "Fujitsu-Siemens Amilo laptop"
 
-#: rules/base.xml:411
+#: rules/base.xml:425
 msgid "Genius Comfy KB-16M/Multimedia KWD-910"
 msgstr "Genius Comfy KB-16M/Multimedia KWD-910"
 
-#: rules/base.xml:418
+#: rules/base.xml:432
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: rules/base.xml:425
+#: rules/base.xml:439
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: rules/base.xml:432
+#: rules/base.xml:446
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: rules/base.xml:439
+#: rules/base.xml:453
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: rules/base.xml:446
+#: rules/base.xml:460
 msgid "Gyration"
 msgstr "Gyration"
 
-#: rules/base.xml:453
+#: rules/base.xml:467
 msgid "Kinesis"
 msgstr "Kinesis"
 
-#: rules/base.xml:460
+#: rules/base.xml:474
 msgid "Logitech"
 msgstr "Logitech"
 
-#: rules/base.xml:467
+#: rules/base.xml:481
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15 teclas extra via G15daemon"
 
-#: rules/base.xml:474
+#: rules/base.xml:488
 msgid "Hewlett-Packard Internet"
 msgstr "Hewlett-Packard Internet"
 
-#: rules/base.xml:481
+#: rules/base.xml:495
 msgid "Hewlett-Packard NEC SK-2500 Multimedia"
 msgstr "Hewlett-Packard NEC SK-2500 Multimedia"
 
-#: rules/base.xml:488
+#: rules/base.xml:502
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: rules/base.xml:495
+#: rules/base.xml:509
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: rules/base.xml:502
+#: rules/base.xml:516
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: rules/base.xml:509
+#: rules/base.xml:523
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: rules/base.xml:516
+#: rules/base.xml:530
 msgid "Hewlett-Packard Pavilion ZT1100"
 msgstr "Hewlett-Packard Pavilion ZT1100"
 
-#: rules/base.xml:523
+#: rules/base.xml:537
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: rules/base.xml:530
+#: rules/base.xml:544
 msgid "Hewlett-Packard Omnibook 500"
 msgstr "Hewlett-Packard Omnibook 500"
 
-#: rules/base.xml:537
+#: rules/base.xml:551
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: rules/base.xml:544
+#: rules/base.xml:558
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: rules/base.xml:551
+#: rules/base.xml:565
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: rules/base.xml:558
+#: rules/base.xml:572
 msgid "Hewlett-Packard Mini 110 laptop"
 msgstr "Hewlett-Packard Mini 110 laptop"
 
-#: rules/base.xml:565
+#: rules/base.xml:579
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: rules/base.xml:572
+#: rules/base.xml:586
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: rules/base.xml:579
+#: rules/base.xml:593
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: rules/base.xml:586
+#: rules/base.xml:600
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: rules/base.xml:593
+#: rules/base.xml:607
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: rules/base.xml:600
+#: rules/base.xml:614
 msgid "IBM Space Saver"
 msgstr "IBM Espaço Saver"
 
-#: rules/base.xml:607
+#: rules/base.xml:621
 msgid "Logitech Access"
 msgstr "Logitech Access"
 
-#: rules/base.xml:614
+#: rules/base.xml:628
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: rules/base.xml:621 rules/base.xml:629
+#: rules/base.xml:635 rules/base.xml:643
 msgid "Logitech Internet 350"
 msgstr "Logitech Internet 350"
 
-#: rules/base.xml:636
+#: rules/base.xml:650
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: rules/base.xml:643
+#: rules/base.xml:657
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: rules/base.xml:650 rules/base.xml:685
+#: rules/base.xml:664 rules/base.xml:699
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: rules/base.xml:657
+#: rules/base.xml:671
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: rules/base.xml:664
+#: rules/base.xml:678
 msgid "Logitech Cordless Desktop (alt.)"
 msgstr "Logitech Cordless Desktop (alt.)"
 
-#: rules/base.xml:671
+#: rules/base.xml:685
 msgid "Logitech Cordless Desktop Pro (2nd alt.)"
 msgstr "Logitech Cordless Desktop Pro (2ª alt.)"
 
-#: rules/base.xml:678
+#: rules/base.xml:692
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: rules/base.xml:692
+#: rules/base.xml:706
 msgid "Logitech iTouch Cordless Y-RB6"
 msgstr "Logitech iTouch Cordless Y-RB6"
 
-#: rules/base.xml:699
+#: rules/base.xml:713
 msgid "Logitech Internet"
 msgstr "Logitech Internet"
 
-#: rules/base.xml:706
+#: rules/base.xml:720
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: rules/base.xml:713
+#: rules/base.xml:727
 msgid "Logitech Internet Navigator"
 msgstr "Logitech Internet Navigator"
 
-#: rules/base.xml:720
+#: rules/base.xml:734
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: rules/base.xml:727
+#: rules/base.xml:741
 msgid "Logitech iTouch Internet Navigator SE"
 msgstr "Logitech iTouch Internet Navigator SE"
 
-#: rules/base.xml:734
+#: rules/base.xml:748
 msgid "Logitech iTouch Internet Navigator SE USB"
 msgstr "Logitech iTouch Internet Navigator SE USB"
 
-#: rules/base.xml:741
+#: rules/base.xml:755
 msgid "Logitech Ultra-X"
 msgstr "Logitech Ultra-X"
 
-#: rules/base.xml:748
+#: rules/base.xml:762
 msgid "Logitech Ultra-X Cordless Media Desktop"
 msgstr "Logitech Ultra-X Cordless Media Desktop"
 
-#: rules/base.xml:755
+#: rules/base.xml:769
 msgid "Logitech diNovo"
 msgstr "Logitech diNovo"
 
-#: rules/base.xml:762
+#: rules/base.xml:776
 msgid "Logitech diNovo Edge"
 msgstr "Logitech diNovo Edge"
 
-#: rules/base.xml:769
+#: rules/base.xml:783
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: rules/base.xml:776
+#: rules/base.xml:790
 msgid "Memorex MX2500 EZ-Access"
 msgstr "Memorex MX2500 EZ-Access"
 
-#: rules/base.xml:783
+#: rules/base.xml:797
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: rules/base.xml:790
+#: rules/base.xml:804
 msgid "Microsoft Natural Ergonomic 4000"
 msgstr "Microsoft Natural Ergonomic 4000"
 
-#: rules/base.xml:797
+#: rules/base.xml:811
 msgid "Microsoft Natural Wireless Ergonomic 7000"
 msgstr "Microsoft Natural Wireless Ergonomic 7000"
 
-#: rules/base.xml:804
+#: rules/base.xml:818
 msgid "Microsoft Internet"
 msgstr "Microsoft Internet"
 
-#: rules/base.xml:811
+#: rules/base.xml:825
 msgid "Microsoft Natural Pro/Internet Pro"
 msgstr "Microsoft Natural Pro/Internet Pro"
 
-#: rules/base.xml:818
+#: rules/base.xml:832
 msgid "Microsoft Natural Pro USB/Internet Pro"
 msgstr "Microsoft Natural Pro USB/Internet Pro"
 
-#: rules/base.xml:825
+#: rules/base.xml:839
 msgid "Microsoft Natural Pro OEM"
 msgstr "Microsoft Natural Pro OEM"
 
-#: rules/base.xml:832
+#: rules/base.xml:846
 msgid "ViewSonic KU-306 Internet"
 msgstr "ViewSonic KU-306 Internet"
 
-#: rules/base.xml:839
+#: rules/base.xml:853
 msgid "Microsoft Internet Pro (Swedish)"
 msgstr "Microsoft Internet Pro (Sueco)"
 
-#: rules/base.xml:846
+#: rules/base.xml:860
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: rules/base.xml:853
+#: rules/base.xml:867
 msgid "Microsoft Wireless Multimedia 1.0A"
 msgstr "Microsoft Wireless Multimedia 1.0A"
 
-#: rules/base.xml:860
+#: rules/base.xml:874
 msgid "Microsoft Surface"
 msgstr "Microsoft Surface"
 
-#: rules/base.xml:867
+#: rules/base.xml:881
 msgid "Microsoft Natural Elite"
 msgstr "Microsoft Natural Elite"
 
-#: rules/base.xml:874
+#: rules/base.xml:888
 msgid "Microsoft Comfort Curve 2000"
 msgstr "Microsoft Comfort Curve 2000"
 
-#: rules/base.xml:881
+#: rules/base.xml:895
 msgid "Ortek Multimedia/Internet MCK-800"
 msgstr "Ortek Multimedia/Internet MCK-800"
 
-#: rules/base.xml:888
+#: rules/base.xml:902
 msgid "Propeller Voyager KTEZ-1000"
 msgstr "Propeller Voyager KTEZ-1000"
 
-#: rules/base.xml:895
+#: rules/base.xml:909
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: rules/base.xml:902
+#: rules/base.xml:916
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: rules/base.xml:909
+#: rules/base.xml:923
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: rules/base.xml:916
+#: rules/base.xml:930
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: rules/base.xml:923
+#: rules/base.xml:937
 msgid "NEC SK-1300"
 msgstr "NEC SK-1300"
 
-#: rules/base.xml:930
+#: rules/base.xml:944
 msgid "NEC SK-2500"
 msgstr "NEC SK-2500"
 
-#: rules/base.xml:937
+#: rules/base.xml:951
 msgid "NEC SK-6200"
 msgstr "NEC SK-6200"
 
-#: rules/base.xml:944
+#: rules/base.xml:958
 msgid "NEC SK-7100"
 msgstr "NEC SK-7100"
 
-#: rules/base.xml:951
+#: rules/base.xml:965
 msgid "Super Power Multimedia"
 msgstr "Super Power Multimedia"
 
-#: rules/base.xml:958
+#: rules/base.xml:972
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: rules/base.xml:965
+#: rules/base.xml:979
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: rules/base.xml:972
+#: rules/base.xml:986
 msgid "Symplon PaceBook tablet"
 msgstr "Symplon PaceBook tablet"
 
-#: rules/base.xml:979
+#: rules/base.xml:993
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: rules/base.xml:986
+#: rules/base.xml:1000
 msgid "Trust Wireless Classic"
 msgstr "Trust Wireless Classic"
 
-#: rules/base.xml:993
+#: rules/base.xml:1007
 msgid "Trust Direct Access"
 msgstr "Trust Direct Access"
 
-#: rules/base.xml:1000
+#: rules/base.xml:1014
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: rules/base.xml:1007
+#: rules/base.xml:1021
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: rules/base.xml:1014
+#: rules/base.xml:1028
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: rules/base.xml:1021
+#: rules/base.xml:1035
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: rules/base.xml:1028
+#: rules/base.xml:1042
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 
-#: rules/base.xml:1035
+#: rules/base.xml:1049
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 
-#: rules/base.xml:1042
+#: rules/base.xml:1056
 msgid "Yahoo! Internet"
 msgstr "Yahoo! Internet"
 
-#: rules/base.xml:1049
+#: rules/base.xml:1063
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: rules/base.xml:1056
+#: rules/base.xml:1070
 msgid "MacBook/MacBook Pro (intl.)"
 msgstr "MacBook/MacBook Pro (intl.)"
 
-#: rules/base.xml:1063
+#: rules/base.xml:1077
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: rules/base.xml:1070
+#: rules/base.xml:1084
 msgid "Macintosh Old"
 msgstr "Macintosh Old"
 
-#: rules/base.xml:1077
+#: rules/base.xml:1091
 msgid "Happy Hacking for Mac"
 msgstr "Happy Hacking para Mac"
 
-#: rules/base.xml:1084
+#: rules/base.xml:1098
 msgid "Acer C300"
 msgstr "Acer C300"
 
-#: rules/base.xml:1091
+#: rules/base.xml:1105
 msgid "Acer Ferrari 4000"
 msgstr "Acer Ferrari 4000"
 
-#: rules/base.xml:1098
+#: rules/base.xml:1112
 msgid "Acer laptop"
 msgstr "Acer laptop"
 
-#: rules/base.xml:1105
+#: rules/base.xml:1119
 msgid "Asus laptop"
 msgstr "Asus laptop"
 
-#: rules/base.xml:1112
+#: rules/base.xml:1126
 msgid "Apple"
 msgstr "Apple"
 
-#: rules/base.xml:1119
+#: rules/base.xml:1133
 msgid "Apple laptop"
 msgstr "Apple laptop"
 
-#: rules/base.xml:1126
+#: rules/base.xml:1140
 msgid "Apple Aluminium (ANSI)"
 msgstr "Apple Aluminium (ANSI)"
 
-#: rules/base.xml:1133
+#: rules/base.xml:1147
 msgid "Apple Aluminium (ISO)"
 msgstr "Apple Aluminium (ISO)"
 
-#: rules/base.xml:1140
+#: rules/base.xml:1154
 msgid "Apple Aluminium (JIS)"
 msgstr "Apple Aluminium (JIS)"
 
-#: rules/base.xml:1147
+#: rules/base.xml:1161
 msgid "Silvercrest Multimedia Wireless"
 msgstr "Silvercrest Multimedia Wireless"
 
-#: rules/base.xml:1154
+#: rules/base.xml:1168
 msgid "eMachines m6800 laptop"
 msgstr "eMachines m6800 laptop"
 
-#: rules/base.xml:1161
+#: rules/base.xml:1175
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: rules/base.xml:1168
+#: rules/base.xml:1182
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: rules/base.xml:1175
+#: rules/base.xml:1189
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: rules/base.xml:1182
+#: rules/base.xml:1196
 msgid "Happy Hacking"
 msgstr "Happy Hacking"
 
-#: rules/base.xml:1189
+#: rules/base.xml:1203
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: rules/base.xml:1196
+#: rules/base.xml:1210
 msgid "OLPC"
 msgstr "OLPC"
 
-#: rules/base.xml:1203
+#: rules/base.xml:1217
 msgid "Sun Type 7 USB"
 msgstr "Sun Type 7 USB"
 
-#: rules/base.xml:1210
+#: rules/base.xml:1224
 msgid "Sun Type 7 USB (European)"
 msgstr "Sun Type 7 USB (Europeu)"
 
-#: rules/base.xml:1217
+#: rules/base.xml:1231
 msgid "Sun Type 7 USB (Unix)"
 msgstr "Sun Type 7 USB (Unix)"
 
-#: rules/base.xml:1224
+#: rules/base.xml:1238
 msgid "Sun Type 7 USB (Japanese)/Japanese 106-key"
 msgstr "Sun Type 7 USB (Japonês)/Japonês 106 teclas"
 
-#: rules/base.xml:1231
+#: rules/base.xml:1245
 msgid "Sun Type 6/7 USB"
 msgstr "Sun Type 6/7 USB"
 
-#: rules/base.xml:1238
+#: rules/base.xml:1252
 msgid "Sun Type 6/7 USB (European)"
 msgstr "Sun Type 6/7 USB (Europeu)"
 
-#: rules/base.xml:1245
+#: rules/base.xml:1259
 msgid "Sun Type 6 USB (Unix)"
 msgstr "Sun Type 6 USB (Unix)"
 
-#: rules/base.xml:1252
+#: rules/base.xml:1266
 msgid "Sun Type 6 USB (Japanese)"
 msgstr "Sun Type 6 USB (Japonês)"
 
-#: rules/base.xml:1259
+#: rules/base.xml:1273
 msgid "Sun Type 6 (Japanese)"
 msgstr "Sun Type 6 (Japonês)"
 
-#: rules/base.xml:1266
+#: rules/base.xml:1280
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: rules/base.xml:1273
+#: rules/base.xml:1287
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: rules/base.xml:1280
+#: rules/base.xml:1294
 msgid "FL90"
 msgstr "FL90"
 
-#: rules/base.xml:1287
+#: rules/base.xml:1301
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: rules/base.xml:1294
+#: rules/base.xml:1308
 msgid "Truly Ergonomic 227"
 msgstr "Truly Ergonomic 227"
 
-#: rules/base.xml:1301
+#: rules/base.xml:1315
 msgid "Truly Ergonomic 229"
 msgstr "Truly Ergonomic 229"
 
-#: rules/base.xml:1308
+#: rules/base.xml:1322
 msgid "SteelSeries Apex 300 (Apex RAW)"
 msgstr "SteelSeries Apex 300 (Apex RAW)"
 
-#: rules/base.xml:1315
+#: rules/base.xml:1329
 msgid "Chromebook"
 msgstr "Chromebook"
 
-#: rules/base.xml:1322
+#: rules/base.xml:1336
 msgid "Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)"
 msgstr "Teclado de computador realmente ergonómico modelo 227 (teclas Alt largas)"
 
-#: rules/base.xml:1329
+#: rules/base.xml:1343
 msgid "Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)"
 msgstr "Teclado de computador realmente ergonómico modelo 229 (teclas Alt de tamanho padrão, teclas Super e Menu adicionais)"
 
 #. Keyboard indicator for English layouts
 #. Keyboard indicator for Australian layouts
 #. Keyboard indicator for English layouts
-#: rules/base.xml:1339 rules/base.xml:1737 rules/base.xml:2257
-#: rules/base.xml:2684 rules/base.xml:3362 rules/base.xml:5576
-#: rules/base.xml:5823 rules/base.xml:5866 rules/base.xml:6011
-#: rules/base.xml:6022 rules/base.extras.xml:337 rules/base.extras.xml:1171
+#: rules/base.xml:1353 rules/base.xml:1751 rules/base.xml:2283
+#: rules/base.xml:2710 rules/base.xml:3388 rules/base.xml:5602
+#: rules/base.xml:5849 rules/base.xml:5892 rules/base.xml:6037
+#: rules/base.xml:6048 rules/base.extras.xml:345 rules/base.extras.xml:1179
 msgid "en"
 msgstr "en"
 
-#: rules/base.xml:1340 rules/base.extras.xml:338
+#: rules/base.xml:1354 rules/base.extras.xml:346
 msgid "English (US)"
 msgstr "Inglês (EUA)"
 
 #. Keyboard indicator for Cherokee layouts
-#: rules/base.xml:1350
+#: rules/base.xml:1364
 msgid "chr"
 msgstr "chr"
 
-#: rules/base.xml:1351
+#: rules/base.xml:1365
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: rules/base.xml:1360
+#: rules/base.xml:1374
 msgid "English (US, euro on 5)"
 msgstr "Inglês (EUA, euro em 5)"
 
-#: rules/base.xml:1366
+#: rules/base.xml:1380
 msgid "English (US, intl., with dead keys)"
 msgstr "Inglês (EUA, intl., com teclas mortas)"
 
-#: rules/base.xml:1372
+#: rules/base.xml:1386
 msgid "English (US, alt. intl.)"
 msgstr "Inglês (EUA, alt. intl.)"
 
-#: rules/base.xml:1378
+#: rules/base.xml:1392
 msgid "English (Colemak)"
 msgstr "Inglês (Colemak)"
 
-#: rules/base.xml:1384
+#: rules/base.xml:1398
 msgid "English (Dvorak)"
 msgstr "Inglês (Dvorak)"
 
-#: rules/base.xml:1390
+#: rules/base.xml:1404
 msgid "English (Dvorak, intl., with dead keys)"
 msgstr "Inglês (Dvorak, intl., com teclas mortas)"
 
-#: rules/base.xml:1396
+#: rules/base.xml:1410
 msgid "English (Dvorak, alt. intl.)"
 msgstr "Inglês (Dvorak, alt. intl.)"
 
-#: rules/base.xml:1402
+#: rules/base.xml:1416
 msgid "English (Dvorak, left-handed)"
 msgstr "Inglês (Dvorak, canhoto)"
 
-#: rules/base.xml:1408
+#: rules/base.xml:1422
 msgid "English (Dvorak, right-handed)"
 msgstr "Inglês (Dvorak, destro)"
 
-#: rules/base.xml:1414
+#: rules/base.xml:1428
 msgid "English (classic Dvorak)"
 msgstr "Inglês (clássico Dvorak)"
 
-#: rules/base.xml:1420
+#: rules/base.xml:1434
 msgid "English (programmer Dvorak)"
 msgstr "Inglês (programador Dvorak)"
 
 #. Keyboard indicator for Russian layouts
-#: rules/base.xml:1427 rules/base.xml:2908 rules/base.xml:3488
-#: rules/base.xml:3626 rules/base.xml:4055 rules/base.xml:4549
-#: rules/base.xml:4669 rules/base.xml:5069 rules/base.xml:5080
+#: rules/base.xml:1441 rules/base.xml:2934 rules/base.xml:3514
+#: rules/base.xml:3652 rules/base.xml:4081 rules/base.xml:4575
+#: rules/base.xml:4695 rules/base.xml:5095 rules/base.xml:5106
 #: rules/base.extras.xml:177 rules/base.extras.xml:188
-#: rules/base.extras.xml:566 rules/base.extras.xml:582
-#: rules/base.extras.xml:618
+#: rules/base.extras.xml:574 rules/base.extras.xml:590
+#: rules/base.extras.xml:626
 msgid "ru"
 msgstr "ru"
 
-#: rules/base.xml:1428
+#: rules/base.xml:1442
 msgid "Russian (US, phonetic)"
 msgstr "Russo (EUA, fonético)"
 
-#: rules/base.xml:1437
+#: rules/base.xml:1451
 msgid "English (Macintosh)"
 msgstr "Inglês (Macintosh)"
 
-#: rules/base.xml:1443
+#: rules/base.xml:1457
 msgid "English (intl., with AltGr dead keys)"
 msgstr "Inglês (intl., com AltGr + teclas mortas)"
 
-#: rules/base.xml:1454
-msgid "English (the divide/multiply keys toggle the layout)"
-msgstr "Inglês (como teclas dividir/multiplicar alternam a disposição)"
+#: rules/base.xml:1468
+msgid "English (the divide/multiply toggle the layout)"
+msgstr "Inglês (teclas dividir/multiplicar alternam a disposição)"
 
-#: rules/base.xml:1460
+#: rules/base.xml:1474
 msgid "Serbo-Croatian (US)"
 msgstr "Sérvio-Croata (EUA)"
 
-#: rules/base.xml:1473
+#: rules/base.xml:1487
 msgid "English (Norman)"
 msgstr "Inglês (Norman)"
 
-#: rules/base.xml:1479
+#: rules/base.xml:1493
 msgid "English (Workman)"
 msgstr "Inglês (Workman)"
 
-#: rules/base.xml:1485
+#: rules/base.xml:1499
 msgid "English (Workman, intl., with dead keys)"
 msgstr "Inglês (Workman, intl., com teclas mortas)"
 
 #. Keyboard indicator for Afghani layouts
 #. Keyboard indicator for Persian layouts
-#: rules/base.xml:1494 rules/base.xml:1535 rules/base.xml:3037
-#: rules/base.extras.xml:226
+#: rules/base.xml:1508 rules/base.xml:1549 rules/base.xml:3063
+#: rules/base.extras.xml:234
 msgid "fa"
 msgstr "fa"
 
-#: rules/base.xml:1495
+#: rules/base.xml:1509
 msgid "Afghani"
 msgstr "Afghani"
 
 #. Keyboard indicator for Pashto layouts
-#: rules/base.xml:1502 rules/base.xml:1524
+#: rules/base.xml:1516 rules/base.xml:1538
 msgid "ps"
 msgstr "ps"
 
-#: rules/base.xml:1503
+#: rules/base.xml:1517
 msgid "Pashto"
 msgstr "Pashto"
 
 #. Keyboard indicator for Uzbek layouts
-#: rules/base.xml:1513 rules/base.xml:1543 rules/base.xml:5642
+#: rules/base.xml:1527 rules/base.xml:1557 rules/base.xml:5668
 msgid "uz"
 msgstr "uz"
 
-#: rules/base.xml:1514
+#: rules/base.xml:1528
 msgid "Uzbek (Afghanistan)"
 msgstr "Uzbek (Afeganistão)"
 
-#: rules/base.xml:1525
+#: rules/base.xml:1539
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Pashto (Afeganistão, OLPC)"
 
-#: rules/base.xml:1536
+#: rules/base.xml:1550
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persa (Afeganistão, Dari OLPC)"
 
-#: rules/base.xml:1544
+#: rules/base.xml:1558
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Uzbek (Afeganistão, OLPC)"
 
 #. Keyboard indicator for Arabic layouts
 #. Keyboard indicator for Iraqi layouts
 #. Keyboard indicator for Arabic layouts
-#: rules/base.xml:1556 rules/base.xml:2400 rules/base.xml:2413
-#: rules/base.xml:3100 rules/base.xml:5223 rules/base.xml:5787
-#: rules/base.extras.xml:734
+#: rules/base.xml:1570 rules/base.xml:2426 rules/base.xml:2439
+#: rules/base.xml:3126 rules/base.xml:5249 rules/base.xml:5813
+#: rules/base.extras.xml:742
 msgid "ar"
 msgstr "ar"
 
-#: rules/base.xml:1557 rules/base.extras.xml:735
+#: rules/base.xml:1571 rules/base.extras.xml:743
 msgid "Arabic"
 msgstr "Árabe"
 
-#: rules/base.xml:1587
+#: rules/base.xml:1601
 msgid "Arabic (AZERTY)"
 msgstr "Árabe (AZERTY)"
 
-#: rules/base.xml:1593
-msgid "Arabic (AZERTY/digits)"
-msgstr "Árabe (AZERTY/dígitos)"
+#: rules/base.xml:1607
+msgid "Arabic (AZERTY, Eastern Arabic numerals)"
+msgstr "Árabe (AZERTY, numerais árabes leste)"
 
-#: rules/base.xml:1599
-msgid "Arabic (digits)"
-msgstr "Árabe (dígitos)"
+#: rules/base.xml:1613
+msgid "Arabic (Eastern Arabic numerals)"
+msgstr "Árabe (numerais árabes leste)"
 
-#: rules/base.xml:1605
+#: rules/base.xml:1619
 msgid "Arabic (QWERTY)"
 msgstr "Árabe (QWERTY)"
 
-#: rules/base.xml:1611
-msgid "Arabic (qwerty/digits)"
-msgstr "Árabe (qwerty/dígitos)"
+#: rules/base.xml:1625
+msgid "Arabic (QWERTY, Eastern Arabic numerals)"
+msgstr "Árabe (QWERTY, numerais árabes leste)"
 
-#: rules/base.xml:1617
+#: rules/base.xml:1631
 msgid "Arabic (Buckwalter)"
 msgstr "Árabe (Buckwalter)"
 
-#: rules/base.xml:1623
+#: rules/base.xml:1637
 msgid "Arabic (OLPC)"
 msgstr "Árabe (OLPC)"
 
-#: rules/base.xml:1629
+#: rules/base.xml:1643
 msgid "Arabic (Macintosh)"
 msgstr "Árabe (Macintosh)"
 
 #. Keyboard indicator for Albanian layouts
-#: rules/base.xml:1638
+#: rules/base.xml:1652
 msgid "sq"
 msgstr "sq"
 
-#: rules/base.xml:1639
+#: rules/base.xml:1653
 msgid "Albanian"
 msgstr "Albanês"
 
-#: rules/base.xml:1648
+#: rules/base.xml:1662
 msgid "Albanian (Plisi)"
 msgstr "Albanês (Plisi)"
 
-#: rules/base.xml:1654
+#: rules/base.xml:1668
 msgid "Albanian (Veqilharxhi)"
 msgstr "Albanês (Veqilharxhi)"
 
 #. Keyboard indicator for Armenian layouts
-#: rules/base.xml:1663 rules/base.extras.xml:695
+#: rules/base.xml:1677 rules/base.extras.xml:703
 msgid "hy"
 msgstr "hy"
 
-#: rules/base.xml:1664 rules/base.extras.xml:696
+#: rules/base.xml:1678 rules/base.extras.xml:704
 msgid "Armenian"
 msgstr "Arménio"
 
-#: rules/base.xml:1673
+#: rules/base.xml:1687
 msgid "Armenian (phonetic)"
 msgstr "Arménio (fonético)"
 
-#: rules/base.xml:1679
+#: rules/base.xml:1693
 msgid "Armenian (alt. phonetic)"
 msgstr "Arménio (alt. fonético)"
 
-#: rules/base.xml:1685
+#: rules/base.xml:1699
 msgid "Armenian (eastern)"
 msgstr "Arménio (oriental)"
 
-#: rules/base.xml:1691
+#: rules/base.xml:1705
 msgid "Armenian (western)"
 msgstr "Arménio (ocidental)"
 
-#: rules/base.xml:1697
+#: rules/base.xml:1711
 msgid "Armenian (alt. eastern)"
 msgstr "Arménio (alt. oriental)"
 
 #. Keyboard indicator for German layouts
-#: rules/base.xml:1706 rules/base.xml:3510 rules/base.xml:5135
-#: rules/base.xml:5153 rules/base.xml:5161 rules/base.xml:5213
-#: rules/base.extras.xml:95 rules/base.extras.xml:1120
+#: rules/base.xml:1720 rules/base.xml:3536 rules/base.xml:5161
+#: rules/base.xml:5179 rules/base.xml:5187 rules/base.xml:5239
+#: rules/base.extras.xml:95 rules/base.extras.xml:1128
 msgid "de"
 msgstr "de"
 
-#: rules/base.xml:1707
+#: rules/base.xml:1721
 msgid "German (Austria)"
 msgstr "Alemão (Áustria)"
 
-#: rules/base.xml:1716
+#: rules/base.xml:1730
 msgid "German (Austria, no dead keys)"
 msgstr "Alemão (Áustria, sem teclas mortas)"
 
-#: rules/base.xml:1722
-msgid "German (Austria, with Sun dead keys)"
-msgstr "Alemão (Áustria, com Sun + teclas mortas)"
+#: rules/base.xml:1736
+msgid "German (Austria, Sun dead keys)"
+msgstr "Alemão (Áustria, teclas mortas Sun)"
 
-#: rules/base.xml:1728
+#: rules/base.xml:1742
 msgid "German (Austria, Macintosh)"
 msgstr "Alemão (Áustria, Macintosh)"
 
-#: rules/base.xml:1738
+#: rules/base.xml:1752
 msgid "English (Australian)"
 msgstr "Inglês (Australiano)"
 
 #. Keyboard indicator for Azerbaijani layouts
-#: rules/base.xml:1748
+#: rules/base.xml:1762
 msgid "az"
 msgstr "az"
 
-#: rules/base.xml:1749
+#: rules/base.xml:1763
 msgid "Azerbaijani"
 msgstr "Azerbaijani"
 
-#: rules/base.xml:1758
+#: rules/base.xml:1772
 msgid "Azerbaijani (Cyrillic)"
 msgstr "Azerbaijani (Cirílico)"
 
 #. Keyboard indicator for Belarusian layouts
-#: rules/base.xml:1767
+#: rules/base.xml:1781
 msgid "by"
 msgstr "by"
 
-#: rules/base.xml:1768
+#: rules/base.xml:1782
 msgid "Belarusian"
 msgstr "Bielorrusso"
 
-#: rules/base.xml:1777
+#: rules/base.xml:1791
 msgid "Belarusian (legacy)"
 msgstr "Bielorrusso (antigo)"
 
-#: rules/base.xml:1783
+#: rules/base.xml:1797
 msgid "Belarusian (Latin)"
 msgstr "Bielorrusso (Latino)"
 
+#: rules/base.xml:1803
+msgid "Russian (Belarus)"
+msgstr "Russo (Bielorrússia)"
+
+#: rules/base.xml:1809
+msgid "Belarusian (intl.)"
+msgstr "Bielorrusso (intl.)"
+
 #. Keyboard indicator for Belgian layouts
-#: rules/base.xml:1792 rules/base.extras.xml:767
+#: rules/base.xml:1818 rules/base.extras.xml:775
 msgid "be"
 msgstr "be"
 
-#: rules/base.xml:1793 rules/base.extras.xml:768
+#: rules/base.xml:1819 rules/base.extras.xml:776
 msgid "Belgian"
 msgstr "Belga"
 
-#: rules/base.xml:1804
+#: rules/base.xml:1830
 msgid "Belgian (alt.)"
 msgstr "Belga (alt.)"
 
-#: rules/base.xml:1810
-msgid "Belgian (alt., Latin-9 only)"
-msgstr "Belga (alt., Latino-9 só)"
+#: rules/base.xml:1836
+msgid "Belgian (Latin-9 only, alt.)"
+msgstr "Belga (alt., Latin-9 só)"
 
-#: rules/base.xml:1816
-msgid "Belgian (alt., with Sun dead keys)"
-msgstr "Belga (alt., com Sun + teclas mortas)"
+#: rules/base.xml:1842
+msgid "Belgian (Sun dead keys, alt.)"
+msgstr "Belga (teclas mortas Sun, alt.)"
 
-#: rules/base.xml:1822
-msgid "Belgian (alt. ISO)"
-msgstr "Belga (alt. ISO)"
+#: rules/base.xml:1848
+msgid "Belgian (ISO, alt.)"
+msgstr "Belga (ISO, alt.)"
 
-#: rules/base.xml:1828
+#: rules/base.xml:1854
 msgid "Belgian (no dead keys)"
 msgstr "Belga (sem teclas mortas)"
 
-#: rules/base.xml:1834
-msgid "Belgian (with Sun dead keys)"
-msgstr "Belga (com Sun + teclas mortas)"
+#: rules/base.xml:1860
+msgid "Belgian (Sun dead keys)"
+msgstr "Belga (teclas mortas Sun)"
 
-#: rules/base.xml:1840
+#: rules/base.xml:1866
 msgid "Belgian (Wang 724 AZERTY)"
 msgstr "Belga (Wang 724 AZERTY)"
 
 #. Keyboard indicator for Bangla layouts
-#: rules/base.xml:1849 rules/base.xml:1878 rules/base.xml:1891
+#: rules/base.xml:1875 rules/base.xml:1904 rules/base.xml:1917
 msgid "bn"
 msgstr "bn"
 
-#: rules/base.xml:1850
+#: rules/base.xml:1876
 msgid "Bangla"
 msgstr "Bangla"
 
-#: rules/base.xml:1861
+#: rules/base.xml:1887
 msgid "Bangla (Probhat)"
 msgstr "Bangla (Probhat)"
 
 #. Keyboard indicator for Indian layouts
-#: rules/base.xml:1870
+#: rules/base.xml:1896 rules/base.extras.xml:1285
 msgid "in"
 msgstr "in"
 
-#: rules/base.xml:1871
+#: rules/base.xml:1897 rules/base.extras.xml:1286
 msgid "Indian"
 msgstr "Índiano"
 
-#: rules/base.xml:1879
+#: rules/base.xml:1905
 msgid "Bangla (India)"
 msgstr "Bangla (Índia)"
 
-#: rules/base.xml:1892
+#: rules/base.xml:1918
 msgid "Bangla (India, Probhat)"
 msgstr "Bangla (Índia, Probhat)"
 
-#: rules/base.xml:1903
+#: rules/base.xml:1929
 msgid "Bangla (India, Baishakhi)"
 msgstr "Bangla (Índia, Baishakhi)"
 
-#: rules/base.xml:1914
+#: rules/base.xml:1940
 msgid "Bangla (India, Bornona)"
 msgstr "Bangla (Índia, Bornona)"
 
-#: rules/base.xml:1925
-msgid "Bangla (India, Uni Gitanjali)"
-msgstr "Bangla (Índia, Uni Gitanjali)"
+#: rules/base.xml:1951
+msgid "Bangla (India, Gitanjali)"
+msgstr "Bangla (Índia, Gitanjali)"
 
-#: rules/base.xml:1936
+#: rules/base.xml:1962
 msgid "Bangla (India, Baishakhi Inscript)"
 msgstr "Bangla (Índia, Baishakhi Inscript)"
 
-#: rules/base.xml:1947
+#: rules/base.xml:1973
 msgid "Manipuri (Eeyek)"
 msgstr "Manipuri (Eeyek)"
 
 #. Keyboard indicator for Gujarati layouts
-#: rules/base.xml:1957
+#: rules/base.xml:1983
 msgid "gu"
 msgstr "gu"
 
-#: rules/base.xml:1958
+#: rules/base.xml:1984
 msgid "Gujarati"
 msgstr "Gujarati"
 
 #. Keyboard indicator for Punjabi layouts
-#: rules/base.xml:1968 rules/base.xml:1979
+#: rules/base.xml:1994 rules/base.xml:2005
 msgid "pa"
 msgstr "pa"
 
-#: rules/base.xml:1969
+#: rules/base.xml:1995
 msgid "Punjabi (Gurmukhi)"
 msgstr "Punjabi (Gurmukhi)"
 
-#: rules/base.xml:1980
+#: rules/base.xml:2006
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Punjabi (Gurmukhi Jhelum)"
 
 #. Keyboard indicator for Kannada layouts
-#: rules/base.xml:1990 rules/base.xml:2001
+#: rules/base.xml:2016 rules/base.xml:2027
 msgid "kn"
 msgstr "kn"
 
-#: rules/base.xml:1991
+#: rules/base.xml:2017
 msgid "Kannada"
 msgstr "Kannada"
 
-#: rules/base.xml:2002
-msgid "Kannada (KaGaPa phonetic)"
+#: rules/base.xml:2028
+msgid "Kannada (KaGaPa, phonetic)"
 msgstr "Kannada (KaGaPa fonético)"
 
 #. Keyboard indicator for Malayalam layouts
-#: rules/base.xml:2012 rules/base.xml:2023 rules/base.xml:2034
+#: rules/base.xml:2038 rules/base.xml:2049 rules/base.xml:2060
 msgid "ml"
 msgstr "ml"
 
-#: rules/base.xml:2013
+#: rules/base.xml:2039
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: rules/base.xml:2024
+#: rules/base.xml:2050
 msgid "Malayalam (Lalitha)"
 msgstr "Malayalam (Lalitha)"
 
-#: rules/base.xml:2035
+#: rules/base.xml:2061
 msgid "Malayalam (enhanced Inscript, with rupee)"
 msgstr "Malayalam (Inscript melhorado, com rupia)"
 
 #. Keyboard indicator for Oriya layouts
-#: rules/base.xml:2045
+#: rules/base.xml:2071
 msgid "or"
 msgstr "or"
 
-#: rules/base.xml:2046
+#: rules/base.xml:2072
 msgid "Oriya"
 msgstr "Oriya"
 
 #. Keyboard indicator for Ol Chiki layouts
-#: rules/base.xml:2058
+#: rules/base.xml:2084
 msgid "sat"
 msgstr "sat"
 
-#: rules/base.xml:2059
+#: rules/base.xml:2085
 msgid "Ol Chiki"
 msgstr "Ol Chiki"
 
 #. Keyboard indicator for Tamil layouts
-#: rules/base.xml:2070 rules/base.xml:2081 rules/base.xml:2092
-#: rules/base.xml:2103 rules/base.xml:2114 rules/base.xml:5315
+#: rules/base.xml:2096 rules/base.xml:2107 rules/base.xml:2118
+#: rules/base.xml:2129 rules/base.xml:2140 rules/base.xml:5341
 msgid "ta"
 msgstr "ta"
 
-#: rules/base.xml:2071
+#: rules/base.xml:2097
 msgid "Tamil (TamilNet '99)"
 msgstr "Tamil (TamilNet \"99)"
 
-#: rules/base.xml:2082
+#: rules/base.xml:2108
 msgid "Tamil (TamilNet '99 with Tamil numerals)"
 msgstr "Tamil (TamilNet \"99 com algarismos Tamil)"
 
-#: rules/base.xml:2093
+#: rules/base.xml:2119
 msgid "Tamil (TamilNet '99, TAB encoding)"
 msgstr "Tamil (TamilNet \"99, codificação TAB)"
 
-#: rules/base.xml:2104
+#: rules/base.xml:2130
 msgid "Tamil (TamilNet '99, TSCII encoding)"
 msgstr "Tamil (TamilNet \"99, codificação TSCII)"
 
-#: rules/base.xml:2115
+#: rules/base.xml:2141
 msgid "Tamil (Inscript)"
 msgstr "Tamil (Inscript)"
 
 #. Keyboard indicator for Telugu layouts
-#: rules/base.xml:2125 rules/base.xml:2136 rules/base.xml:2147
-#: rules/base.xml:2158
+#: rules/base.xml:2151 rules/base.xml:2162 rules/base.xml:2173
+#: rules/base.xml:2184
 msgid "te"
 msgstr "te"
 
-#: rules/base.xml:2126
+#: rules/base.xml:2152
 msgid "Telugu"
 msgstr "Telugu"
 
-#: rules/base.xml:2137 rules/base.xml:2159
-msgid "Telugu (KaGaPa phonetic)"
+#: rules/base.xml:2163 rules/base.xml:2185
+msgid "Telugu (KaGaPa, phonetic)"
 msgstr "Telugu (KaGaPa fonético)"
 
-#: rules/base.xml:2148
+#: rules/base.xml:2174
 msgid "Telugu (Sarala)"
 msgstr "Telugu (Sarala)"
 
 #. Keyboard indicator for Urdu layouts
-#: rules/base.xml:2169 rules/base.xml:2180 rules/base.xml:2191
-#: rules/base.xml:5765
+#: rules/base.xml:2195 rules/base.xml:2206 rules/base.xml:2217
+#: rules/base.xml:5791
 msgid "ur"
 msgstr "ur"
 
-#: rules/base.xml:2170
+#: rules/base.xml:2196
 msgid "Urdu (phonetic)"
 msgstr "Urdu (fonético)"
 
-#: rules/base.xml:2181
+#: rules/base.xml:2207
 msgid "Urdu (alt. phonetic)"
 msgstr "Urdu (alt. fonético)"
 
-#: rules/base.xml:2192
-msgid "Urdu (Win keys)"
-msgstr "Urdu (teclas Win)"
+#: rules/base.xml:2218
+msgid "Urdu (Windows)"
+msgstr "Urdu (Windows)"
 
 #. Keyboard indicator for Hindi layouts
-#: rules/base.xml:2202 rules/base.xml:2213 rules/base.xml:2224
+#: rules/base.xml:2228 rules/base.xml:2239 rules/base.xml:2250
 msgid "hi"
 msgstr "hi"
 
-#: rules/base.xml:2203
+#: rules/base.xml:2229
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (Bolnagri)"
 
-#: rules/base.xml:2214
+#: rules/base.xml:2240
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: rules/base.xml:2225
-msgid "Hindi (KaGaPa phonetic)"
+#: rules/base.xml:2251
+msgid "Hindi (KaGaPa, phonetic)"
 msgstr "Hindi (KaGaPa fonético)"
 
 #. Keyboard indicator for Sanskrit layouts
-#: rules/base.xml:2235
+#: rules/base.xml:2261
 msgid "sa"
 msgstr "sa"
 
-#: rules/base.xml:2236
-msgid "Sanskrit (KaGaPa phonetic)"
+#: rules/base.xml:2262
+msgid "Sanskrit (KaGaPa, phonetic)"
 msgstr "Sânscrito (KaGaPa fonético)"
 
 #. Keyboard indicator for Marathi layouts
-#: rules/base.xml:2246
+#: rules/base.xml:2272 rules/base.extras.xml:1292
 msgid "mr"
 msgstr "mr"
 
-#: rules/base.xml:2247
-msgid "Marathi (KaGaPa phonetic)"
+#: rules/base.xml:2273
+msgid "Marathi (KaGaPa, phonetic)"
 msgstr "Marathi (KaGaPa fonético)"
 
-#: rules/base.xml:2258
+#: rules/base.xml:2284
 msgid "English (India, with rupee)"
 msgstr "Inglês (Índia, com rupia)"
 
 #. Keyboard indicator for Bosnian layouts
-#: rules/base.xml:2270
+#: rules/base.xml:2296
 msgid "bs"
 msgstr "bs"
 
-#: rules/base.xml:2271
+#: rules/base.xml:2297
 msgid "Bosnian"
 msgstr "Bósnio"
 
-#: rules/base.xml:2280
+#: rules/base.xml:2306
 msgid "Bosnian (with guillemets)"
 msgstr "Bósnio (com aspas angulares)"
 
-#: rules/base.xml:2286
+#: rules/base.xml:2312
 msgid "Bosnian (with Bosnian digraphs)"
 msgstr "Bósnio (com dígrafos bósnios)"
 
-#: rules/base.xml:2292
+#: rules/base.xml:2318
 msgid "Bosnian (US, with Bosnian digraphs)"
 msgstr "Bósnio (EUA, com dígrafos bósnios)"
 
-#: rules/base.xml:2298
-msgid "Bosnian (US, with Bosnian letters)"
-msgstr "Bósnio (EUA, com letras bósnias)"
+#: rules/base.xml:2324
+msgid "Bosnian (US)"
+msgstr "Bósnio (US)"
 
 #. Keyboard indicator for Portuguese layouts
-#: rules/base.xml:2307 rules/base.xml:4568 rules/base.extras.xml:782
-#: rules/base.extras.xml:1024 rules/base.extras.xml:1039
+#: rules/base.xml:2333 rules/base.xml:4594 rules/base.extras.xml:790
+#: rules/base.extras.xml:1032 rules/base.extras.xml:1047
 msgid "pt"
 msgstr "pt"
 
-#: rules/base.xml:2308 rules/base.extras.xml:783
+#: rules/base.xml:2334 rules/base.extras.xml:791
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: rules/base.xml:2317
+#: rules/base.xml:2343
 msgid "Portuguese (Brazil, no dead keys)"
 msgstr "Português (Brasil, sem teclas mortas)"
 
-#: rules/base.xml:2323
+#: rules/base.xml:2349
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Português (Brasil, Dvorak)"
 
-#: rules/base.xml:2329
+#: rules/base.xml:2355
 msgid "Portuguese (Brazil, Nativo)"
 msgstr "Português (Brasil, Nativo)"
 
-#: rules/base.xml:2335
+#: rules/base.xml:2361
 msgid "Portuguese (Brazil, Nativo for US keyboards)"
 msgstr "Português (Brasil, Nativo para teclados EUA)"
 
-#: rules/base.xml:2341
+#: rules/base.xml:2367
 msgid "Esperanto (Brazil, Nativo)"
 msgstr "Esperanto (Brasil, Nativo)"
 
-#: rules/base.xml:2350
+#: rules/base.xml:2376
 msgid "Portuguese (Brazil, IBM/Lenovo ThinkPad)"
 msgstr "Português (Brasil, IBM/Lenovo ThinkPad)"
 
 #. Keyboard indicator for Bulgarian layouts
-#: rules/base.xml:2359
+#: rules/base.xml:2385
 msgid "bg"
 msgstr "bg"
 
-#: rules/base.xml:2360
+#: rules/base.xml:2386
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: rules/base.xml:2369
+#: rules/base.xml:2395
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Búlgaro (tradicional, fonético)"
 
-#: rules/base.xml:2375
+#: rules/base.xml:2401
 msgid "Bulgarian (new phonetic)"
 msgstr "Búlgaro (novo, fonético)"
 
-#: rules/base.xml:2383
+#: rules/base.xml:2409
 msgid "la"
 msgstr "la"
 
-#: rules/base.xml:2384
+#: rules/base.xml:2410
 msgid "Berber (Algeria, Latin)"
 msgstr "Berber (Algéria, Latino)"
 
 #. Keyboard indicator for Berber layouts
-#: rules/base.xml:2390 rules/base.xml:2432 rules/base.xml:2443
-#: rules/base.xml:2454 rules/base.xml:2465 rules/base.xml:2476
-#: rules/base.xml:2487
+#: rules/base.xml:2416 rules/base.xml:2458 rules/base.xml:2469
+#: rules/base.xml:2480 rules/base.xml:2491 rules/base.xml:2502
+#: rules/base.xml:2513
 msgid "ber"
 msgstr "ber"
 
-#: rules/base.xml:2391
+#: rules/base.xml:2417
 msgid "Berber (Algeria, Tifinagh)"
 msgstr "Berber (Algéria, Tifinagh)"
 
-#: rules/base.xml:2401
+#: rules/base.xml:2427
 msgid "Arabic (Algeria)"
 msgstr "Árabe (Algéria)"
 
-#: rules/base.xml:2414
+#: rules/base.xml:2440
 msgid "Arabic (Morocco)"
 msgstr "Árabe (Marrocos)"
 
 #. Keyboard indicator for French layouts
-#: rules/base.xml:2421 rules/base.xml:2628 rules/base.xml:2639
-#: rules/base.xml:2647 rules/base.xml:2697 rules/base.xml:3223
-#: rules/base.xml:3453 rules/base.xml:5169 rules/base.xml:5180
-#: rules/base.xml:5191 rules/base.xml:5202 rules/base.xml:6000
-#: rules/base.extras.xml:63 rules/base.extras.xml:908
+#: rules/base.xml:2447 rules/base.xml:2654 rules/base.xml:2665
+#: rules/base.xml:2673 rules/base.xml:2723 rules/base.xml:3249
+#: rules/base.xml:3479 rules/base.xml:5195 rules/base.xml:5206
+#: rules/base.xml:5217 rules/base.xml:5228 rules/base.xml:6026
+#: rules/base.extras.xml:63 rules/base.extras.xml:916
 msgid "fr"
 msgstr "fr"
 
-#: rules/base.xml:2422
+#: rules/base.xml:2448
 msgid "French (Morocco)"
 msgstr "Francês (Marrocos)"
 
-#: rules/base.xml:2433
+#: rules/base.xml:2459
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berber (Marrocos, Tifinagh)"
 
-#: rules/base.xml:2444
+#: rules/base.xml:2470
 msgid "Berber (Morocco, Tifinagh alt.)"
 msgstr "Berber (Marrocos, Tifinagh alt.)"
 
-#: rules/base.xml:2455
-msgid "Berber (Morocco, Tifinagh alt. phonetic)"
-msgstr "Berber (Marrocos, Tifinagh alt. fonético)"
+#: rules/base.xml:2481
+msgid "Berber (Morocco, Tifinagh phonetic, alt.)"
+msgstr "Berber (Marrocos, Tifinagh fonético, alt.)"
 
-#: rules/base.xml:2466
+#: rules/base.xml:2492
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berber (Marrocos, Tifinagh estendido)"
 
-#: rules/base.xml:2477
+#: rules/base.xml:2503
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berber (Marrocos, Tifinagh fonético)"
 
-#: rules/base.xml:2488
+#: rules/base.xml:2514
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berber (Marrocos, Tifinagh estendido fonético)"
 
 #. Keyboard indicator for Cameroon layouts
-#: rules/base.xml:2500 rules/base.extras.xml:1253
+#: rules/base.xml:2526 rules/base.extras.xml:1261
 msgid "cm"
 msgstr "cm"
 
-#: rules/base.xml:2501 rules/base.extras.xml:1254
+#: rules/base.xml:2527 rules/base.extras.xml:1262
 msgid "English (Cameroon)"
 msgstr "Inglês (Camarões)"
 
-#: rules/base.xml:2510
+#: rules/base.xml:2536
 msgid "French (Cameroon)"
 msgstr "Francês (Camarões)"
 
-#: rules/base.xml:2519
-msgid "Cameroon Multilingual (QWERTY)"
-msgstr "Camarões Multilingue (QWERTY)"
+#: rules/base.xml:2545
+msgid "Cameroon Multilingual (QWERTY, intl.)"
+msgstr "Camarões Multilingue (QWERTY, intl.)"
 
-#: rules/base.xml:2556
-msgid "Cameroon Multilingual (AZERTY)"
-msgstr "Camarões Multilingue (AZERTY)"
+#: rules/base.xml:2582
+msgid "Cameroon (AZERTY, intl.)"
+msgstr "Camarões Multilingue (AZERTY, intl.)"
 
-#: rules/base.xml:2593
-msgid "Cameroon Multilingual (Dvorak)"
-msgstr "Camarões Multilingue (Dvorak)"
+#: rules/base.xml:2619
+msgid "Cameroon (Dvorak, intl.)"
+msgstr "Inglês (Dvorak, intl.)"
 
-#: rules/base.xml:2599 rules/base.extras.xml:1260
+#: rules/base.xml:2625 rules/base.extras.xml:1268
 msgid "Mmuock"
 msgstr "Mmuock"
 
 #. Keyboard indicator for Burmese layouts
-#: rules/base.xml:2608
+#: rules/base.xml:2634
 msgid "my"
 msgstr "my"
 
-#: rules/base.xml:2609
+#: rules/base.xml:2635
 msgid "Burmese"
 msgstr "Birmanês"
 
-#: rules/base.xml:2618
+#: rules/base.xml:2644
 msgid "zg"
 msgstr "zg"
 
-#: rules/base.xml:2619
+#: rules/base.xml:2645
 msgid "Burmese Zawgyi"
 msgstr "Birmanês Zawgyi"
 
-#: rules/base.xml:2629 rules/base.extras.xml:64
+#: rules/base.xml:2655 rules/base.extras.xml:64
 msgid "French (Canada)"
 msgstr "Francês (Canadá)"
 
-#: rules/base.xml:2640
+#: rules/base.xml:2666
 msgid "French (Canada, Dvorak)"
 msgstr "Francês (Canadá, Dvorak)"
 
-#: rules/base.xml:2648
+#: rules/base.xml:2674
 msgid "French (Canada, legacy)"
 msgstr "Francês (Canadá, antigo)"
 
-#: rules/base.xml:2654
-msgid "Canadian Multilingual"
-msgstr "Canadense Multilingue"
+#: rules/base.xml:2680
+msgid "Canadian (intl.)"
+msgstr "Canadense (intl.)"
 
-#: rules/base.xml:2660
-msgid "Canadian Multilingual (1st part)"
-msgstr "Canadense Multilingue (1ª parte)"
+#: rules/base.xml:2686
+msgid "Canadian (intl., 1st part)"
+msgstr "Canadense Multilingue (intl., 1ª parte)"
 
-#: rules/base.xml:2666
-msgid "Canadian Multilingual (2nd part)"
-msgstr "Canadense Multilingue (2ª parte)"
+#: rules/base.xml:2692
+msgid "Canadian (intl., 2nd part)"
+msgstr "Canadense Multilingue (intl., 2ª parte)"
 
 #. Keyboard indicator for Inuktikut layouts
-#: rules/base.xml:2673
+#: rules/base.xml:2699
 msgid "ike"
 msgstr "ike"
 
-#: rules/base.xml:2674
+#: rules/base.xml:2700
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: rules/base.xml:2685
+#: rules/base.xml:2711
 msgid "English (Canada)"
 msgstr "Inglês (Canadá)"
 
-#: rules/base.xml:2698
+#: rules/base.xml:2724
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Francês (República Democrática do Congo)"
 
 #. Keyboard indicator for Chinese layouts
 #. Keyboard indicator for Taiwanese layouts
-#: rules/base.xml:2709 rules/base.xml:5473
+#: rules/base.xml:2735 rules/base.xml:5499
 msgid "zh"
 msgstr "zh"
 
-#: rules/base.xml:2710
+#: rules/base.xml:2736
 msgid "Chinese"
 msgstr "Chinês"
 
-#: rules/base.xml:2720
+#: rules/base.xml:2746
 msgid "Mongolian (Bichig)"
 msgstr "Mongol (Bichig)"
 
-#: rules/base.xml:2729
-msgid "Mongolian Todo"
-msgstr "Mongol Todo"
+#: rules/base.xml:2755
+msgid "Mongolian (Todo)"
+msgstr "Mongol (Todo)"
 
-#: rules/base.xml:2738
-msgid "Mongolian Xibe"
-msgstr "Mongol Xibe"
+#: rules/base.xml:2764
+msgid "Mongolian (Xibe)"
+msgstr "Mongol (Xibe)"
 
-#: rules/base.xml:2747
-msgid "Mongolian Manchu"
-msgstr "Mongol Manchu"
+#: rules/base.xml:2773
+msgid "Mongolian (Manchu)"
+msgstr "Mongol (Manchu)"
 
-#: rules/base.xml:2756
-msgid "Mongolian Galik"
-msgstr "Mongol Galik"
+#: rules/base.xml:2782
+msgid "Mongolian (Galik)"
+msgstr "Mongol (Galik)"
 
-#: rules/base.xml:2765
-msgid "Mongolian Todo Galik"
-msgstr "Mongol Todo Galik"
+#: rules/base.xml:2791
+msgid "Mongolian (Todo Galik)"
+msgstr "Mongol (Todo Galik)"
 
-#: rules/base.xml:2774
-msgid "Mongolian Manchu Galik"
-msgstr "Manchu Galik mongol"
+#: rules/base.xml:2800
+msgid "Mongolian (Manchu Galik)"
+msgstr "Mongol (Manchu Galik)"
 
-#: rules/base.xml:2784
+#: rules/base.xml:2810
 msgid "Tibetan"
 msgstr "Tibetano"
 
-#: rules/base.xml:2793
+#: rules/base.xml:2819
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetano (com algarismos ASCII)"
 
-#: rules/base.xml:2802
+#: rules/base.xml:2828
 msgid "ug"
 msgstr "ug"
 
-#: rules/base.xml:2803
+#: rules/base.xml:2829
 msgid "Uyghur"
 msgstr "Uyghur"
 
-#: rules/base.xml:2812
-msgid "Hanyu Pinyin (altgr)"
-msgstr "Hanyu Pinyin (altgr)"
+#: rules/base.xml:2838
+msgid "Hanyu Pinyin (with AltGr dead keys)"
+msgstr "Inglês (com teclas mortas AltGr)"
 
 #. Keyboard indicator for Croatian layouts
-#: rules/base.xml:2824
+#: rules/base.xml:2850
 msgid "hr"
 msgstr "hr"
 
-#: rules/base.xml:2825
+#: rules/base.xml:2851
 msgid "Croatian"
 msgstr "Croata"
 
-#: rules/base.xml:2834
+#: rules/base.xml:2860
 msgid "Croatian (with guillemets)"
 msgstr "Croata (com aspas angulares)"
 
-#: rules/base.xml:2840
+#: rules/base.xml:2866
 msgid "Croatian (with Croatian digraphs)"
 msgstr "Croata (com dígrafos croatas)"
 
-#: rules/base.xml:2846
+#: rules/base.xml:2872
 msgid "Croatian (US, with Croatian digraphs)"
 msgstr "Croata (EUA, com dígrafos croatas)"
 
-#: rules/base.xml:2852
-msgid "Croatian (US, with Croatian letters)"
-msgstr "Croata (EUA, com letras croatas)"
+#: rules/base.xml:2878
+msgid "Croatian (US)"
+msgstr "Croata (US)"
 
 #. Keyboard indicator for Chech layouts
-#: rules/base.xml:2861 rules/base.extras.xml:797
+#: rules/base.xml:2887 rules/base.extras.xml:805
 msgid "cs"
 msgstr "cs"
 
-#: rules/base.xml:2862 rules/base.extras.xml:798
+#: rules/base.xml:2888 rules/base.extras.xml:806
 msgid "Czech"
 msgstr "Checo"
 
-#: rules/base.xml:2871
+#: rules/base.xml:2897
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Checo (com tecla &lt;\\\\|&gt;)"
 
-#: rules/base.xml:2877
+#: rules/base.xml:2903
 msgid "Czech (QWERTY)"
 msgstr "Checo (QWERTY)"
 
-#: rules/base.xml:2883
+#: rules/base.xml:2909
 msgid "Czech (QWERTY, extended backslash)"
 msgstr "Checo (QWERTY, estendido barra invertida)"
 
-#: rules/base.xml:2889
+#: rules/base.xml:2915
 msgid "Czech (QWERTY, Macintosh)"
 msgstr "Checo (QWERTY, Macintosh)"
 
-#: rules/base.xml:2895
+#: rules/base.xml:2921
 msgid "Czech (UCW, only accented letters)"
 msgstr "Checo (UCW, só letras acentuadas)"
 
-#: rules/base.xml:2901
+#: rules/base.xml:2927
 msgid "Czech (US, Dvorak, UCW support)"
 msgstr "Checo (EUA, Dvorak, suporte UCW)"
 
-#: rules/base.xml:2909
+#: rules/base.xml:2935
 msgid "Russian (Czech, phonetic)"
 msgstr "Russo (Checo, fonético)"
 
 #. Keyboard indicator for Danish layouts
-#: rules/base.xml:2921 rules/base.extras.xml:836
+#: rules/base.xml:2947 rules/base.extras.xml:844
 msgid "da"
 msgstr "da"
 
-#: rules/base.xml:2922 rules/base.extras.xml:837
+#: rules/base.xml:2948 rules/base.extras.xml:845
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: rules/base.xml:2931
+#: rules/base.xml:2957
 msgid "Danish (no dead keys)"
 msgstr "Dinamarquês (sem teclas mortas)"
 
-#: rules/base.xml:2937
-msgid "Danish (Win keys)"
-msgstr "Dinamarquês (teclas Win)"
+#: rules/base.xml:2963
+msgid "Danish (Windows)"
+msgstr "Dinamarquês (Windows)"
 
-#: rules/base.xml:2943
+#: rules/base.xml:2969
 msgid "Danish (Macintosh)"
 msgstr "Dinamarquês (Macintosh)"
 
-#: rules/base.xml:2949
+#: rules/base.xml:2975
 msgid "Danish (Macintosh, no dead keys)"
 msgstr "Dinamarquês (Macintosh, sem teclas mortas)"
 
-#: rules/base.xml:2955
+#: rules/base.xml:2981
 msgid "Danish (Dvorak)"
 msgstr "Dinamarquês (Dvorak)"
 
 #. Keyboard indicator for Dutch layouts
-#: rules/base.xml:2964 rules/base.extras.xml:851
+#: rules/base.xml:2990 rules/base.extras.xml:859
 msgid "nl"
 msgstr "nl"
 
-#: rules/base.xml:2965 rules/base.extras.xml:852
+#: rules/base.xml:2991 rules/base.extras.xml:860
 msgid "Dutch"
 msgstr "Holandês"
 
-#: rules/base.xml:2974
-msgid "Dutch (with Sun dead keys)"
-msgstr "Holandês (com Sun + teclas mortas)"
+#: rules/base.xml:3000
+msgid "Dutch (Sun dead keys)"
+msgstr "Holandês (teclas mortas Sun)"
 
-#: rules/base.xml:2980
+#: rules/base.xml:3006
 msgid "Dutch (Macintosh)"
 msgstr "Holandês (Macintosh)"
 
-#: rules/base.xml:2986
+#: rules/base.xml:3012
 msgid "Dutch (standard)"
 msgstr "Holandês (padrão)"
 
 #. Keyboard indicator for Dzongkha layouts
-#: rules/base.xml:2995
+#: rules/base.xml:3021
 msgid "dz"
 msgstr "dz"
 
-#: rules/base.xml:2996
+#: rules/base.xml:3022
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
 #. Keyboard indicator for Estonian layouts
-#: rules/base.xml:3006 rules/base.extras.xml:866
+#: rules/base.xml:3032 rules/base.extras.xml:874
 msgid "et"
 msgstr "et"
 
-#: rules/base.xml:3007 rules/base.extras.xml:867
+#: rules/base.xml:3033 rules/base.extras.xml:875
 msgid "Estonian"
 msgstr "Estoniano"
 
-#: rules/base.xml:3016
+#: rules/base.xml:3042
 msgid "Estonian (no dead keys)"
 msgstr "Estoniano (sem teclas mortas)"
 
-#: rules/base.xml:3022
+#: rules/base.xml:3048
 msgid "Estonian (Dvorak)"
 msgstr "Estoniano (Dvorak)"
 
-#: rules/base.xml:3028
-msgid "Estonian (US, with Estonian letters)"
-msgstr "Estoniano (EUA, com letras estonianas)"
+#: rules/base.xml:3054
+msgid "Estonian (US)"
+msgstr "Estoniano (US9)"
 
-#: rules/base.xml:3038 rules/base.extras.xml:227
+#: rules/base.xml:3064 rules/base.extras.xml:235
 msgid "Persian"
 msgstr "Persa"
 
-#: rules/base.xml:3047
+#: rules/base.xml:3073
 msgid "Persian (with Persian keypad)"
 msgstr "Persa (com teclado persa)"
 
 #. Keyboard indicator for Kurdish layouts
-#: rules/base.xml:3054 rules/base.xml:3065 rules/base.xml:3076
-#: rules/base.xml:3087 rules/base.xml:3112 rules/base.xml:3123
-#: rules/base.xml:3134 rules/base.xml:3145 rules/base.xml:5250
-#: rules/base.xml:5261 rules/base.xml:5272 rules/base.xml:5399
-#: rules/base.xml:5410 rules/base.xml:5421
+#: rules/base.xml:3080 rules/base.xml:3091 rules/base.xml:3102
+#: rules/base.xml:3113 rules/base.xml:3138 rules/base.xml:3149
+#: rules/base.xml:3160 rules/base.xml:3171 rules/base.xml:5276
+#: rules/base.xml:5287 rules/base.xml:5298 rules/base.xml:5425
+#: rules/base.xml:5436 rules/base.xml:5447
 msgid "ku"
 msgstr "ku"
 
-#: rules/base.xml:3055
+#: rules/base.xml:3081
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Curdo (Irão, Latino Q)"
 
-#: rules/base.xml:3066
+#: rules/base.xml:3092
 msgid "Kurdish (Iran, F)"
 msgstr "Curdo (Irão, F)"
 
-#: rules/base.xml:3077
+#: rules/base.xml:3103
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Curdo (Irão, Latino Alt-Q)"
 
-#: rules/base.xml:3088
+#: rules/base.xml:3114
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Curdo (Irão, Árabe-Latino)"
 
-#: rules/base.xml:3101
+#: rules/base.xml:3127
 msgid "Iraqi"
 msgstr "Iraqueuiano"
 
-#: rules/base.xml:3113
+#: rules/base.xml:3139
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Curdo (Iraque, Latino Q)"
 
-#: rules/base.xml:3124
+#: rules/base.xml:3150
 msgid "Kurdish (Iraq, F)"
 msgstr "Curdo (Iraque, F)"
 
-#: rules/base.xml:3135
+#: rules/base.xml:3161
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Curdo (Iraque, Latino Alt-Q)"
 
-#: rules/base.xml:3146
+#: rules/base.xml:3172
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Curdo (Iraque, Árabe-Latino)"
 
 #. Keyboard indicator for Faroese layouts
-#: rules/base.xml:3158
+#: rules/base.xml:3184
 msgid "fo"
 msgstr "fo"
 
-#: rules/base.xml:3159
+#: rules/base.xml:3185
 msgid "Faroese"
 msgstr "Faroês"
 
-#: rules/base.xml:3168
+#: rules/base.xml:3194
 msgid "Faroese (no dead keys)"
 msgstr "Faroês (sem teclas mortas)"
 
 #. Keyboard indicator for Finnish layouts
-#: rules/base.xml:3177 rules/base.extras.xml:881
+#: rules/base.xml:3203 rules/base.extras.xml:889
 msgid "fi"
 msgstr "fi"
 
-#: rules/base.xml:3178 rules/base.extras.xml:882
+#: rules/base.xml:3204 rules/base.extras.xml:890
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: rules/base.xml:3187
-msgid "Finnish (Winkeys)"
-msgstr "Finlandês (teclas Win)"
+#: rules/base.xml:3213
+msgid "Finnish (Windows)"
+msgstr "Finlandês (Windows)"
 
-#: rules/base.xml:3193
+#: rules/base.xml:3219
 msgid "Finnish (classic)"
 msgstr "Finlandês (clássico)"
 
-#: rules/base.xml:3199
+#: rules/base.xml:3225
 msgid "Finnish (classic, no dead keys)"
 msgstr "Finlandês (clássico, sem teclas mortas)"
 
-#: rules/base.xml:3205
+#: rules/base.xml:3231
 msgid "Northern Saami (Finland)"
 msgstr "Saami do Norte (Finlândia)"
 
-#: rules/base.xml:3214
+#: rules/base.xml:3240
 msgid "Finnish (Macintosh)"
 msgstr "Finlandês (Macintosh)"
 
-#: rules/base.xml:3224 rules/base.extras.xml:909
+#: rules/base.xml:3250 rules/base.extras.xml:917
 msgid "French"
 msgstr "Francês"
 
-#: rules/base.xml:3233
+#: rules/base.xml:3259
 msgid "French (no dead keys)"
 msgstr "Francês (sem teclas mortas)"
 
-#: rules/base.xml:3239
-msgid "French (with Sun dead keys)"
-msgstr "Francês (com Sun + teclas mortas)"
+#: rules/base.xml:3265
+msgid "French (Sun dead keys)"
+msgstr "Francês (teclas mortas Sun)"
 
-#: rules/base.xml:3245
+#: rules/base.xml:3271
 msgid "French (alt.)"
 msgstr "Francês (alt.)"
 
-#: rules/base.xml:3251
+#: rules/base.xml:3277
 msgid "French (alt., Latin-9 only)"
 msgstr "Francês (alt., Latino-9 só)"
 
-#: rules/base.xml:3257
+#: rules/base.xml:3283
 msgid "French (alt., no dead keys)"
 msgstr "Francês (alt., sem teclas mortas)"
 
-#: rules/base.xml:3263
-msgid "French (alt., with Sun dead keys)"
-msgstr "Francês (alt., com Sun + teclas mortas)"
+#: rules/base.xml:3289
+msgid "French (alt., Sun dead keys)"
+msgstr "Francês (alt., teclas mortas Sun)"
 
-#: rules/base.xml:3269
+#: rules/base.xml:3295
 msgid "French (legacy, alt.)"
 msgstr "Francês (antigo, alt.)"
 
-#: rules/base.xml:3275
+#: rules/base.xml:3301
 msgid "French (legacy, alt., no dead keys)"
 msgstr "Francês (antigo, alt., sem teclas mortas)"
 
-#: rules/base.xml:3281
-msgid "French (legacy, alt., with Sun dead keys)"
-msgstr "Francês (antigo, alt., com Sun + teclas mortas)"
+#: rules/base.xml:3307
+msgid "French (legacy, alt., Sun dead keys)"
+msgstr "Francês (antigo, alt., teclas mortas Sun)"
 
-#: rules/base.xml:3287
-msgid "French (Bepo, ergonomic, Dvorak way)"
-msgstr "Francês (Bepo, ergonónico, Dvorak)"
+#: rules/base.xml:3313
+msgid "French (BEPO)"
+msgstr "Francês (BEPO)"
 
-#: rules/base.xml:3293
-msgid "French (Bepo, ergonomic, Dvorak way, Latin-9 only)"
-msgstr "Francês (Bepo, ergonónico, Dvorak, Latino-9 só)"
+#: rules/base.xml:3319
+msgid "French (BEPO, Latin-9 only)"
+msgstr "Francês (BEPO, Latin-9 só)"
 
-#: rules/base.xml:3299
-msgid "French (Bepo, ergonomic, Dvorak way, AFNOR)"
-msgstr "Francês (Bepo, ergonónico, forma Dvorak, AFNOR)"
+#: rules/base.xml:3325
+msgid "French (BEPO, AFNOR)"
+msgstr "Francês (BEPO, AFNOR)"
 
-#: rules/base.xml:3305
+#: rules/base.xml:3331
 msgid "French (Dvorak)"
 msgstr "Francês (Dvorak)"
 
-#: rules/base.xml:3311
+#: rules/base.xml:3337
 msgid "French (Macintosh)"
 msgstr "Francês (Macintosh)"
 
-#: rules/base.xml:3317
+#: rules/base.xml:3343
 msgid "French (AZERTY)"
 msgstr "Francês (AZERTY)"
 
-#: rules/base.xml:3323
-msgid "French (AFNOR standardized AZERTY)"
-msgstr "Francês (AZERTY padronizado AFNOR)"
+#: rules/base.xml:3349
+msgid "French (AZERTY, AFNOR)"
+msgstr "Francês (AZERTY, AFNOR)"
 
-#: rules/base.xml:3329
+#: rules/base.xml:3355
 msgid "French (Breton)"
 msgstr "Francês (Bretão)"
 
-#: rules/base.xml:3335
+#: rules/base.xml:3361
 msgid "Occitan"
 msgstr "Occitano"
 
-#: rules/base.xml:3344
+#: rules/base.xml:3370
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Geórgiano (França, AZERTY Tskapo)"
 
-#: rules/base.xml:3353
-msgid "French (US, with French letters)"
-msgstr "Francês (EUA, com letras francesas)"
+#: rules/base.xml:3379
+msgid "French (US)"
+msgstr "Francês (US)"
 
-#: rules/base.xml:3363
+#: rules/base.xml:3389
 msgid "English (Ghana)"
 msgstr "Inglês (Ghana)"
 
-#: rules/base.xml:3372
+#: rules/base.xml:3398
 msgid "English (Ghana, multilingual)"
 msgstr "Inglês (Ghana, multilingue)"
 
 #. Keyboard indicator for Akan layouts
-#: rules/base.xml:3379
+#: rules/base.xml:3405
 msgid "ak"
 msgstr "ak"
 
-#: rules/base.xml:3380
+#: rules/base.xml:3406
 msgid "Akan"
 msgstr "Akan"
 
 #. Keyboard indicator for Ewe layouts
-#: rules/base.xml:3390
+#: rules/base.xml:3416
 msgid "ee"
 msgstr "ee"
 
-#: rules/base.xml:3391
+#: rules/base.xml:3417
 msgid "Ewe"
 msgstr "Ewe"
 
 #. Keyboard indicator for Fula layouts
-#: rules/base.xml:3401
+#: rules/base.xml:3427
 msgid "ff"
 msgstr "ff"
 
-#: rules/base.xml:3402
+#: rules/base.xml:3428
 msgid "Fula"
 msgstr "Fula"
 
 #. Keyboard indicator for Ga layouts
-#: rules/base.xml:3412
+#: rules/base.xml:3438
 msgid "gaa"
 msgstr "gaa"
 
-#: rules/base.xml:3413
+#: rules/base.xml:3439
 msgid "Ga"
 msgstr "Ga"
 
 #. Keyboard indicator for Hausa layouts
-#: rules/base.xml:3423 rules/base.xml:5899
+#: rules/base.xml:3449 rules/base.xml:5925
 msgid "ha"
 msgstr "ha"
 
-#: rules/base.xml:3424
+#: rules/base.xml:3450
 msgid "Hausa (Ghana)"
 msgstr "Hausa (Ghana)"
 
 #. Keyboard indicator for Avatime layouts
-#: rules/base.xml:3434
+#: rules/base.xml:3460
 msgid "avn"
 msgstr "avn"
 
-#: rules/base.xml:3435
+#: rules/base.xml:3461
 msgid "Avatime"
 msgstr "Avatime"
 
-#: rules/base.xml:3444
+#: rules/base.xml:3470
 msgid "English (Ghana, GILLBT)"
 msgstr "Inglês (Ghana, GILLBT)"
 
-#: rules/base.xml:3454
+#: rules/base.xml:3480
 msgid "French (Guinea)"
 msgstr "Francês (Guiné)"
 
 #. Keyboard indicator for Georgian layouts
-#: rules/base.xml:3465
+#: rules/base.xml:3491
 msgid "ka"
 msgstr "ka"
 
-#: rules/base.xml:3466
+#: rules/base.xml:3492
 msgid "Georgian"
 msgstr "Geórgiano"
 
-#: rules/base.xml:3475
+#: rules/base.xml:3501
 msgid "Georgian (ergonomic)"
 msgstr "Geórgiano (ergonónico)"
 
-#: rules/base.xml:3481
+#: rules/base.xml:3507
 msgid "Georgian (MESS)"
 msgstr "Geórgiano (MESS)"
 
-#: rules/base.xml:3489
+#: rules/base.xml:3515
 msgid "Russian (Georgia)"
 msgstr "Russo (Geórgia)"
 
-#: rules/base.xml:3498
+#: rules/base.xml:3524
 msgid "Ossetian (Georgia)"
 msgstr "Ossetiano (Geórgia)"
 
-#: rules/base.xml:3511 rules/base.extras.xml:96
+#: rules/base.xml:3537 rules/base.extras.xml:96
 msgid "German"
 msgstr "Alemão"
 
-#: rules/base.xml:3520
+#: rules/base.xml:3546
 msgid "German (dead acute)"
 msgstr "Alemão (morto agudo)"
 
-#: rules/base.xml:3526
+#: rules/base.xml:3552
 msgid "German (dead grave acute)"
 msgstr "Alemão (morto grave agudo)"
 
-#: rules/base.xml:3532
+#: rules/base.xml:3558
 msgid "German (no dead keys)"
 msgstr "Alemão (sem teclas mortas)"
 
-#: rules/base.xml:3538
+#: rules/base.xml:3564
 msgid "German (T3)"
 msgstr "Alemão (T3)"
 
-#: rules/base.xml:3544
+#: rules/base.xml:3570
 msgid "Romanian (Germany)"
 msgstr "Romeno (Alemanha)"
 
-#: rules/base.xml:3553
+#: rules/base.xml:3579
 msgid "Romanian (Germany, no dead keys)"
 msgstr "Romeno (Alemanha, sem teclas mortas)"
 
-#: rules/base.xml:3562
+#: rules/base.xml:3588
 msgid "German (Dvorak)"
 msgstr "Alemão (Dvorak)"
 
-#: rules/base.xml:3568
-msgid "German (with Sun dead keys)"
-msgstr "Alemão (com Sun + teclas mortas)"
+#: rules/base.xml:3594
+msgid "German (Sun dead keys)"
+msgstr "Alemão (teclas mortas Sun)"
 
-#: rules/base.xml:3574
+#: rules/base.xml:3600
 msgid "German (Neo 2)"
 msgstr "Alemão (Neo 2)"
 
-#: rules/base.xml:3580
+#: rules/base.xml:3606
 msgid "German (Macintosh)"
 msgstr "Alemão (Macintosh)"
 
-#: rules/base.xml:3586
+#: rules/base.xml:3612
 msgid "German (Macintosh, no dead keys)"
 msgstr "Alemão (Macintosh, sem teclas mortas)"
 
-#: rules/base.xml:3592
+#: rules/base.xml:3618
 msgid "Lower Sorbian"
 msgstr "Sorábio Inferior"
 
-#: rules/base.xml:3601
+#: rules/base.xml:3627
 msgid "Lower Sorbian (QWERTZ)"
 msgstr "Sorábio Inferior (QWERTZ)"
 
-#: rules/base.xml:3610
+#: rules/base.xml:3636
 msgid "German (QWERTY)"
 msgstr "Alemão (QWERTY)"
 
-#: rules/base.xml:3616
+#: rules/base.xml:3642
 msgid "Turkish (Germany)"
 msgstr "Turco (Alemanha)"
 
-#: rules/base.xml:3627
+#: rules/base.xml:3653
 msgid "Russian (Germany, phonetic)"
 msgstr "Russo (Alemanha, fonético)"
 
-#: rules/base.xml:3636
+#: rules/base.xml:3662
 msgid "German (dead tilde)"
 msgstr "Alemão (til morto)"
 
 #. Keyboard indicator for Greek layouts
-#: rules/base.xml:3645 rules/base.extras.xml:935
+#: rules/base.xml:3671 rules/base.extras.xml:943
 msgid "gr"
 msgstr "gr"
 
-#: rules/base.xml:3646 rules/base.extras.xml:936
+#: rules/base.xml:3672 rules/base.extras.xml:944
 msgid "Greek"
 msgstr "Grego"
 
-#: rules/base.xml:3655
+#: rules/base.xml:3681
 msgid "Greek (simple)"
 msgstr "Grego (simples)"
 
-#: rules/base.xml:3661
+#: rules/base.xml:3687
 msgid "Greek (extended)"
 msgstr "Grego (estendido)"
 
-#: rules/base.xml:3667
+#: rules/base.xml:3693
 msgid "Greek (no dead keys)"
 msgstr "Grego (sem teclas mortas)"
 
-#: rules/base.xml:3673
+#: rules/base.xml:3699
 msgid "Greek (polytonic)"
 msgstr "Grego (politónico)"
 
 #. Keyboard indicator for Hungarian layouts
-#: rules/base.xml:3682
+#: rules/base.xml:3708
 msgid "hu"
 msgstr "hu"
 
-#: rules/base.xml:3683 rules/base.extras.xml:211
+#: rules/base.xml:3709 rules/base.extras.xml:211
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: rules/base.xml:3692
+#: rules/base.xml:3718
 msgid "Hungarian (standard)"
 msgstr "Húngaro (padrão)"
 
-#: rules/base.xml:3698
+#: rules/base.xml:3724
 msgid "Hungarian (no dead keys)"
 msgstr "Húngaro (sem teclas mortas)"
 
-#: rules/base.xml:3704
+#: rules/base.xml:3730
 msgid "Hungarian (QWERTY)"
 msgstr "Húngaro (QWERTY)"
 
-#: rules/base.xml:3710
-msgid "Hungarian (101/QWERTZ/comma/dead keys)"
-msgstr "Húngaro (101/QWERTZ/vírgula/teclas mortas)"
+#: rules/base.xml:3736
+msgid "Hungarian (QWERTZ, 101-key, comma, dead keys)"
+msgstr "Húngaro (QWERTZ, 101 teclas, vírgula, teclas mortas)"
 
-#: rules/base.xml:3716
-msgid "Hungarian (101/QWERTZ/comma/no dead keys)"
-msgstr "Húngaro (101/QWERTZ/vírgula/sem teclas mortas)"
+#: rules/base.xml:3742
+msgid "Hungarian (QWERTZ, 101-key, comma, no dead keys)"
+msgstr "Húngaro (QWERTZ, 101 teclas, vírgula, sem teclas mortas)"
 
-#: rules/base.xml:3722
-msgid "Hungarian (101/QWERTZ/dot/dead keys)"
-msgstr "Húngaro (101/QWERTZ/ponto/teclas mortas)"
+#: rules/base.xml:3748
+msgid "Hungarian (QWERTZ, 101-key, dot, dead keys)"
+msgstr "Húngaro (QWERTZ, 101 teclas, ponto, teclas mortas)"
 
-#: rules/base.xml:3728
-msgid "Hungarian (101/QWERTZ/dot/no dead keys)"
-msgstr "Húngaro (101/QWERTZ/ponto/sem teclas mortas)"
+#: rules/base.xml:3754
+msgid "Hungarian (QWERTZ, 101-key, dot, no dead keys)"
+msgstr "Húngaro (QWERTZ, 101 teclas, ponto, sem teclas mortas)"
 
-#: rules/base.xml:3734
-msgid "Hungarian (101/QWERTY/comma/dead keys)"
-msgstr "Húngaro (101/QWERTY/vírgula/teclas mortas)"
+#: rules/base.xml:3760
+msgid "Hungarian (QWERTY, 101-key, comma, dead keys)"
+msgstr "Húngaro (QWERTY, 101 teclas, vírgula, teclas mortas)"
 
-#: rules/base.xml:3740
-msgid "Hungarian (101/QWERTY/comma/no dead keys)"
-msgstr "Húngaro (101/QWERTY/vírgula/sem teclas mortas)"
+#: rules/base.xml:3766
+msgid "Hungarian (QWERTY, 101-key, comma, no dead keys)"
+msgstr "Húngaro (QWERTY, 101 teclas, vírgula, sem teclas mortas)"
 
-#: rules/base.xml:3746
-msgid "Hungarian (101/QWERTY/dot/dead keys)"
-msgstr "Húngaro (101/QWERTY/ponto/teclas mortas)"
+#: rules/base.xml:3772
+msgid "Hungarian (QWERTY, 101-key, dot, dead keys)"
+msgstr "Húngaro (QWERTY, 101 teclas, ponto, teclas mortas)"
 
-#: rules/base.xml:3752
-msgid "Hungarian (101/QWERTY/dot/no dead keys)"
-msgstr "Húngaro (101/QWERTY/ponto/sem teclas mortas)"
+#: rules/base.xml:3778
+msgid "Hungarian (QWERTY, 101-key, dot, no dead keys)"
+msgstr "Húngaro (QWERTY, 101 teclas, ponto, sem teclas mortas)"
 
-#: rules/base.xml:3758
-msgid "Hungarian (102/QWERTZ/comma/dead keys)"
-msgstr "Húngaro (102/QWERTZ/vírgula/teclas mortas)"
+#: rules/base.xml:3784
+msgid "Hungarian (QWERTZ, 102-key, comma, dead keys)"
+msgstr "Húngaro (QWERTZ, 102 teclas, vírgula, teclas mortas)"
 
-#: rules/base.xml:3764
-msgid "Hungarian (102/QWERTZ/comma/no dead keys)"
-msgstr "Húngaro (102/QWERTZ/vírgula/sem teclas mortas)"
+#: rules/base.xml:3790
+msgid "Hungarian (QWERTZ, 102-key, comma, no dead keys)"
+msgstr "Húngaro (QWERTZ, 102 teclas, vírgula, sem teclas mortas)"
 
-#: rules/base.xml:3770
-msgid "Hungarian (102/QWERTZ/dot/dead keys)"
-msgstr "Húngaro (102/QWERTZ/ponto/teclas mortas)"
+#: rules/base.xml:3796
+msgid "Hungarian (QWERTZ, 102-key, dot, dead keys)"
+msgstr "Húngaro (QWERTZ, 102 teclas, ponto, teclas mortas)"
 
-#: rules/base.xml:3776
-msgid "Hungarian (102/QWERTZ/dot/no dead keys)"
-msgstr "Húngaro (102/QWERTZ/ponto/sem teclas mortas)"
+#: rules/base.xml:3802
+msgid "Hungarian (QWERTZ, 102-key, dot, no dead keys)"
+msgstr "Húngaro (QWERTZ, 102 teclas, ponto, sem teclas mortas)"
 
-#: rules/base.xml:3782
-msgid "Hungarian (102/QWERTY/comma/dead keys)"
-msgstr "Húngaro (102/QWERTY/vírgula/teclas mortas)"
+#: rules/base.xml:3808
+msgid "Hungarian (QWERTY, 102-key, comma, dead keys)"
+msgstr "Húngaro (QWERTY, 102 teclas, vírgula, teclas mortas)"
 
-#: rules/base.xml:3788
-msgid "Hungarian (102/QWERTY/comma/no dead keys)"
-msgstr "Húngaro (102/QWERTY/vírgula/sem teclas mortas)"
+#: rules/base.xml:3814
+msgid "Hungarian (QWERTY, 102-key, comma, no dead keys)"
+msgstr "Húngaro (QWERTY, 102 teclas, vírgula, sem teclas mortas)"
 
-#: rules/base.xml:3794
-msgid "Hungarian (102/QWERTY/dot/dead keys)"
-msgstr "Húngaro (102/QWERTY/ponto/teclas mortas)"
+#: rules/base.xml:3820
+msgid "Hungarian (QWERTY, 102-key, dot, dead keys)"
+msgstr "Húngaro (QWERTY, 102 teclas, ponto, teclas mortas)"
 
-#: rules/base.xml:3800
-msgid "Hungarian (102/QWERTY/dot/no dead keys)"
-msgstr "Húngaro (102/QWERTY/ponto/sem teclas mortas)"
+#: rules/base.xml:3826
+msgid "Hungarian (QWERTY, 102-key, dot, no dead keys)"
+msgstr "Húngaro (QWERTY, 102 teclas, ponto, sem teclas mortas)"
 
 #. Keyboard indicator for Icelandic layouts
-#: rules/base.xml:3809
+#: rules/base.xml:3835
 msgid "is"
 msgstr "is"
 
-#: rules/base.xml:3810
+#: rules/base.xml:3836
 msgid "Icelandic"
 msgstr "Islandês"
 
-#: rules/base.xml:3819
-msgid "Icelandic (with Sun dead keys)"
-msgstr "Islandês (com Sun + teclas mortas)"
+#: rules/base.xml:3845
+msgid "Icelandic (Sun dead keys)"
+msgstr "Islandês (teclas mortas Sun)"
 
-#: rules/base.xml:3825
+#: rules/base.xml:3851
 msgid "Icelandic (no dead keys)"
 msgstr "Islandês (sem teclas mortas)"
 
-#: rules/base.xml:3831
+#: rules/base.xml:3857
 msgid "Icelandic (Macintosh, legacy)"
 msgstr "Islandês (Macintosh, antigo)"
 
-#: rules/base.xml:3837
+#: rules/base.xml:3863
 msgid "Icelandic (Macintosh)"
 msgstr "Islandês (Macintosh)"
 
-#: rules/base.xml:3843
+#: rules/base.xml:3869
 msgid "Icelandic (Dvorak)"
 msgstr "Islandês (Dvorak)"
 
 #. Keyboard indicator for Hebrew layouts
-#: rules/base.xml:3852 rules/base.extras.xml:713
+#: rules/base.xml:3878 rules/base.extras.xml:721
 msgid "he"
 msgstr "he"
 
-#: rules/base.xml:3853 rules/base.extras.xml:714
+#: rules/base.xml:3879 rules/base.extras.xml:722
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: rules/base.xml:3862
+#: rules/base.xml:3888
 msgid "Hebrew (lyx)"
 msgstr "Hebreu (lyx)"
 
-#: rules/base.xml:3868
+#: rules/base.xml:3894
 msgid "Hebrew (phonetic)"
 msgstr "Hebreu (fonético)"
 
-#: rules/base.xml:3874
+#: rules/base.xml:3900
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hebreu (bíblico, Tiro)"
 
 #. Keyboard indicator for Italian layouts
-#: rules/base.xml:3883 rules/base.extras.xml:956
+#: rules/base.xml:3909 rules/base.extras.xml:964
 msgid "it"
 msgstr "it"
 
-#: rules/base.xml:3884 rules/base.extras.xml:957
+#: rules/base.xml:3910 rules/base.extras.xml:965
 msgid "Italian"
 msgstr "Italiano"
 
-#: rules/base.xml:3893
+#: rules/base.xml:3919
 msgid "Italian (no dead keys)"
 msgstr "Italiano (sem teclas mortas)"
 
-#: rules/base.xml:3899
-msgid "Italian (Winkeys)"
-msgstr "Italiano (teclas Win)"
+#: rules/base.xml:3925
+msgid "Italian (Windows)"
+msgstr "Italiano (Windows)"
 
-#: rules/base.xml:3905
+#: rules/base.xml:3931
 msgid "Italian (Macintosh)"
 msgstr "Italiano (Macintosh)"
 
-#: rules/base.xml:3911
-msgid "Italian (US, with Italian letters)"
-msgstr "Italiano (EUA, com letras italianas)"
+#: rules/base.xml:3937
+msgid "Italian (US)"
+msgstr "Italiano (US)"
 
-#: rules/base.xml:3917
+#: rules/base.xml:3943
 msgid "Georgian (Italy)"
 msgstr "Geórgiano (Itália)"
 
-#: rules/base.xml:3926
+#: rules/base.xml:3952
 msgid "Italian (IBM 142)"
 msgstr "Italiano (IBM 142)"
 
-#: rules/base.xml:3932
+#: rules/base.xml:3958
 msgid "Italian (intl., with dead keys)"
 msgstr "Italiano (intl., com teclas mortas)"
 
-#: rules/base.xml:3948
+#: rules/base.xml:3974
 msgid "Sicilian"
 msgstr "Siciliano"
 
-#: rules/base.xml:3958
+#: rules/base.xml:3984
 msgid "Friulian (Italy)"
 msgstr "Friuliano (Italy)"
 
 #. Keyboard indicator for Japaneses
-#: rules/base.xml:3970 rules/base.xml:5705 rules/base.extras.xml:982
+#: rules/base.xml:3996 rules/base.xml:5731 rules/base.extras.xml:990
 msgid "ja"
 msgstr "ja"
 
-#: rules/base.xml:3971 rules/base.extras.xml:983
+#: rules/base.xml:3997 rules/base.extras.xml:991
 msgid "Japanese"
 msgstr "Japonês"
 
-#: rules/base.xml:3980
+#: rules/base.xml:4006
 msgid "Japanese (Kana)"
 msgstr "Japonês (Kana)"
 
-#: rules/base.xml:3986
+#: rules/base.xml:4012
 msgid "Japanese (Kana 86)"
 msgstr "Japonês (Kana 86)"
 
-#: rules/base.xml:3992
+#: rules/base.xml:4018
 msgid "Japanese (OADG 109A)"
 msgstr "Japonês (OADG 109A)"
 
-#: rules/base.xml:3998
+#: rules/base.xml:4024
 msgid "Japanese (Macintosh)"
 msgstr "Japonês (Macintosh)"
 
-#: rules/base.xml:4004
+#: rules/base.xml:4030
 msgid "Japanese (Dvorak)"
 msgstr "Japonês (Dvorak)"
 
 #. Keyboard indicator for Kyrgyz layouts
 #. Keyboard indicator for Kikuyu layouts
-#: rules/base.xml:4013 rules/base.xml:6084
+#: rules/base.xml:4039 rules/base.xml:6110
 msgid "ki"
 msgstr "ki"
 
-#: rules/base.xml:4014
+#: rules/base.xml:4040
 msgid "Kyrgyz"
 msgstr "Kyrgyz"
 
-#: rules/base.xml:4023
+#: rules/base.xml:4049
 msgid "Kyrgyz (phonetic)"
 msgstr "Kyrgyz (fonético)"
 
 #. Keyboard indicator for Khmer layouts
-#: rules/base.xml:4032
+#: rules/base.xml:4058
 msgid "km"
 msgstr "km"
 
-#: rules/base.xml:4033
+#: rules/base.xml:4059
 msgid "Khmer (Cambodia)"
 msgstr "Khmer (Cambodja)"
 
 #. Keyboard indicator for Kazakh layouts
-#: rules/base.xml:4044
+#: rules/base.xml:4070
 msgid "kk"
 msgstr "kk"
 
-#: rules/base.xml:4045
+#: rules/base.xml:4071
 msgid "Kazakh"
 msgstr "Kazakh"
 
-#: rules/base.xml:4056
+#: rules/base.xml:4082
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Russo (Kazakhstan, com Kazakh)"
 
-#: rules/base.xml:4066
+#: rules/base.xml:4092
 msgid "Kazakh (with Russian)"
 msgstr "Kazakh (com Russo)"
 
-#: rules/base.xml:4076
+#: rules/base.xml:4102
 msgid "Kazakh (extended)"
 msgstr "Kazakh (estendido)"
 
-#: rules/base.xml:4085
+#: rules/base.xml:4111
 msgid "Kazakh (Latin)"
 msgstr "Kazakh (Latino)"
 
 #. Keyboard indicator for Lao layouts
-#: rules/base.xml:4097
+#: rules/base.xml:4123
 msgid "lo"
 msgstr "lo"
 
-#: rules/base.xml:4098
+#: rules/base.xml:4124
 msgid "Lao"
 msgstr "Lao"
 
-#: rules/base.xml:4107
-msgid "Lao (STEA proposed standard layout)"
-msgstr "Lao (STEA disposição padrão proposta)"
+#: rules/base.xml:4133
+msgid "Lao (STEA)"
+msgstr "Lao (STEA)"
 
 #. Keyboard indicator for Spanish layouts
-#: rules/base.xml:4119 rules/base.xml:4977 rules/base.extras.xml:1075
+#: rules/base.xml:4145 rules/base.xml:5003 rules/base.extras.xml:1083
 msgid "es"
 msgstr "es"
 
-#: rules/base.xml:4120
+#: rules/base.xml:4146
 msgid "Spanish (Latin American)"
 msgstr "Espanhol (Latino-Americano)"
 
-#: rules/base.xml:4152
+#: rules/base.xml:4178
 msgid "Spanish (Latin American, no dead keys)"
 msgstr "Espanhol (Latino-Americano, sem teclas mortas)"
 
-#: rules/base.xml:4158
+#: rules/base.xml:4184
 msgid "Spanish (Latin American, dead tilde)"
 msgstr "Espanhol (Latino-Americano, til morto)"
 
-#: rules/base.xml:4164
-msgid "Spanish (Latin American, with Sun dead keys)"
-msgstr "Espanhol (Latino-Americano, com Sun + teclas mortas)"
+#: rules/base.xml:4190
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Espanhol (Latino-Americano, teclas mortas Sun)"
 
-#: rules/base.xml:4170
+#: rules/base.xml:4196
 msgid "Spanish (Latin American, Dvorak)"
 msgstr "Espanhol (Latino-Americano, Dvorak)"
 
-#: rules/base.xml:4176
+#: rules/base.xml:4202
 msgid "Spanish (Latin American, Colemak)"
 msgstr "Espanhol (Latino-Americano, Colemak)"
 
-#: rules/base.xml:4182
+#: rules/base.xml:4208
 msgid "Spanish (Latin American, Colemak for gaming)"
 msgstr "Espanhol (Latino-Americano, Colemak para jogos)"
 
 #. Keyboard indicator for Lithuanian layouts
-#: rules/base.xml:4191 rules/base.extras.xml:247
+#: rules/base.xml:4217 rules/base.extras.xml:255
 msgid "lt"
 msgstr "lt"
 
-#: rules/base.xml:4192 rules/base.extras.xml:248
+#: rules/base.xml:4218 rules/base.extras.xml:256
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: rules/base.xml:4201
+#: rules/base.xml:4227
 msgid "Lithuanian (standard)"
 msgstr "Lituano (padrão)"
 
-#: rules/base.xml:4207
-msgid "Lithuanian (US, with Lithuanian letters)"
-msgstr "Lituano (EUA, com letras lituanas)"
+#: rules/base.xml:4233
+msgid "Lithuanian (US)"
+msgstr "Lituano (US)"
 
-#: rules/base.xml:4213
+#: rules/base.xml:4239
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Lituano (IBM LST 1205-92)"
 
-#: rules/base.xml:4219
+#: rules/base.xml:4245
 msgid "Lithuanian (LEKP)"
 msgstr "Lituano (LEKP)"
 
-#: rules/base.xml:4225
+#: rules/base.xml:4251
 msgid "Lithuanian (LEKPa)"
 msgstr "Lituano (LEKPa)"
 
-#: rules/base.xml:4231
+#: rules/base.xml:4257
 msgid "Samogitian"
 msgstr "Samogitiano"
 
 #. Keyboard indicator for Latvian layouts
-#: rules/base.xml:4243 rules/base.extras.xml:271
+#: rules/base.xml:4269 rules/base.extras.xml:279
 msgid "lv"
 msgstr "lv"
 
-#: rules/base.xml:4244 rules/base.extras.xml:272
+#: rules/base.xml:4270 rules/base.extras.xml:280
 msgid "Latvian"
 msgstr "Letão"
 
-#: rules/base.xml:4253
+#: rules/base.xml:4279
 msgid "Latvian (apostrophe)"
 msgstr "Letão (apóstrofo)"
 
-#: rules/base.xml:4259
+#: rules/base.xml:4285
 msgid "Latvian (tilde)"
 msgstr "Letão (til)"
 
-#: rules/base.xml:4265
+#: rules/base.xml:4291
 msgid "Latvian (F)"
 msgstr "Letão (F)"
 
-#: rules/base.xml:4271
+#: rules/base.xml:4297
 msgid "Latvian (modern)"
 msgstr "Letão (moderno)"
 
-#: rules/base.xml:4277
+#: rules/base.xml:4303
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Letão (ergonómico, ŪGJRMV)"
 
-#: rules/base.xml:4283
+#: rules/base.xml:4309
 msgid "Latvian (adapted)"
 msgstr "Letão (adaptado)"
 
 #. Keyboard indicator for Maori layouts
-#: rules/base.xml:4292
+#: rules/base.xml:4318
 msgid "mi"
 msgstr "mi"
 
-#: rules/base.xml:4293
+#: rules/base.xml:4319
 msgid "Maori"
 msgstr "Maori"
 
 #. Keyboard indicator for Montenegrin layouts
 #. Keyboard indicator for Serbian layouts
-#: rules/base.xml:4304 rules/base.xml:4857 rules/base.extras.xml:548
+#: rules/base.xml:4330 rules/base.xml:4883 rules/base.extras.xml:556
 msgid "sr"
 msgstr "sr"
 
-#: rules/base.xml:4305
+#: rules/base.xml:4331
 msgid "Montenegrin"
 msgstr "Montenegrino"
 
-#: rules/base.xml:4314
+#: rules/base.xml:4340
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrino (Cirílico)"
 
-#: rules/base.xml:4320
+#: rules/base.xml:4346
 msgid "Montenegrin (Cyrillic, ZE and ZHE swapped)"
 msgstr "Montenegrino (Cirílico, ZE e ZHE trocados)"
 
-#: rules/base.xml:4326
+#: rules/base.xml:4352
 msgid "Montenegrin (Latin, Unicode)"
 msgstr "Montenegrino (Latino, Unicode)"
 
-#: rules/base.xml:4332
+#: rules/base.xml:4358
 msgid "Montenegrin (Latin, QWERTY)"
 msgstr "Montenegrino (Latino, QWERTY)"
 
-#: rules/base.xml:4338
+#: rules/base.xml:4364
 msgid "Montenegrin (Latin, Unicode, QWERTY)"
 msgstr "Montenegrino (Latino, Unicode, QWERTY)"
 
-#: rules/base.xml:4344
-msgid "Montenegrin (Cyrillic with guillemets)"
-msgstr "Montenegrino (Cirílico com aspas angulares)"
+#: rules/base.xml:4370
+msgid "Montenegrin (Cyrillic, with guillemets)"
+msgstr "Montenegrino (Cirílico com aspas angulares duplas)"
 
-#: rules/base.xml:4350
-msgid "Montenegrin (Latin with guillemets)"
-msgstr "Montenegrino (Latino com aspas angulares)"
+#: rules/base.xml:4376
+msgid "Montenegrin (Latin, with guillemets)"
+msgstr "Montenegrino (Latino com aspas angulares duplas)"
 
 #. Keyboard indicator for Macedonian layouts
-#: rules/base.xml:4359
+#: rules/base.xml:4385
 msgid "mk"
 msgstr "mk"
 
-#: rules/base.xml:4360
+#: rules/base.xml:4386
 msgid "Macedonian"
 msgstr "Macedónio"
 
-#: rules/base.xml:4369
+#: rules/base.xml:4395
 msgid "Macedonian (no dead keys)"
 msgstr "Macedónio (sem teclas mortas)"
 
 #. Keyboard indicator for Maltese layouts
-#: rules/base.xml:4378
+#: rules/base.xml:4404
 msgid "mt"
 msgstr "mt"
 
-#: rules/base.xml:4379
+#: rules/base.xml:4405
 msgid "Maltese"
 msgstr "Maltês"
 
-#: rules/base.xml:4388
-msgid "Maltese (with US layout)"
-msgstr "Maltês (com disposição EUA)"
+#: rules/base.xml:4414
+msgid "Maltese (US)"
+msgstr "Maltês (US)"
 
-#: rules/base.xml:4394
+#: rules/base.xml:4420
 msgid "Maltese (US layout with AltGr overrides)"
 msgstr "Maltŝ (disposição US com AltGr sobrepões-se)"
 
-#: rules/base.xml:4400
-msgid "Maltese (UK layout with AltGr overrides)"
-msgstr "Maltŝ (disposição UK com AltGr sobrepõe-se)"
+#: rules/base.xml:4426
+msgid "Maltese (UK, with AltGr overrides)"
+msgstr "Maltŝ (UK com sobreposições AltGr)"
 
 #. Keyboard indicator for Mongolian layouts
-#: rules/base.xml:4409
+#: rules/base.xml:4435
 msgid "mn"
 msgstr "mn"
 
-#: rules/base.xml:4410
+#: rules/base.xml:4436
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. Keyboard indicator for Norwegian layouts
-#: rules/base.xml:4421 rules/base.extras.xml:1009
+#: rules/base.xml:4447 rules/base.extras.xml:1017
 msgid "no"
 msgstr "no"
 
-#: rules/base.xml:4422 rules/base.extras.xml:1010
+#: rules/base.xml:4448 rules/base.extras.xml:1018
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: rules/base.xml:4433
+#: rules/base.xml:4459
 msgid "Norwegian (no dead keys)"
 msgstr "Norueguês (sem teclas mortas)"
 
-#: rules/base.xml:4439
-msgid "Norwegian (Win keys)"
-msgstr "Norueguês (teclas Win)"
+#: rules/base.xml:4465
+msgid "Norwegian (Windows)"
+msgstr "Norueguês (Windows)"
 
-#: rules/base.xml:4445
+#: rules/base.xml:4471
 msgid "Norwegian (Dvorak)"
 msgstr "Norueguês (Dvorak)"
 
-#: rules/base.xml:4451
+#: rules/base.xml:4477
 msgid "Northern Saami (Norway)"
 msgstr "Saami do Norte (Noruega)"
 
-#: rules/base.xml:4460
+#: rules/base.xml:4486
 msgid "Northern Saami (Norway, no dead keys)"
 msgstr "Saami do Norte (Noruega, sem teclas mortas)"
 
-#: rules/base.xml:4469
+#: rules/base.xml:4495
 msgid "Norwegian (Macintosh)"
 msgstr "Norueguês (Macintosh)"
 
-#: rules/base.xml:4475
+#: rules/base.xml:4501
 msgid "Norwegian (Macintosh, no dead keys)"
 msgstr "Norueguês (Macintosh, sem teclas mortas)"
 
-#: rules/base.xml:4481
+#: rules/base.xml:4507
 msgid "Norwegian (Colemak)"
 msgstr "Norueguês (Colemak)"
 
 #. Keyboard indicator for Polish layouts
-#: rules/base.xml:4490 rules/base.xml:5629 rules/base.extras.xml:478
+#: rules/base.xml:4516 rules/base.xml:5655 rules/base.extras.xml:486
 msgid "pl"
 msgstr "pl"
 
-#: rules/base.xml:4491 rules/base.extras.xml:479
+#: rules/base.xml:4517 rules/base.extras.xml:487
 msgid "Polish"
 msgstr "Polaco"
 
-#: rules/base.xml:4500
+#: rules/base.xml:4526
 msgid "Polish (legacy)"
 msgstr "Polaco (antigo)"
 
-#: rules/base.xml:4506
+#: rules/base.xml:4532
 msgid "Polish (QWERTZ)"
 msgstr "Polaco (QWERTZ)"
 
-#: rules/base.xml:4512
+#: rules/base.xml:4538
 msgid "Polish (Dvorak)"
 msgstr "Polaco (Dvorak)"
 
-#: rules/base.xml:4518
+#: rules/base.xml:4544
 msgid "Polish (Dvorak, with Polish quotes on quotemark key)"
 msgstr "Polaco (Dvorak, com aspas polacas na tecla de aspas)"
 
-#: rules/base.xml:4524
+#: rules/base.xml:4550
 msgid "Polish (Dvorak, with Polish quotes on key 1)"
 msgstr "Polaco (Dvorak, com aspas polacas na tecla 1)"
 
-#: rules/base.xml:4530
+#: rules/base.xml:4556
 msgid "Kashubian"
 msgstr "Kashubiano"
 
-#: rules/base.xml:4539
+#: rules/base.xml:4565
 msgid "Silesian"
 msgstr "Silesiano"
 
-#: rules/base.xml:4550
+#: rules/base.xml:4576
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Russo (Polónia, fonético Dvorak)"
 
-#: rules/base.xml:4559
+#: rules/base.xml:4585
 msgid "Polish (programmer Dvorak)"
 msgstr "Polaco (programador Dvorak)"
 
-#: rules/base.xml:4569 rules/base.extras.xml:1025 rules/base.extras.xml:1040
+#: rules/base.xml:4595 rules/base.extras.xml:1033 rules/base.extras.xml:1048
 msgid "Portuguese"
 msgstr "Português"
 
-#: rules/base.xml:4578
+#: rules/base.xml:4604
 msgid "Portuguese (no dead keys)"
 msgstr "Português (sem teclas mortas)"
 
-#: rules/base.xml:4584
-msgid "Portuguese (with Sun dead keys)"
-msgstr "Português (com Sun + teclas mortas)"
+#: rules/base.xml:4610
+msgid "Portuguese (Sun dead keys)"
+msgstr "Português (teclas mortas Sun)"
 
-#: rules/base.xml:4590
+#: rules/base.xml:4616
 msgid "Portuguese (Macintosh)"
 msgstr "Português (Macintosh)"
 
-#: rules/base.xml:4596
+#: rules/base.xml:4622
 msgid "Portuguese (Macintosh, no dead keys)"
 msgstr "Português (Macintosh, sem teclas mortas)"
 
-#: rules/base.xml:4602
-msgid "Portuguese (Macintosh, with Sun dead keys)"
-msgstr "Português (Macintosh, com Sun + teclas mortas)"
+#: rules/base.xml:4628
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Português (Macintosh, teclas mortas Sun)"
 
-#: rules/base.xml:4608
+#: rules/base.xml:4634
 msgid "Portuguese (Nativo)"
 msgstr "Português (Nativo)"
 
-#: rules/base.xml:4614
+#: rules/base.xml:4640
 msgid "Portuguese (Nativo for US keyboards)"
 msgstr "Português (Nativo para teclados EUA)"
 
-#: rules/base.xml:4620
+#: rules/base.xml:4646
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Esperanto (Portugal, Nativo)"
 
 #. Keyboard indicator for Romanian layouts
-#: rules/base.xml:4632 rules/base.extras.xml:514
+#: rules/base.xml:4658 rules/base.extras.xml:522
 msgid "ro"
 msgstr "ro"
 
-#: rules/base.xml:4633 rules/base.extras.xml:515
+#: rules/base.xml:4659 rules/base.extras.xml:523
 msgid "Romanian"
 msgstr "Romeno"
 
-#: rules/base.xml:4642
+#: rules/base.xml:4668
 msgid "Romanian (cedilla)"
 msgstr "Romeno (cedilha)"
 
-#: rules/base.xml:4648
+#: rules/base.xml:4674
 msgid "Romanian (standard)"
 msgstr "Romeno (padrão)"
 
-#: rules/base.xml:4654
+#: rules/base.xml:4680
 msgid "Romanian (standard cedilla)"
 msgstr "Romeno (padrão cedilha)"
 
-#: rules/base.xml:4660
-msgid "Romanian (Win keys)"
-msgstr "Romeno (teclas Win)"
+#: rules/base.xml:4686
+msgid "Romanian (Windows)"
+msgstr "Romeno (Windows)"
 
-#: rules/base.xml:4670 rules/base.extras.xml:567
+#: rules/base.xml:4696 rules/base.extras.xml:575
 msgid "Russian"
 msgstr "Russo"
 
-#: rules/base.xml:4679
+#: rules/base.xml:4705
 msgid "Russian (phonetic)"
 msgstr "Russo (fonético)"
 
-#: rules/base.xml:4685
-msgid "Russian (phonetic, with Win keys)"
-msgstr "Russo (fonético, com teclas Win)"
+#: rules/base.xml:4711
+msgid "Russian (phonetic, Windows)"
+msgstr "Russo (fonético, Windows)"
 
-#: rules/base.xml:4691
-msgid "Russian (phonetic yazherty)"
-msgstr "Russo (fonético yazherty)"
+#: rules/base.xml:4717
+msgid "Russian (phonetic, YAZHERTY)"
+msgstr "Russo (fonético, YAZHERTY)"
 
-#: rules/base.xml:4697
+#: rules/base.xml:4723
 msgid "Russian (typewriter)"
 msgstr "Russo (dactilografia)"
 
-#: rules/base.xml:4703
+#: rules/base.xml:4729
 msgid "Russian (legacy)"
 msgstr "Russo (antigo)"
 
-#: rules/base.xml:4709
+#: rules/base.xml:4735
 msgid "Russian (typewriter, legacy)"
 msgstr "Russo (dactilografia, antigo)"
 
-#: rules/base.xml:4715
+#: rules/base.xml:4741
 msgid "Tatar"
 msgstr "Tatar"
 
-#: rules/base.xml:4724
+#: rules/base.xml:4750
 msgid "Ossetian (legacy)"
 msgstr "Ossetiano (antigo)"
 
-#: rules/base.xml:4733
-msgid "Ossetian (Win keys)"
-msgstr "Ossetiano (teclas Win)"
+#: rules/base.xml:4759
+msgid "Ossetian (Windows)"
+msgstr "Ossetiano (Windows)"
 
-#: rules/base.xml:4742
+#: rules/base.xml:4768
 msgid "Chuvash"
 msgstr "Chuvash"
 
-#: rules/base.xml:4751
+#: rules/base.xml:4777
 msgid "Chuvash (Latin)"
 msgstr "Chuvash (Latino)"
 
-#: rules/base.xml:4760
+#: rules/base.xml:4786
 msgid "Udmurt"
 msgstr "Udmurt"
 
-#: rules/base.xml:4769
+#: rules/base.xml:4795
 msgid "Komi"
 msgstr "Komi"
 
-#: rules/base.xml:4778
+#: rules/base.xml:4804
 msgid "Yakut"
 msgstr "Yakut"
 
-#: rules/base.xml:4787
+#: rules/base.xml:4813
 msgid "Kalmyk"
 msgstr "Kalmyk"
 
-#: rules/base.xml:4796
+#: rules/base.xml:4822
 msgid "Russian (DOS)"
 msgstr "Russo (DOS)"
 
-#: rules/base.xml:4802
+#: rules/base.xml:4828
 msgid "Russian (Macintosh)"
 msgstr "Russo (Macintosh)"
 
-#: rules/base.xml:4808
+#: rules/base.xml:4834
 msgid "Serbian (Russia)"
 msgstr "Sérvio (Russia)"
 
-#: rules/base.xml:4818
+#: rules/base.xml:4844
 msgid "Bashkirian"
 msgstr "Bashkirian"
 
-#: rules/base.xml:4827
+#: rules/base.xml:4853
 msgid "Mari"
 msgstr "Mari"
 
-#: rules/base.xml:4836
+#: rules/base.xml:4862
 msgid "Russian (phonetic, AZERTY)"
 msgstr "Russo (fonético, AZERTY)"
 
-#: rules/base.xml:4842
+#: rules/base.xml:4868
 msgid "Russian (phonetic, Dvorak)"
 msgstr "Russo (fonético, Dvorak)"
 
-#: rules/base.xml:4848
+#: rules/base.xml:4874
 msgid "Russian (phonetic, French)"
 msgstr "Russo (fonético, Francês)"
 
-#: rules/base.xml:4858 rules/base.extras.xml:549
+#: rules/base.xml:4884 rules/base.extras.xml:557
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: rules/base.xml:4867
+#: rules/base.xml:4893
 msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
 msgstr "Sérvio (Cirílico, ZE e ZHE trocados)"
 
-#: rules/base.xml:4873
+#: rules/base.xml:4899
 msgid "Serbian (Latin)"
 msgstr "Sérvio (Latino)"
 
-#: rules/base.xml:4879
+#: rules/base.xml:4905
 msgid "Serbian (Latin, Unicode)"
 msgstr "Sérvio (Latino, Unicode)"
 
-#: rules/base.xml:4885
+#: rules/base.xml:4911
 msgid "Serbian (Latin, QWERTY)"
 msgstr "Sérvio (Latino, QWERTY)"
 
-#: rules/base.xml:4891
+#: rules/base.xml:4917
 msgid "Serbian (Latin, Unicode, QWERTY)"
 msgstr "Sérvio (Latino, Unicode, QWERTY)"
 
-#: rules/base.xml:4897
-msgid "Serbian (Cyrillic with guillemets)"
-msgstr "Sérvio (Cirílico com aspas angulares)"
+#: rules/base.xml:4923
+msgid "Serbian (Cyrillic, with guillemets)"
+msgstr "Sérvio (Cirílico com aspas angulares duplas)"
 
-#: rules/base.xml:4903
-msgid "Serbian (Latin with guillemets)"
-msgstr "Sérvio (Latino com aspas angulares)"
+#: rules/base.xml:4929
+msgid "Serbian (Latin, with guillemets)"
+msgstr "Sérvio (Latino com aspas angulares duplas)"
 
-#: rules/base.xml:4909
+#: rules/base.xml:4935
 msgid "Pannonian Rusyn"
 msgstr "Rusyn da Panónia"
 
 #. Keyboard indicator for Slovenian layouts
-#: rules/base.xml:4921
+#: rules/base.xml:4947
 msgid "sl"
 msgstr "sl"
 
-#: rules/base.xml:4922
+#: rules/base.xml:4948
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: rules/base.xml:4931
+#: rules/base.xml:4957
 msgid "Slovenian (with guillemets)"
 msgstr "Esloveno (com aspas angulares)"
 
-#: rules/base.xml:4937
-msgid "Slovenian (US, with Slovenian letters)"
-msgstr "Esloveno (EUA, com letras eslovenas)"
+#: rules/base.xml:4963
+msgid "Slovenian (US)"
+msgstr "Esloveno (US)"
 
 #. Keyboard indicator for Slovak layouts
-#: rules/base.xml:4946 rules/base.extras.xml:1054
+#: rules/base.xml:4972 rules/base.extras.xml:1062
 msgid "sk"
 msgstr "sk"
 
-#: rules/base.xml:4947 rules/base.extras.xml:1055
+#: rules/base.xml:4973 rules/base.extras.xml:1063
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: rules/base.xml:4956
+#: rules/base.xml:4982
 msgid "Slovak (extended backslash)"
 msgstr "Eslovaco (estendido barra invertida)"
 
-#: rules/base.xml:4962
+#: rules/base.xml:4988
 msgid "Slovak (QWERTY)"
 msgstr "Eslovaco (QWERTY)"
 
-#: rules/base.xml:4968
+#: rules/base.xml:4994
 msgid "Slovak (QWERTY, extended backslash)"
 msgstr "Eslovaco (QWERTY, estendido barra invertida)"
 
-#: rules/base.xml:4978 rules/base.extras.xml:1076
+#: rules/base.xml:5004 rules/base.extras.xml:1084
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: rules/base.xml:4987
+#: rules/base.xml:5013
 msgid "Spanish (no dead keys)"
 msgstr "Espanhol (sem teclas mortas)"
 
-#: rules/base.xml:4993
-msgid "Spanish (Win keys)"
-msgstr "Espanhol (teclas Win)"
+#: rules/base.xml:5019
+msgid "Spanish (Windows)"
+msgstr "Espanhol (Windows)"
 
-#: rules/base.xml:4999
+#: rules/base.xml:5025
 msgid "Spanish (dead tilde)"
 msgstr "Espanhol (til morto)"
 
-#: rules/base.xml:5005
-msgid "Spanish (with Sun dead keys)"
-msgstr "Espanhol (com Sun + teclas mortas)"
+#: rules/base.xml:5031
+msgid "Spanish (Sun dead keys)"
+msgstr "Espanhol (teclas mortas Sun)"
 
-#: rules/base.xml:5011
+#: rules/base.xml:5037
 msgid "Spanish (Dvorak)"
 msgstr "Espanhol (Dvorak)"
 
-#: rules/base.xml:5017
+#: rules/base.xml:5043
 msgid "ast"
 msgstr "ast"
 
-#: rules/base.xml:5018
-msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
-msgstr "Asturiano (Espanha, com H com ponto abaixo e L com ponto abaixo)"
+#: rules/base.xml:5044
+msgid "Asturian (Spain, with bottom-dot H and L)"
+msgstr "Asturiano (Espanha, com H e L com ponto abaixo)"
 
-#: rules/base.xml:5027
+#: rules/base.xml:5053
 msgid "ca"
 msgstr "ca"
 
-#: rules/base.xml:5028
+#: rules/base.xml:5054
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Catalão (Espanha, comL com ponto central)"
 
-#: rules/base.xml:5037
+#: rules/base.xml:5063
 msgid "Spanish (Macintosh)"
 msgstr "Espanhol (Macintosh)"
 
 #. Keyboard indicator for Swedish layouts
-#: rules/base.xml:5046 rules/base.extras.xml:1090
+#: rules/base.xml:5072 rules/base.extras.xml:1098
 msgid "sv"
 msgstr "sv"
 
-#: rules/base.xml:5047 rules/base.extras.xml:1091
+#: rules/base.xml:5073 rules/base.extras.xml:1099
 msgid "Swedish"
 msgstr "Sueco"
 
-#: rules/base.xml:5056
+#: rules/base.xml:5082
 msgid "Swedish (no dead keys)"
 msgstr "Sueco (sem teclas mortas)"
 
-#: rules/base.xml:5062
+#: rules/base.xml:5088
 msgid "Swedish (Dvorak)"
 msgstr "Sueco (Dvorak)"
 
-#: rules/base.xml:5070
+#: rules/base.xml:5096
 msgid "Russian (Sweden, phonetic)"
 msgstr "Russo (Suécia, fonético)"
 
-#: rules/base.xml:5081
+#: rules/base.xml:5107
 msgid "Russian (Sweden, phonetic, no dead keys)"
 msgstr "Russo (Suécia, fonético, sem teclas mortas)"
 
-#: rules/base.xml:5090
+#: rules/base.xml:5116
 msgid "Northern Saami (Sweden)"
 msgstr "Saami do Norte (Suécia)"
 
-#: rules/base.xml:5099
+#: rules/base.xml:5125
 msgid "Swedish (Macintosh)"
 msgstr "Sueco (Macintosh)"
 
-#: rules/base.xml:5105
+#: rules/base.xml:5131
 msgid "Swedish (Svdvorak)"
 msgstr "Sueco (Svdvorak)"
 
-#: rules/base.xml:5111
-msgid "Swedish (based on US Intl. Dvorak)"
-msgstr "Sueco (baseado em EUA Intl. Dvorak)"
+#: rules/base.xml:5137
+msgid "Swedish (Dvorak, intl.)"
+msgstr "Sueco (Dvorak, intl.)"
 
-#: rules/base.xml:5117
-msgid "Swedish (US, with Swedish letters)"
-msgstr "Sueco (EUA, com letras suecas)"
+#: rules/base.xml:5143
+msgid "Swedish (US)"
+msgstr "Sueco (US)"
 
-#: rules/base.xml:5123
+#: rules/base.xml:5149
 msgid "Swedish Sign Language"
 msgstr "Linguagem gestual sueca"
 
-#: rules/base.xml:5136 rules/base.extras.xml:1121
+#: rules/base.xml:5162 rules/base.extras.xml:1129
 msgid "German (Switzerland)"
 msgstr "Alemão (Suíça)"
 
-#: rules/base.xml:5146
+#: rules/base.xml:5172
 msgid "German (Switzerland, legacy)"
 msgstr "Alemão (Suíça, antigo)"
 
-#: rules/base.xml:5154
+#: rules/base.xml:5180
 msgid "German (Switzerland, no dead keys)"
 msgstr "Alemão (Suíça, sem teclas mortas)"
 
-#: rules/base.xml:5162
-msgid "German (Switzerland, with Sun dead keys)"
-msgstr "Alemão (Suíça, com Sun +  teclas mortas)"
+#: rules/base.xml:5188
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "Alemão (Suíça, teclas mortas Sun)"
 
-#: rules/base.xml:5170
+#: rules/base.xml:5196
 msgid "French (Switzerland)"
 msgstr "Francês (Suíça)"
 
-#: rules/base.xml:5181
+#: rules/base.xml:5207
 msgid "French (Switzerland, no dead keys)"
 msgstr "Francês (Suíça, sem teclas mortas)"
 
-#: rules/base.xml:5192
-msgid "French (Switzerland, with Sun dead keys)"
-msgstr "Francês (Suíça, com Sun +  teclas mortas)"
+#: rules/base.xml:5218
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "Francês (Suíça, teclas mortas Sun)"
 
-#: rules/base.xml:5203
+#: rules/base.xml:5229
 msgid "French (Switzerland, Macintosh)"
 msgstr "Francês (Suíça, Macintosh)"
 
-#: rules/base.xml:5214
+#: rules/base.xml:5240
 msgid "German (Switzerland, Macintosh)"
 msgstr "Alemão (Suíça, Macintosh)"
 
-#: rules/base.xml:5224
+#: rules/base.xml:5250
 msgid "Arabic (Syria)"
 msgstr "Árabe (Síria)"
 
 #. Keyboard indicator for Syriac layouts
-#: rules/base.xml:5234 rules/base.xml:5242
+#: rules/base.xml:5260 rules/base.xml:5268
 msgid "syc"
 msgstr "syc"
 
-#: rules/base.xml:5235
+#: rules/base.xml:5261
 msgid "Syriac"
 msgstr "Sírio"
 
-#: rules/base.xml:5243
+#: rules/base.xml:5269
 msgid "Syriac (phonetic)"
 msgstr "Sírio (fonético)"
 
-#: rules/base.xml:5251
+#: rules/base.xml:5277
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Curdo (Síria, Latino Q)"
 
-#: rules/base.xml:5262
+#: rules/base.xml:5288
 msgid "Kurdish (Syria, F)"
 msgstr "Curdo (Síria, F)"
 
-#: rules/base.xml:5273
+#: rules/base.xml:5299
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Curdo (Síria, Latino Alt-Q)"
 
 #. Keyboard indicator for Tajik layouts
-#: rules/base.xml:5285
+#: rules/base.xml:5311
 msgid "tg"
 msgstr "tg"
 
-#: rules/base.xml:5286
+#: rules/base.xml:5312
 msgid "Tajik"
 msgstr "Tajik"
 
-#: rules/base.xml:5295
+#: rules/base.xml:5321
 msgid "Tajik (legacy)"
 msgstr "Tajik (antigo)"
 
 #. Keyboard indicator for Sinhala layouts
-#: rules/base.xml:5304
+#: rules/base.xml:5330
 msgid "si"
 msgstr "si"
 
-#: rules/base.xml:5305
+#: rules/base.xml:5331
 msgid "Sinhala (phonetic)"
 msgstr "Sinhala (fonético)"
 
-#: rules/base.xml:5316
+#: rules/base.xml:5342
 msgid "Tamil (Sri Lanka, TamilNet '99)"
 msgstr "Tamil (Sri Lanka, TamilNet \"99)"
 
-#: rules/base.xml:5325
+#: rules/base.xml:5351
 msgid "Tamil (Sri Lanka, TamilNet '99, TAB encoding)"
 msgstr "Tamil (Sri Lanka, TamilNet \"99, codificação TAB)"
 
 #. Keyboard indicator for US layouts
-#: rules/base.xml:5335
+#: rules/base.xml:5361
 msgid "us"
 msgstr "us"
 
-#: rules/base.xml:5336
-msgid "Sinhala (US, with Sinhala letters)"
-msgstr "Sinhala (EUA, com letras Sinhala)"
+#: rules/base.xml:5362
+msgid "Sinhala (US)"
+msgstr "Sinhala (US)"
 
 #. Keyboard indicator for Thai layouts
-#: rules/base.xml:5345
+#: rules/base.xml:5371
 msgid "th"
 msgstr "th"
 
-#: rules/base.xml:5346
+#: rules/base.xml:5372
 msgid "Thai"
 msgstr "Thai"
 
-#: rules/base.xml:5355
+#: rules/base.xml:5381
 msgid "Thai (TIS-820.2538)"
 msgstr "Thai (TIS-820.2538)"
 
-#: rules/base.xml:5361
+#: rules/base.xml:5387
 msgid "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
 #. Keyboard indicator for Turkish layouts
-#: rules/base.xml:5370 rules/base.extras.xml:1141
+#: rules/base.xml:5396 rules/base.extras.xml:1149
 msgid "tr"
 msgstr "tr"
 
-#: rules/base.xml:5371 rules/base.extras.xml:1142
+#: rules/base.xml:5397 rules/base.extras.xml:1150
 msgid "Turkish"
 msgstr "Turco"
 
-#: rules/base.xml:5380
+#: rules/base.xml:5406
 msgid "Turkish (F)"
 msgstr "Turco (F)"
 
-#: rules/base.xml:5386
+#: rules/base.xml:5412
 msgid "Turkish (Alt-Q)"
 msgstr "Turco (Alt-Q)"
 
-#: rules/base.xml:5392
-msgid "Turkish (with Sun dead keys)"
-msgstr "Turco (com Sun +  teclas mortas)"
+#: rules/base.xml:5418
+msgid "Turkish (Sun dead keys)"
+msgstr "Turco (teclas mortas Sun)"
 
-#: rules/base.xml:5400
+#: rules/base.xml:5426
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Curdo (Turquia, Latino Q)"
 
-#: rules/base.xml:5411
+#: rules/base.xml:5437
 msgid "Kurdish (Turkey, F)"
 msgstr "Curdo (Turquia, F)"
 
-#: rules/base.xml:5422
+#: rules/base.xml:5448
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Curdo (Turquia, Latino Alt-Q)"
 
-#: rules/base.xml:5431
+#: rules/base.xml:5457
 msgid "Turkish (intl., with dead keys)"
 msgstr "Turco (intl., com teclas mortas)"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: rules/base.xml:5438 rules/base.xml:5449 rules/base.xml:5460
-#: rules/base.extras.xml:524
+#: rules/base.xml:5464 rules/base.xml:5475 rules/base.xml:5486
+#: rules/base.extras.xml:532
 msgid "crh"
 msgstr "crh"
 
-#: rules/base.xml:5439
+#: rules/base.xml:5465
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Tatar da Crimeia (Turco Q)"
 
-#: rules/base.xml:5450
+#: rules/base.xml:5476
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Tatar da Crimeia (Turco F)"
 
-#: rules/base.xml:5461
+#: rules/base.xml:5487
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Tatar da Crimeia (Turco Alt-Q)"
 
-#: rules/base.xml:5474
+#: rules/base.xml:5500
 msgid "Taiwanese"
 msgstr "Taiwanês"
 
-#: rules/base.xml:5483
+#: rules/base.xml:5509
 msgid "Taiwanese (indigenous)"
 msgstr "Taiwanês (indígena)"
 
 #. Keyboard indicator for Saisiyat layouts
-#: rules/base.xml:5508
+#: rules/base.xml:5534
 msgid "xsy"
 msgstr "xsy"
 
-#: rules/base.xml:5509
+#: rules/base.xml:5535
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Taiwan)"
 
 #. Keyboard indicator for Ukranian layouts
-#: rules/base.xml:5521 rules/base.extras.xml:1156
+#: rules/base.xml:5547 rules/base.extras.xml:1164
 msgid "uk"
 msgstr "uk"
 
-#: rules/base.xml:5522 rules/base.extras.xml:1157
+#: rules/base.xml:5548 rules/base.extras.xml:1165
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: rules/base.xml:5531
+#: rules/base.xml:5557
 msgid "Ukrainian (phonetic)"
 msgstr "Ucraniano (fonético)"
 
-#: rules/base.xml:5537
+#: rules/base.xml:5563
 msgid "Ukrainian (typewriter)"
 msgstr "Ucraniano (dactilografia)"
 
-#: rules/base.xml:5543
-msgid "Ukrainian (Win keys)"
-msgstr "Ucraniano (teclas Win)"
+#: rules/base.xml:5569
+msgid "Ukrainian (Windows)"
+msgstr "Ucraniano (Windows)"
 
-#: rules/base.xml:5549
+#: rules/base.xml:5575
 msgid "Ukrainian (legacy)"
 msgstr "Ucraniano (antigo)"
 
-#: rules/base.xml:5555
+#: rules/base.xml:5581
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ucraniano (padrão RSTU)"
 
-#: rules/base.xml:5561
+#: rules/base.xml:5587
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Russo (Ucrânia, padrão RSTU)"
 
-#: rules/base.xml:5567
+#: rules/base.xml:5593
 msgid "Ukrainian (homophonic)"
 msgstr "Ucraniano (homofónico)"
 
-#: rules/base.xml:5577 rules/base.extras.xml:1172
+#: rules/base.xml:5603 rules/base.extras.xml:1180
 msgid "English (UK)"
 msgstr "Inglês (GBT)"
 
-#: rules/base.xml:5586
-msgid "English (UK, extended, with Win keys)"
-msgstr "Inglês (GBT, estendido, com teclas Win)"
+#: rules/base.xml:5612
+msgid "English (UK, extended, Windows)"
+msgstr "Inglês (UK, estendido, Windows)"
 
-#: rules/base.xml:5592
+#: rules/base.xml:5618
 msgid "English (UK, intl., with dead keys)"
 msgstr "Inglês (GBT, intl., com teclas mortas)"
 
-#: rules/base.xml:5598
+#: rules/base.xml:5624
 msgid "English (UK, Dvorak)"
 msgstr "Inglês (GBT, Dvorak)"
 
-#: rules/base.xml:5604
+#: rules/base.xml:5630
 msgid "English (UK, Dvorak, with UK punctuation)"
 msgstr "Inglês (GBT, Dvorak, com pontuação GBT)"
 
-#: rules/base.xml:5610
+#: rules/base.xml:5636
 msgid "English (UK, Macintosh)"
 msgstr "Inglês (GBT, Macintosh)"
 
-#: rules/base.xml:5616
-msgid "English (UK, intl., Macintosh)"
-msgstr "Inglês (GBT, intl., Macintosh)"
+#: rules/base.xml:5642
+msgid "English (UK, Macintosh, intl.)"
+msgstr "Inglês (UK, Macintosh, intl.)"
 
-#: rules/base.xml:5622
+#: rules/base.xml:5648
 msgid "English (UK, Colemak)"
 msgstr "Inglês (GBT, Colemak)"
 
-#: rules/base.xml:5630
+#: rules/base.xml:5656
 msgid "Polish (British keyboard)"
 msgstr "Polaco (teclado britânico)"
 
-#: rules/base.xml:5643
+#: rules/base.xml:5669
 msgid "Uzbek"
 msgstr "Uzbek"
 
-#: rules/base.xml:5652
+#: rules/base.xml:5678
 msgid "Uzbek (Latin)"
 msgstr "Uzbek (Latino)"
 
 #. Keyboard indicator for Vietnamese layouts
-#: rules/base.xml:5661 rules/base.extras.xml:1202
+#: rules/base.xml:5687 rules/base.extras.xml:1210
 msgid "vi"
 msgstr "vi"
 
-#: rules/base.xml:5662 rules/base.extras.xml:1203
+#: rules/base.xml:5688 rules/base.extras.xml:1211
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: rules/base.xml:5671
-msgid "Vietnamese (US, with Vietnamese letters)"
-msgstr "Vietnamita (EUA, com letras vietnamitas)"
+#: rules/base.xml:5697
+msgid "Vietnamese (US)"
+msgstr "Vietnamita (US)"
 
-#: rules/base.xml:5677
-msgid "Vietnamese (French, with Vietnamese letters)"
-msgstr "Vietnamita (Francês, com letras vietnamitas)"
+#: rules/base.xml:5703
+msgid "Vietnamese (French)"
+msgstr "Vietnamita (Francês)"
 
 #. Keyboard indicator for Korean layouts
-#: rules/base.xml:5686 rules/base.extras.xml:1186
+#: rules/base.xml:5712 rules/base.extras.xml:1194
 msgid "ko"
 msgstr "ko"
 
-#: rules/base.xml:5687 rules/base.extras.xml:1187
+#: rules/base.xml:5713 rules/base.extras.xml:1195
 msgid "Korean"
 msgstr "Coreano"
 
-#: rules/base.xml:5696
-msgid "Korean (101/104 key compatible)"
+#: rules/base.xml:5722
+msgid "Korean (101/104-key compatible)"
 msgstr "Coreano (compatível com 101/104 teclas)"
 
-#: rules/base.xml:5706
+#: rules/base.xml:5732
 msgid "Japanese (PC-98)"
 msgstr "Japonês (PC-98)"
 
 #. Keyboard indicator for Irish layouts
-#: rules/base.xml:5719
+#: rules/base.xml:5745
 msgid "ie"
 msgstr "ie"
 
-#: rules/base.xml:5720
+#: rules/base.xml:5746
 msgid "Irish"
 msgstr "Irlandês"
 
-#: rules/base.xml:5729
+#: rules/base.xml:5755
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: rules/base.xml:5738
+#: rules/base.xml:5764
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlandês (UnicodeExpert)"
 
-#: rules/base.xml:5744
+#: rules/base.xml:5770
 msgid "Ogham"
 msgstr "Ogham"
 
-#: rules/base.xml:5753
+#: rules/base.xml:5779
 msgid "Ogham (IS434)"
 msgstr "Ogham (IS434)"
 
-#: rules/base.xml:5766
+#: rules/base.xml:5792
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Paquistão)"
 
-#: rules/base.xml:5775
+#: rules/base.xml:5801
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Paquistão, CRULP)"
 
-#: rules/base.xml:5781
+#: rules/base.xml:5807
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Paquistão, NLA)"
 
-#: rules/base.xml:5788
+#: rules/base.xml:5814
 msgid "Arabic (Pakistan)"
 msgstr "Árabe (Paquistão)"
 
 #. Keyboard indicator for Sindhi layouts
-#: rules/base.xml:5798
+#: rules/base.xml:5824
 msgid "sd"
 msgstr "sd"
 
-#: rules/base.xml:5799
+#: rules/base.xml:5825
 msgid "Sindhi"
 msgstr "Sindhi"
 
 #. Keyboard indicator for Dhivehi layouts
-#: rules/base.xml:5811
+#: rules/base.xml:5837
 msgid "dv"
 msgstr "dv"
 
-#: rules/base.xml:5812
+#: rules/base.xml:5838
 msgid "Dhivehi"
 msgstr "Dhivehi"
 
-#: rules/base.xml:5824
+#: rules/base.xml:5850
 msgid "English (South Africa)"
 msgstr "Inglês (África do Sul)"
 
 #. Keyboard indicator for Esperanto layouts
-#: rules/base.xml:5834
+#: rules/base.xml:5860
 msgid "eo"
 msgstr "eo"
 
-#: rules/base.xml:5835
+#: rules/base.xml:5861
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: rules/base.xml:5844
-msgid "Esperanto (displaced semicolon and quote, obsolete)"
-msgstr "Esperanto (ponto e vírgula e aspas deslocados, obsoleto)"
+#: rules/base.xml:5870
+msgid "Esperanto (legacy)"
+msgstr "Esperanto (antigo)"
 
 #. Keyboard indicator for Nepali layouts
-#: rules/base.xml:5853
+#: rules/base.xml:5879
 msgid "ne"
 msgstr "ne"
 
-#: rules/base.xml:5854
+#: rules/base.xml:5880
 msgid "Nepali"
 msgstr "Nepali"
 
-#: rules/base.xml:5867
+#: rules/base.xml:5893
 msgid "English (Nigeria)"
 msgstr "Inglês (Nigéria)"
 
 #. Keyboard indicator for Igbo layouts
-#: rules/base.xml:5877
+#: rules/base.xml:5903
 msgid "ig"
 msgstr "ig"
 
-#: rules/base.xml:5878
+#: rules/base.xml:5904
 msgid "Igbo"
 msgstr "Igbo"
 
 #. Keyboard indicator for Yoruba layouts
-#: rules/base.xml:5888
+#: rules/base.xml:5914
 msgid "yo"
 msgstr "yo"
 
-#: rules/base.xml:5889
+#: rules/base.xml:5915
 msgid "Yoruba"
 msgstr "Yoruba"
 
-#: rules/base.xml:5900
+#: rules/base.xml:5926
 msgid "Hausa (Nigeria)"
 msgstr "Hausa (Nigéria)"
 
 #. Keyboard indicator for Amharic layouts
-#: rules/base.xml:5912
+#: rules/base.xml:5938
 msgid "am"
 msgstr "am"
 
-#: rules/base.xml:5913
+#: rules/base.xml:5939
 msgid "Amharic"
 msgstr "Amharic"
 
 #. Keyboard indicator for Wolof layouts
-#: rules/base.xml:5924
+#: rules/base.xml:5950
 msgid "wo"
 msgstr "wo"
 
-#: rules/base.xml:5925
+#: rules/base.xml:5951
 msgid "Wolof"
 msgstr "Wolof"
 
 #. Keyboard indicator for Braille layouts
-#: rules/base.xml:5936
+#: rules/base.xml:5962
 msgid "brl"
 msgstr "brl"
 
-#: rules/base.xml:5937
+#: rules/base.xml:5963
 msgid "Braille"
 msgstr "Braille"
 
-#: rules/base.xml:5943
+#: rules/base.xml:5969
 msgid "Braille (left-handed)"
 msgstr "Braille (canhoto)"
 
-#: rules/base.xml:5949
+#: rules/base.xml:5975
 msgid "Braille (left-handed inverted thumb)"
 msgstr "Braille (canhoto polegar invertido)"
 
-#: rules/base.xml:5955
+#: rules/base.xml:5981
 msgid "Braille (right-handed)"
 msgstr "Braille (destro)"
 
-#: rules/base.xml:5961
+#: rules/base.xml:5987
 msgid "Braille (right-handed inverted thumb)"
 msgstr "Braille (destro polegar invertido)"
 
 #. Keyboard indicator for Turkmen layouts
-#: rules/base.xml:5970
+#: rules/base.xml:5996
 msgid "tk"
 msgstr "tk"
 
-#: rules/base.xml:5971
+#: rules/base.xml:5997
 msgid "Turkmen"
 msgstr "Turkmen"
 
-#: rules/base.xml:5980
+#: rules/base.xml:6006
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmen (Alt-Q)"
 
 #. Keyboard indicator for Bambara layouts
-#: rules/base.xml:5989
+#: rules/base.xml:6015
 msgid "bm"
 msgstr "bm"
 
-#: rules/base.xml:5990
+#: rules/base.xml:6016
 msgid "Bambara"
 msgstr "Bambara"
 
-#: rules/base.xml:6001
+#: rules/base.xml:6027
 msgid "French (Mali, alt.)"
 msgstr "Francês (Mali, alt.)"
 
-#: rules/base.xml:6012
+#: rules/base.xml:6038
 msgid "English (Mali, US, Macintosh)"
 msgstr "Inglês (Mali, EUA, Macintosh)"
 
-#: rules/base.xml:6023
+#: rules/base.xml:6049
 msgid "English (Mali, US, intl.)"
 msgstr "Inglês (Mali, EUA, intl.)"
 
 #. Keyboard indicator for Swahili layouts
-#: rules/base.xml:6035 rules/base.xml:6073
+#: rules/base.xml:6061 rules/base.xml:6099
 msgid "sw"
 msgstr "sw"
 
-#: rules/base.xml:6036
+#: rules/base.xml:6062
 msgid "Swahili (Tanzania)"
 msgstr "Swahili (Tanzânia)"
 
-#: rules/base.xml:6045
+#: rules/base.xml:6071
 msgid "fr-tg"
 msgstr "fr-tg"
 
-#: rules/base.xml:6046
+#: rules/base.xml:6072
 msgid "French (Togo)"
 msgstr "Francês (Togo)"
 
-#: rules/base.xml:6074
+#: rules/base.xml:6100
 msgid "Swahili (Kenya)"
 msgstr "Swahili (Quénia)"
 
-#: rules/base.xml:6085
+#: rules/base.xml:6111
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
 #. Keyboard indicator for Tswana layouts
-#: rules/base.xml:6097
+#: rules/base.xml:6123
 msgid "tn"
 msgstr "tn"
 
-#: rules/base.xml:6098
+#: rules/base.xml:6124
 msgid "Tswana"
 msgstr "Tswana"
 
 #. Keyboard indicator for Filipino layouts
-#: rules/base.xml:6108
+#: rules/base.xml:6134
 msgid "ph"
 msgstr "ph"
 
-#: rules/base.xml:6109
+#: rules/base.xml:6135
 msgid "Filipino"
 msgstr "Filipino"
 
-#: rules/base.xml:6128
+#: rules/base.xml:6154
 msgid "Filipino (QWERTY, Baybayin)"
 msgstr "Filipino (QWERTY, Baybayin)"
 
-#: rules/base.xml:6146
+#: rules/base.xml:6172
 msgid "Filipino (Capewell-Dvorak, Latin)"
 msgstr "Filipino (Capewell-Dvorak, Latino)"
 
-#: rules/base.xml:6152
+#: rules/base.xml:6178
 msgid "Filipino (Capewell-Dvorak, Baybayin)"
 msgstr "Filipino (Capewell-Dvorak, Baybayin)"
 
-#: rules/base.xml:6170
+#: rules/base.xml:6196
 msgid "Filipino (Capewell-QWERF 2006, Latin)"
 msgstr "Filipino (Capewell-QWERF 2006, Latino)"
 
-#: rules/base.xml:6176
+#: rules/base.xml:6202
 msgid "Filipino (Capewell-QWERF 2006, Baybayin)"
 msgstr "Filipino (Capewell-QWERF 2006, Baybayin)"
 
-#: rules/base.xml:6194
+#: rules/base.xml:6220
 msgid "Filipino (Colemak, Latin)"
 msgstr "Filipino (Colemak, Latino)"
 
-#: rules/base.xml:6200
+#: rules/base.xml:6226
 msgid "Filipino (Colemak, Baybayin)"
 msgstr "Filipino (Colemak, Baybayin)"
 
-#: rules/base.xml:6218
+#: rules/base.xml:6244
 msgid "Filipino (Dvorak, Latin)"
 msgstr "Filipino (Dvorak, Latino)"
 
-#: rules/base.xml:6224
+#: rules/base.xml:6250
 msgid "Filipino (Dvorak, Baybayin)"
 msgstr "Filipino (Dvorak, Baybayin)"
 
-#: rules/base.xml:6244
+#: rules/base.xml:6270
 msgid "md"
 msgstr "md"
 
-#: rules/base.xml:6245
+#: rules/base.xml:6271
 msgid "Moldavian"
 msgstr "Moldavo"
 
-#: rules/base.xml:6254
+#: rules/base.xml:6280
 msgid "gag"
 msgstr "gag"
 
-#: rules/base.xml:6255
+#: rules/base.xml:6281
 msgid "Moldavian (Gagauz)"
 msgstr "Moldavo (Gagauz)"
 
-#: rules/base.xml:6266
+#: rules/base.xml:6292
 msgid "id"
 msgstr "id"
 
-#: rules/base.xml:6267
+#: rules/base.xml:6293
 msgid "Indonesian (Arab Melayu, phonetic)"
 msgstr "Indonésio (Arab Melayu, fonético)"
 
-#: rules/base.xml:6282
-msgid "Indonesian (Arab Melayu, ext. phonetic)"
+#: rules/base.xml:6308
+msgid "Indonesian (Arab Melayu, extended phonetic)"
 msgstr "Indonésio (Arab Melayu, fonético estendido)"
 
-#: rules/base.xml:6290
+#: rules/base.xml:6316
 msgid "jv"
 msgstr "jv"
 
-#: rules/base.xml:6291
+#: rules/base.xml:6317
 msgid "Indonesian (Javanese)"
 msgstr "Indonésio (Javanês)"
 
-#: rules/base.xml:6301
+#: rules/base.xml:6327
 msgid "ms"
 msgstr "ms"
 
-#: rules/base.xml:6302
+#: rules/base.xml:6328
 msgid "Malay (Jawi, Arabic Keyboard)"
 msgstr "Malay (Jawi, teclado árabe)"
 
-#: rules/base.xml:6317
+#: rules/base.xml:6343
 msgid "Malay (Jawi, phonetic)"
 msgstr "Malay (Jawi, fonético)"
 
-#: rules/base.xml:6328
+#: rules/base.xml:6354
 msgid "Switching to another layout"
 msgstr "Mudar para outra disposição"
 
-#: rules/base.xml:6333
+#: rules/base.xml:6359
 msgid "Right Alt (while pressed)"
 msgstr "Alt direito (enquanto premido)"
 
-#: rules/base.xml:6339
+#: rules/base.xml:6365
 msgid "Left Alt (while pressed)"
 msgstr "Alt esquerdo (enquanto premido)"
 
-#: rules/base.xml:6345
+#: rules/base.xml:6371
 msgid "Left Win (while pressed)"
 msgstr "Win esquerdo (enquanto premido)"
 
-#: rules/base.xml:6351
+#: rules/base.xml:6377
 msgid "Right Win (while pressed)"
 msgstr "Win direito (enquanto premido)"
 
-#: rules/base.xml:6357
+#: rules/base.xml:6383
 msgid "Any Win (while pressed)"
 msgstr "Qualquer Win (enquanto premido)"
 
-#: rules/base.xml:6363
+#: rules/base.xml:6389
 msgid "Menu (while pressed), Shift+Menu for Menu"
 msgstr "Menu (enquanto premido), Shift+Menu para Menu"
 
-#: rules/base.xml:6369
+#: rules/base.xml:6395
 msgid "Caps Lock (while pressed), Alt+Caps Lock for the original Caps Lock action"
 msgstr "Caps Lock (enquanto premido), Alt+Caps Lock para a acção Caps Lock original"
 
-#: rules/base.xml:6375
+#: rules/base.xml:6401
 msgid "Right Ctrl (while pressed)"
 msgstr "Ctrl direito (enquanto premido)"
 
-#: rules/base.xml:6381 rules/base.xml:6605 rules/base.xml:7093
+#: rules/base.xml:6407 rules/base.xml:6631 rules/base.xml:7119
 msgid "Right Alt"
 msgstr "Alt direito"
 
-#: rules/base.xml:6387 rules/base.xml:6599
+#: rules/base.xml:6413 rules/base.xml:6625
 msgid "Left Alt"
 msgstr "Alt esquerdo"
 
-#: rules/base.xml:6393 rules/base.xml:6629 rules/base.xml:6756
-#: rules/base.xml:7159
+#: rules/base.xml:6419 rules/base.xml:6655 rules/base.xml:6782
+#: rules/base.xml:7185
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: rules/base.xml:6399
+#: rules/base.xml:6425
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: rules/base.xml:6405
+#: rules/base.xml:6431
 msgid "Caps Lock to first layout; Shift+Caps Lock to last layout"
 msgstr "Caps Lock primeira disposição; Shift+Caps Lock última disposição"
 
-#: rules/base.xml:6411
+#: rules/base.xml:6437
 msgid "Left Win to first layout; Right Win/Menu to last layout"
 msgstr "Win esquerdo primeira disposição; Win direito/Menu última disposição"
 
-#: rules/base.xml:6417
+#: rules/base.xml:6443
 msgid "Left Ctrl to first layout; Right Ctrl to last layout"
 msgstr "Ctrl esquerdo primeira disposição; Ctrl direito última disposição"
 
-#: rules/base.xml:6423
+#: rules/base.xml:6449
 msgid "Alt+Caps Lock"
 msgstr "Alt+Caps Lock"
 
-#: rules/base.xml:6429
+#: rules/base.xml:6455
 msgid "Both Shift together"
 msgstr "Ambos Shift em conjunto"
 
-#: rules/base.xml:6435
+#: rules/base.xml:6461
 msgid "Both Alt together"
 msgstr "Ambos Alt em conjunto"
 
-#: rules/base.xml:6441
+#: rules/base.xml:6467
 msgid "Both Ctrl together"
 msgstr "Ambos Ctrl em conjunto"
 
-#: rules/base.xml:6447
+#: rules/base.xml:6473
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: rules/base.xml:6453
+#: rules/base.xml:6479
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl esquerdo+Shift esquerdo"
 
-#: rules/base.xml:6459
+#: rules/base.xml:6485
 msgid "Right Ctrl+Right Shift"
 msgstr "Ctrl direito+Shift direito"
 
-#: rules/base.xml:6465
+#: rules/base.xml:6491
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: rules/base.xml:6471
+#: rules/base.xml:6497
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: rules/base.xml:6477
+#: rules/base.xml:6503
 msgid "Left Alt+Left Shift"
 msgstr "Alt esquerdo+Shift esquerdo"
 
-#: rules/base.xml:6483
+#: rules/base.xml:6509
 msgid "Alt+Space"
 msgstr "Alt+Espaço"
 
-#: rules/base.xml:6489 rules/base.xml:6569 rules/base.xml:7123
+#: rules/base.xml:6515 rules/base.xml:6595 rules/base.xml:7149
 msgid "Menu"
 msgstr "Menu"
 
-#: rules/base.xml:6495 rules/base.xml:6581 rules/base.xml:7099
+#: rules/base.xml:6521 rules/base.xml:6607 rules/base.xml:7125
 msgid "Left Win"
 msgstr "Win esquerdo"
 
-#: rules/base.xml:6501
+#: rules/base.xml:6527
 msgid "Win+Space"
 msgstr "Win+Espaço"
 
-#: rules/base.xml:6507 rules/base.xml:6587 rules/base.xml:7111
+#: rules/base.xml:6533 rules/base.xml:6613 rules/base.xml:7137
 msgid "Right Win"
 msgstr "Win direito"
 
-#: rules/base.xml:6513
+#: rules/base.xml:6539
 msgid "Left Shift"
 msgstr "Shift esquerdo"
 
-#: rules/base.xml:6519
+#: rules/base.xml:6545
 msgid "Right Shift"
 msgstr "Shift direito"
 
-#: rules/base.xml:6525 rules/base.xml:7135
+#: rules/base.xml:6551 rules/base.xml:7161
 msgid "Left Ctrl"
 msgstr "Ctrl esquerdo"
 
-#: rules/base.xml:6531 rules/base.xml:6563 rules/base.xml:7147
+#: rules/base.xml:6557 rules/base.xml:6589 rules/base.xml:7173
 msgid "Right Ctrl"
 msgstr "Ctrl direito"
 
-#: rules/base.xml:6537 rules/base.xml:6762 rules/base.xml:7195
+#: rules/base.xml:6563 rules/base.xml:6788 rules/base.xml:7221
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: rules/base.xml:6543
+#: rules/base.xml:6569
 msgid "Left Ctrl+Left Win to first layout; Right Ctrl+Menu to second layout"
 msgstr "Ctrl esquerdo+Win esquerdo primeira disposição; Ctrl direito+Menu segunda disposição"
 
-#: rules/base.xml:6549
+#: rules/base.xml:6575
 msgid "Left Ctrl+Left Win"
 msgstr "Ctrl esquerdo+Win esquerdo"
 
-#: rules/base.xml:6558 rules/base.extras.xml:1280
+#: rules/base.xml:6584 rules/base.extras.xml:1308
 msgid "Key to choose the 3rd level"
 msgstr "Tecla para escolher o 3º nível"
 
-#: rules/base.xml:6575
+#: rules/base.xml:6601
 msgid "Any Win"
 msgstr "Qualquer Win"
 
-#: rules/base.xml:6593
+#: rules/base.xml:6619
 msgid "Any Alt"
 msgstr "Qualquer Alt"
 
-#: rules/base.xml:6611
+#: rules/base.xml:6637
 msgid "Right Alt; Shift+Right Alt as Compose"
 msgstr "Alt direito; Shift+Alt direito como Compose"
 
-#: rules/base.xml:6617
+#: rules/base.xml:6643
 msgid "Right Alt never chooses 3rd level"
 msgstr "Alt direito nunca escolhe o 3º nível"
 
-#: rules/base.xml:6623
+#: rules/base.xml:6649
 msgid "Enter on keypad"
 msgstr "Inserir no teclado"
 
-#: rules/base.xml:6635
+#: rules/base.xml:6661
 msgid "Backslash"
 msgstr "Barra invertida"
 
-#: rules/base.xml:6641 rules/base.xml:7171
-msgid "&lt;Less/Greater&gt;"
-msgstr "&lt;Menor/Maior&gt;"
+#: rules/base.xml:6667 rules/base.xml:7197
+msgid "The \"&lt; &gt;\" key"
+msgstr "A tecla \"&lt; &gt;\""
 
-#: rules/base.xml:6647
+#: rules/base.xml:6673
 msgid "Caps Lock; acts as onetime lock when pressed together with another 3rd-level chooser"
 msgstr "Caps Lock; actua como bloqueio único quando premido em conjunto com outro selector de 3º nível"
 
-#: rules/base.xml:6653
+#: rules/base.xml:6679
 msgid "Backslash; acts as onetime lock when pressed together with another 3rd level chooser"
 msgstr "Barra invertida; actua como bloqueio único quando premido em conjunto com outro selector de 3º nível"
 
-#: rules/base.xml:6659
-msgid "&lt;Less/Greater&gt;; acts as onetime lock when pressed together with another 3rd level chooser"
-msgstr "&lt;Menor/Maior&gt;; actua como bloqueio único quando premido em conjunto com outro selector de 3º nível"
+#: rules/base.xml:6685
+msgid "The \"&lt; &gt;\" key; acts as onetime lock when pressed together with another 3rd level chooser"
+msgstr "A tecla \"&lt; &gt;\" actua como bloqueio único quando premida em conjunto com outro selector de 3º nível"
 
-#: rules/base.xml:6667
+#: rules/base.xml:6693
 msgid "Ctrl position"
 msgstr "Ctrl posição"
 
-#: rules/base.xml:6672
+#: rules/base.xml:6698
 msgid "Caps Lock as Ctrl"
 msgstr "Caps Lock como Ctrl"
 
-#: rules/base.xml:6678
+#: rules/base.xml:6704
 msgid "Left Ctrl as Meta"
 msgstr "Ctrl esquerdo como Meta"
 
-#: rules/base.xml:6684
+#: rules/base.xml:6710
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Trocar Ctrl e Caps Lock"
 
-#: rules/base.xml:6690
-msgid "Caps Lock as Control, Control as Hyper"
-msgstr "Caps Lock como Ctrl, Control como Hyper"
+#: rules/base.xml:6716
+msgid "Caps Lock as Ctrl, Ctrl as Hyper"
+msgstr "Caps Lock como Ctrl, Ctrl como Hyper"
 
-#: rules/base.xml:6696
-msgid "At left of 'A'"
+#: rules/base.xml:6722
+msgid "To the left of \"A\""
 msgstr "À esquerda de \"A\""
 
-#: rules/base.xml:6702
-msgid "At bottom left"
+#: rules/base.xml:6728
+msgid "At the bottom left"
 msgstr "No fundo à esquerda"
 
-#: rules/base.xml:6708
+#: rules/base.xml:6734
 msgid "Right Ctrl as Right Alt"
 msgstr "Ctrl direito como Alt direito"
 
-#: rules/base.xml:6714
+#: rules/base.xml:6740
 msgid "Menu as Right Ctrl"
 msgstr "Menu como Ctrl direito"
 
-#: rules/base.xml:6720
+#: rules/base.xml:6746
 msgid "Swap Left Alt with Left Ctrl"
 msgstr "Trocar Alt esquerdo com Ctrl esquerdo"
 
-#: rules/base.xml:6726
+#: rules/base.xml:6752
 msgid "Swap Left Win with Left Ctrl"
 msgstr "Trocar Win esquerdo com Ctrl esquerdo"
 
-#: rules/base.xml:6731
+#: rules/base.xml:6757
 msgid "Swap Right Win with Right Ctrl"
 msgstr "Trocar Win direito com Ctrl direito"
 
-#: rules/base.xml:6737
+#: rules/base.xml:6763
 msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Left Alt"
 msgstr "Alt esquerdo como Ctrl, Ctrl esquerdo como Win, Win esquerdo como Alt esquerdo"
 
-#: rules/base.xml:6745
+#: rules/base.xml:6771
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Usar o led do teclado para mostrar disposição alternativa"
 
-#: rules/base.xml:6750
+#: rules/base.xml:6776
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: rules/base.xml:6770
+#: rules/base.xml:6796
 msgid "Use keyboard LED to indicate modifiers"
 msgstr "Usar o led do teclado para indicar modificadores"
 
-#: rules/base.xml:6775
+#: rules/base.xml:6801
 msgid "Compose"
 msgstr "Compor"
 
-#: rules/base.xml:6783
+#: rules/base.xml:6809
 msgid "Layout of numeric keypad"
 msgstr "Disposição do teclado numérico"
 
-#: rules/base.xml:6788
+#: rules/base.xml:6814
 msgid "Legacy"
 msgstr "Antiga"
 
-#: rules/base.xml:6794
-msgid "Unicode additions (arrows and math operators)"
-msgstr "Adições Unicode (setas e operadores matemáticos)"
+#: rules/base.xml:6820
+msgid "Unicode arrows and math operators"
+msgstr "Setas e operadores matemáticos Unicode"
 
-#: rules/base.xml:6800
-msgid "Unicode additions (arrows and math operators; math operators on default level)"
-msgstr "Adições Unicode (setas e operadores matemáticos; operadores matemáticos no nível predefinido)"
+#: rules/base.xml:6826
+msgid "Unicode arrows and math operators on default level"
+msgstr "Setas e operadores matemáticos Unicode no nível predefinido"
 
-#: rules/base.xml:6806
+#: rules/base.xml:6832
 msgid "Legacy Wang 724"
 msgstr "Antigo Wang 724"
 
-#: rules/base.xml:6812
-msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
-msgstr "Teclado Wang 724 com adições Unicode (setas e operadores matemáticos)"
+#: rules/base.xml:6838
+msgid "Wang 724 keypad with Unicode arrows and math operators"
+msgstr "Teclado Wang 724 com setas e operadores matemáticos Unicode"
 
-#: rules/base.xml:6818
-msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
-msgstr "Teclado Wang 724 com adições Unicode (setas e operadores matemáticos; operadores matemáticos no nível predefinido)"
+#: rules/base.xml:6844
+msgid "Wang 724 keypad with Unicode arrows and math operators on default level"
+msgstr "Teclado Wang 724 com setas e operadores matemáticos Unicode no nível predefinido"
 
-#: rules/base.xml:6824
+#: rules/base.xml:6850
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: rules/base.xml:6830
-msgid "ATM/phone-style"
-msgstr "ATM/phone-style"
+#: rules/base.xml:6856
+msgid "Phone and ATM style"
+msgstr "Estilo telefone e ATM"
 
-#: rules/base.xml:6839
+#: rules/base.xml:6865
 msgid "Numeric keypad Delete behavior"
 msgstr "Comportamento de Delete no teclado numérico"
 
-#: rules/base.xml:6845
+#: rules/base.xml:6871
 msgid "Legacy key with dot"
 msgstr "Tecla antiga com ponto"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: rules/base.xml:6852
+#: rules/base.xml:6878
 msgid "Legacy key with comma"
 msgstr "Tecla antiga com vírgula"
 
-#: rules/base.xml:6858
+#: rules/base.xml:6884
 msgid "Four-level key with dot"
 msgstr "Tecla de 4 níveis com ponto"
 
-#: rules/base.xml:6864
+#: rules/base.xml:6890
 msgid "Four-level key with dot, Latin-9 only"
 msgstr "Tecla de 4 níveis com ponto, só Latino-9"
 
-#: rules/base.xml:6870
+#: rules/base.xml:6896
 msgid "Four-level key with comma"
 msgstr "Tecla de 4 níveis com vírgula"
 
-#: rules/base.xml:6876
+#: rules/base.xml:6902
 msgid "Four-level key with momayyez"
 msgstr "Tecla de 4 níveis com momayyez"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: rules/base.xml:6884
+#: rules/base.xml:6910
 msgid "Four-level key with abstract separators"
 msgstr "Tecla de 4 níveis com separadores abstratos"
 
-#: rules/base.xml:6890
+#: rules/base.xml:6916
 msgid "Semicolon on third level"
 msgstr "Ponto e vírgula no 3º nível"
 
-#: rules/base.xml:6900
+#: rules/base.xml:6926
 msgid "Caps Lock behavior"
 msgstr "Comportamento de Caps Lock"
 
-#: rules/base.xml:6905
+#: rules/base.xml:6931
 msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock usa maiúsculas/minúsculas internas; Shift \"pausa\" Caps Lock"
 
-#: rules/base.xml:6911
+#: rules/base.xml:6937
 msgid "Caps Lock uses internal capitalization; Shift does not affect Caps Lock"
 msgstr "Caps Lock usa maiúsculas/minúsculas internas; Shift não afecta Caps Lock"
 
-#: rules/base.xml:6917
+#: rules/base.xml:6943
 msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock actua como Shift com bloqueio; Shift \"pausa\" Caps Lock"
 
-#: rules/base.xml:6923
+#: rules/base.xml:6949
 msgid "Caps Lock acts as Shift with locking; Shift does not affect Caps Lock"
 msgstr "Caps Lock actau como Shift com bloqueio; Shift não afecta Caps Lock"
 
-#: rules/base.xml:6929
+#: rules/base.xml:6955
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock alterna as maiúsculas/minúsculas dos caracteres alfabéticos"
 
-#: rules/base.xml:6935
-msgid "Caps Lock toggles ShiftLock (affects all keys)"
-msgstr "Caps Lock alterna ShiftLock (afecta todas as teclas)"
+#: rules/base.xml:6961
+msgid "Caps Lock toggles Shift Lock (affects all keys)"
+msgstr "Caps Lock alterna Shift Lock (afecta todas as teclas)"
 
-#: rules/base.xml:6941
-msgid "Swap ESC and Caps Lock"
+#: rules/base.xml:6967
+msgid "Swap Esc and Caps Lock"
 msgstr "Trocar ESC e Caps Lock"
 
-#: rules/base.xml:6947
+#: rules/base.xml:6973
 msgid "Make Caps Lock an additional Esc"
 msgstr "Tornar Caps Lock um Esc adicional"
 
-#: rules/base.xml:6953
-msgid "Make unmodified Caps Lock an additional Esc, but Shift + Caps Lock behaves like regular Caps Lock"
-msgstr "Torna Caps Lock não modificado num Esc adicional, mas Shift + Caps Lock comporta-se como o Caps Lock normal"
+#: rules/base.xml:6979
+msgid "Make Caps Lock an additional Esc, but Shift + Caps Lock is the regular Caps Lock"
+msgstr "Torna Caps Lock num Esc adicional, mas Shift + Caps Lock é o Caps Lock normal"
 
-#: rules/base.xml:6959
+#: rules/base.xml:6985
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Tornar Caps Lock um Backspace adicional"
 
-#: rules/base.xml:6965
+#: rules/base.xml:6991
 msgid "Make Caps Lock an additional Super"
 msgstr "Tornar Caps Lock um Super adicional"
 
-#: rules/base.xml:6971
+#: rules/base.xml:6997
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Tornar Caps Lock um Hyper adicional"
 
-#: rules/base.xml:6977
+#: rules/base.xml:7003
 msgid "Make Caps Lock an additional Menu key"
 msgstr "Tornar Caps Lock um Menu adicional"
 
-#: rules/base.xml:6983
+#: rules/base.xml:7009
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Tornar Caps Lock um Num Lock adicional"
 
-#: rules/base.xml:6989
+#: rules/base.xml:7015
 msgid "Caps Lock is also a Ctrl"
 msgstr "Caps Lock é também Ctrl"
 
-#: rules/base.xml:6995
+#: rules/base.xml:7021
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock está desactivado"
 
-#: rules/base.xml:7003
-msgid "Alt/Win key behavior"
-msgstr "Comportamento de Alt/Win"
+#: rules/base.xml:7029
+msgid "Alt and Win behavior"
+msgstr "Comportamento de Alt e Win"
 
-#: rules/base.xml:7008
+#: rules/base.xml:7034
 msgid "Add the standard behavior to Menu key"
 msgstr "Adicionar o comportamento padrão à tecla Menu"
 
-#: rules/base.xml:7014
+#: rules/base.xml:7040
 msgid "Menu is mapped to Win"
 msgstr "Meta é mapeado para Win"
 
-#: rules/base.xml:7020
+#: rules/base.xml:7046
 msgid "Alt and Meta are on Alt"
 msgstr "Alt e Meta estão no Alt"
 
-#: rules/base.xml:7026
+#: rules/base.xml:7052
 msgid "Alt is mapped to Win and the usual Alt"
 msgstr "Alt é mapeado para Win e o Alt habitual"
 
-#: rules/base.xml:7032
-msgid "Ctrl is mapped to Win and the usual Ctrl keys"
-msgstr "Ctrl é mapeado para Win e as teclas habituais Ctrl"
+#: rules/base.xml:7058
+msgid "Ctrl is mapped to Win and the usual Ctrl"
+msgstr "Ctrl é mapeado para Win e as teclas habituais Ctrl "
 
-#: rules/base.xml:7038
-msgid "Ctrl is mapped to Alt; Alt is mapped to Win"
+#: rules/base.xml:7064
+msgid "Ctrl is mapped to Alt, Alt to Win"
 msgstr "Ctrl é mapeado para Alt; Alt é mapeado para Win"
 
-#: rules/base.xml:7044
+#: rules/base.xml:7070
 msgid "Meta is mapped to Win"
 msgstr "Meta é mapeado para Win"
 
-#: rules/base.xml:7050
+#: rules/base.xml:7076
 msgid "Meta is mapped to Left Win"
 msgstr "Meta é mapeado para Win esquerdo"
 
-#: rules/base.xml:7056
+#: rules/base.xml:7082
 msgid "Hyper is mapped to Win"
 msgstr "Hyper é mapeado para Win"
 
-#: rules/base.xml:7062
+#: rules/base.xml:7088
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Alt é mapeado para Win direito, Super para Menu"
 
-#: rules/base.xml:7068
+#: rules/base.xml:7094
 msgid "Left Alt is swapped with Left Win"
 msgstr "Alt esquerdo é trocado com Win esquerdo"
 
-#: rules/base.xml:7074
+#: rules/base.xml:7100
 msgid "Alt is swapped with Win"
 msgstr "Alt é trocado com Win"
 
-#: rules/base.xml:7080
+#: rules/base.xml:7106
 msgid "Win is mapped to PrtSc and the usual Win"
 msgstr "Win é mapeado para PrtSc e o Win habitual"
 
-#: rules/base.xml:7088
+#: rules/base.xml:7114
 msgid "Position of Compose key"
 msgstr "Posição da tecla Compose"
 
-#: rules/base.xml:7105
+#: rules/base.xml:7131
 msgid "3rd level of Left Win"
 msgstr "3º nível de Win esquerdo"
 
-#: rules/base.xml:7117
+#: rules/base.xml:7143
 msgid "3rd level of Right Win"
 msgstr "3º nível de Win direito"
 
-#: rules/base.xml:7129
+#: rules/base.xml:7155
 msgid "3rd level of Menu"
 msgstr "3º nível de Menu"
 
-#: rules/base.xml:7141
+#: rules/base.xml:7167
 msgid "3rd level of Left Ctrl"
 msgstr "3º nível de Ctrl esquerdo"
 
-#: rules/base.xml:7153
+#: rules/base.xml:7179
 msgid "3rd level of Right Ctrl"
 msgstr "3º nível de Ctrl direito"
 
-#: rules/base.xml:7165
+#: rules/base.xml:7191
 msgid "3rd level of Caps Lock"
 msgstr "3º nível de Caps Lock"
 
-#: rules/base.xml:7177
-msgid "3rd level of &lt;Less/Greater&gt;"
-msgstr "3º nível de &lt;Menor/Maior&gt;"
+#: rules/base.xml:7203
+msgid "3rd level of the \"&lt; &gt;\" key"
+msgstr "3º nível de \"&lt;&gt;\""
 
-#: rules/base.xml:7183
+#: rules/base.xml:7209
 msgid "Pause"
 msgstr "Pausa"
 
-#: rules/base.xml:7189
+#: rules/base.xml:7215
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: rules/base.xml:7202
-msgid "Miscellaneous compatibility options"
-msgstr "Opções diversas de compatibilidade"
+#: rules/base.xml:7228
+msgid "Compatibility options"
+msgstr "Opções de compatibilidade"
 
-#: rules/base.xml:7207
+#: rules/base.xml:7233
 msgid "Default numeric keypad keys"
 msgstr "Teclas numéricas predefinidas"
 
-#: rules/base.xml:7213
+#: rules/base.xml:7239
 msgid "Numeric keypad always enters digits (as in macOS)"
 msgstr "Teclado numérico insere sempre algarismos (como macOS)"
 
-#: rules/base.xml:7219
-msgid "Num Lock on: digits; Shift for arrow keys. Num Lock off: arrow keys (as in Windows)"
+#: rules/base.xml:7245
+msgid "Num Lock on: digits; Shift for arrows. Num Lock off: arrows (as in Windows)"
 msgstr "Num Lock ligado: algarismos; Shift para setas. Num Lock off: setas (como Windows)"
 
-#: rules/base.xml:7225
+#: rules/base.xml:7251
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift não cancela Num Lock, escolhe o 3º nível"
 
-#: rules/base.xml:7231
+#: rules/base.xml:7257
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Teclas especiais (Ctrl+Alt+&lt;tecla&gt;) geridas num servidor"
 
-#: rules/base.xml:7237
-msgid "Apple Aluminium: emulate PC keys (PrtSc, Scroll Lock, Pause, Num Lock)"
-msgstr "Apple Aluminium: emula teclas de PC (PrtSc, Scroll Lock, Pausa, Num Lock)"
+#: rules/base.xml:7263
+msgid "Apple Aluminium emulates Pause, PrtSc, Scroll Lock"
+msgstr "Apple Aluminium: emula teclas Pausa, PrtSc, Scroll Lock"
 
-#: rules/base.xml:7243
+#: rules/base.xml:7269
 msgid "Shift cancels Caps Lock"
 msgstr "Shift cancela Caps Lock"
 
-#: rules/base.xml:7249
+#: rules/base.xml:7275
 msgid "Enable extra typographic characters"
 msgstr "Activar mais caracteres tipográficos"
 
-#: rules/base.xml:7255
+#: rules/base.xml:7281
+msgid "Enable APL overlay characters"
+msgstr "Activar caracteres tipográficos APL"
+
+#: rules/base.xml:7287
 msgid "Both Shift together enable Caps Lock"
 msgstr "Ambos Shift em conjunto activam Caps Lock"
 
-#: rules/base.xml:7261
+#: rules/base.xml:7293
 msgid "Both Shift together enable Caps Lock; one Shift key disables it"
 msgstr "Ambos Shift em conjunto activam Caps Lock; um Shift desactiva-o"
 
-#: rules/base.xml:7267
+#: rules/base.xml:7299
 msgid "Both Shift together enable Shift Lock"
 msgstr "Ambos Shift em conjunto activam Shift Lock"
 
-#: rules/base.xml:7273
+#: rules/base.xml:7305
 msgid "Shift + Num Lock enables PointerKeys"
 msgstr "Shift + Num Lock activam PointerKeys"
 
-#: rules/base.xml:7279
+#: rules/base.xml:7311
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr "Permitir quebra de agarrar com acção do teclado (aviso: risco de segurança)"
 
-#: rules/base.xml:7285
+#: rules/base.xml:7317
 msgid "Allow grab and window tree logging"
 msgstr "Permitir agarrar e diário de árvore da janela"
 
-#: rules/base.xml:7293
-msgid "Adding currency signs to certain keys"
-msgstr "Adicionar símbolos monetários a teclas"
+#: rules/base.xml:7325
+msgid "Currency signs"
+msgstr "Símbolos de moeda"
 
-#: rules/base.xml:7298
+#: rules/base.xml:7330
 msgid "Euro on E"
 msgstr "Euro em E"
 
-#: rules/base.xml:7304
+#: rules/base.xml:7336
 msgid "Euro on 2"
 msgstr "Euro em 2"
 
-#: rules/base.xml:7310
+#: rules/base.xml:7342
 msgid "Euro on 4"
 msgstr "Euro em 4"
 
-#: rules/base.xml:7316
+#: rules/base.xml:7348
 msgid "Euro on 5"
 msgstr "Euro em 5"
 
-#: rules/base.xml:7322
+#: rules/base.xml:7354
 msgid "Rupee on 4"
 msgstr "Rupee em 4"
 
-#: rules/base.xml:7329
+#: rules/base.xml:7361
 msgid "Key to choose 5th level"
 msgstr "Tecla para escolher o 5º nível"
 
-#: rules/base.xml:7334
-msgid "&lt;Less/Greater&gt; chooses 5th level"
-msgstr "&lt;Menor/Maior&gt; escolhe o 5º nível"
+#: rules/base.xml:7366
+msgid "The \"&lt; &gt;\" key chooses 5th level"
+msgstr "A tecla \"&lt; &gt;\" escolhe o 5º nível"
 
-#: rules/base.xml:7340
+#: rules/base.xml:7372
 msgid "Right Alt chooses 5th level"
 msgstr "Alt direito escolhe o 5º nível"
 
-#: rules/base.xml:7346
-msgid "&lt;Less/Greater&gt; chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser"
-msgstr "&lt;Menor/Maior&gt; escolhe 5º nível; actua como bloqueio único quando premido em conjunto com outro selector de 5º nível"
+#: rules/base.xml:7378
+msgid "The \"&lt; &gt;\" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser"
+msgstr "A tecla \"&lt; &gt;\" escolhe 5º nível e actua como bloqueio único quando premido em conjunto com outro selector de 5º nível"
 
-#: rules/base.xml:7352
-msgid "Right Alt chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser"
-msgstr "Alt direito escolhe 5º nível; actua como bloqueio único quando premido em conjunto com outro selector de 5º nível"
+#: rules/base.xml:7384
+msgid "Right Alt chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser"
+msgstr "Alt direito escolhe 5º nível e actua como bloqueio único quando premido em conjunto com outro selector de 5º nível"
 
-#: rules/base.xml:7358
-msgid "Left Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser"
-msgstr "Win esquerdo escolhe 5º nível; actua como bloqueio único quando premido em conjunto com outro selector de 5º nível"
+#: rules/base.xml:7390
+msgid "Left Win chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser"
+msgstr "Win esquerdo escolhe 5º nível e actua como bloqueio único quando premido em conjunto com outro selector de 5º nível"
 
-#: rules/base.xml:7364
-msgid "Right Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser"
-msgstr "Win direito escolhe 5º nível; actua como bloqueio único quando premido em conjunto com outro selector de 5º nível"
+#: rules/base.xml:7396
+msgid "Right Win chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser"
+msgstr "Win direito escolhe 5º nível e actua como bloqueio único quando premido em conjunto com outro selector de 5º nível"
 
-#: rules/base.xml:7410
-msgid "Using space key to input non-breaking space"
-msgstr "Usar a tecla de espaço para inserido um espaço inseparável"
+#: rules/base.xml:7442
+msgid "Non-breaking space input"
+msgstr "Inserção de espaço inseparável"
 
-#: rules/base.xml:7415
+#: rules/base.xml:7447
 msgid "Usual space at any level"
 msgstr "Espaço habitual em qualquer nível"
 
-#: rules/base.xml:7421
+#: rules/base.xml:7453
 msgid "Non-breaking space at the 2nd level"
 msgstr "Espaço inseparável no 2º nível"
 
-#: rules/base.xml:7427
+#: rules/base.xml:7459
 msgid "Non-breaking space at the 3rd level"
 msgstr "Espaço inseparável no 3º nível"
 
-#: rules/base.xml:7433
+#: rules/base.xml:7465
 msgid "Non-breaking space at the 3rd level, nothing at the 4th level"
 msgstr "Espaço inseparável no 3º nível, nada no 4º nível"
 
-#: rules/base.xml:7439
+#: rules/base.xml:7471
 msgid "Non-breaking space at the 3rd level, thin non-breaking space at the 4th level"
 msgstr "Espaço inseparável no 3º nível, espaço inseparável fino no 4º nível"
 
-#: rules/base.xml:7445
+#: rules/base.xml:7477
 msgid "Non-breaking space at the 4th level"
 msgstr "Espaço inseparável no 4º nível"
 
-#: rules/base.xml:7451
+#: rules/base.xml:7483
 msgid "Non-breaking space at the 4th level, thin non-breaking space at the 6th level"
 msgstr "Espaço inseparável no 4º nível, espaço inseparável fino no 6º nível"
 
-#: rules/base.xml:7457
+#: rules/base.xml:7489
 msgid "Non-breaking space at the 4th level, thin non-breaking space at the 6th level (via Ctrl+Shift)"
 msgstr "Espaço inseparável no 4º nível, espaço inseparável fino no 6º nível (via Ctrl+Shift)"
 
-#: rules/base.xml:7463
+#: rules/base.xml:7495
 msgid "Zero-width non-joiner at the 2nd level"
 msgstr "Separado de largura zero no 2º nível"
 
-#: rules/base.xml:7469
+#: rules/base.xml:7501
 msgid "Zero-width non-joiner at the 2nd level, zero-width joiner at the 3rd level"
 msgstr "Separado de largura zero no 2º nível, unido de largura zero no 3º nível"
 
-#: rules/base.xml:7475
+#: rules/base.xml:7507
 msgid "Zero-width non-joiner at the 2nd level, zero-width joiner at the 3rd level, non-breaking space at the 4th level"
 msgstr "Separado de largura zero no 2º nível, unido de largura zero no 3º nível, espaço inseparável no 4º nível"
 
-#: rules/base.xml:7481
+#: rules/base.xml:7513
 msgid "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level"
 msgstr "Separado de largura zero no 2º nível, espaço inseparável no 3º nível"
 
-#: rules/base.xml:7487
+#: rules/base.xml:7519
 msgid "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, nothing at the 4th level"
 msgstr "Separado de largura zero no 2º nível, espaço inseparável no 3º nível, nada no 4º nível"
 
-#: rules/base.xml:7493
+#: rules/base.xml:7525
 msgid "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, zero-width joiner at the 4th level"
 msgstr "Separado de largura zero no 2º nível, espaço inseparável no 3º nível, unido de largura zero no 4º nível"
 
-#: rules/base.xml:7499
+#: rules/base.xml:7531
 msgid "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, thin non-breaking space at the 4th level"
 msgstr "Separado de largura zero no 2º nível, espaço inseparável no 3º nível, espaço inseparável fino no 4º nível"
 
-#: rules/base.xml:7505
+#: rules/base.xml:7537
 msgid "Zero-width non-joiner at the 3rd level, zero-width joiner at the 4th level"
 msgstr "Separado de largura zero no 3º nível, unido de largura zero no 4º nível"
 
-#: rules/base.xml:7512
+#: rules/base.xml:7544
 msgid "Japanese keyboard options"
 msgstr "Opções de teclado japonês"
 
-#: rules/base.xml:7517
+#: rules/base.xml:7549
 msgid "Kana Lock key is locking"
 msgstr "Tecla Kana Lock bloqueia"
 
-#: rules/base.xml:7523
+#: rules/base.xml:7555
 msgid "NICOLA-F style Backspace"
 msgstr "NICOLA-F estilo Retorno"
 
-#: rules/base.xml:7529
+#: rules/base.xml:7561
 msgid "Make Zenkaku Hankaku an additional Esc"
 msgstr "Tornar Zenkaku Hankaku um Esc"
 
-#: rules/base.xml:7536
+#: rules/base.xml:7568
 msgid "Korean Hangul/Hanja keys"
 msgstr "Teclas coreanas Hangul/Hanja"
 
-#: rules/base.xml:7541
+#: rules/base.xml:7573
 msgid "Make right Alt a Hangul key"
 msgstr "Torna o Alt direito uma tecla Hangul"
 
-#: rules/base.xml:7547
+#: rules/base.xml:7579
 msgid "Make right Ctrl a Hangul key"
 msgstr "Torna o Ctrl direito uma tecla Hangul"
 
-#: rules/base.xml:7553
+#: rules/base.xml:7585
 msgid "Make right Alt a Hanja key"
 msgstr "Torna o Alt direito uma tecla Hanja"
 
-#: rules/base.xml:7559
+#: rules/base.xml:7591
 msgid "Make right Ctrl a Hanja key"
 msgstr "Torna o Ctrl direito uma tecla Hanja"
 
-#: rules/base.xml:7566
-msgid "Adding Esperanto supersigned letters"
-msgstr "Adicionar letras Esperanto"
+#: rules/base.xml:7598
+msgid "Esperanto letters with superscripts"
+msgstr "Letras Esperanto com sobrescritos"
 
-#: rules/base.xml:7571
-msgid "To the corresponding key in a QWERTY layout"
-msgstr "À tecla correspondente numa disposição QWERTY"
+#: rules/base.xml:7603
+msgid "At the corresponding key in a QWERTY layout"
+msgstr "Na tecla correspondente numa disposição QWERTY"
 
-#: rules/base.xml:7577
-msgid "To the corresponding key in a Dvorak layout"
-msgstr "À tecla correspondente numa disposição Dvorak"
+#: rules/base.xml:7609
+msgid "At the corresponding key in a Dvorak layout"
+msgstr "Na tecla correspondente numa disposição Dvorak"
 
-#: rules/base.xml:7583
-msgid "To the corresponding key in a Colemak layout"
-msgstr "À tecla correspondente numa disposição Colemak"
+#: rules/base.xml:7615
+msgid "At the corresponding key in a Colemak layout"
+msgstr "Na tecla correspondente numa disposição Colemak"
 
-#: rules/base.xml:7590
-msgid "Maintain key compatibility with old Solaris keycodes"
-msgstr "Manter compatibilidade de teclas com códigos Solaris antigos"
+#: rules/base.xml:7622
+msgid "Old Solaris keycodes compatibility"
+msgstr "Compatibilidade com teclas Solaris antigas"
 
-#: rules/base.xml:7595
-msgid "Sun Key compatibility"
+#: rules/base.xml:7627
+msgid "Sun key compatibility"
 msgstr "Compatibilidade Sun Key"
 
-#: rules/base.xml:7602
+#: rules/base.xml:7634
 msgid "Key sequence to kill the X server"
 msgstr "Sequência de teclas para matar o servidor X"
 
-#: rules/base.xml:7607
+#: rules/base.xml:7639
 msgid "Ctrl+Alt+Backspace"
 msgstr "Ctrl+Alt+Backspace"
 
@@ -4382,48 +4402,48 @@ msgid "dlg"
 msgstr "dlg"
 
 #: rules/base.extras.xml:20
-msgid "Dyalog APL complete"
-msgstr "Dyalog APL completo"
+msgid "APL symbols (Dyalog APL)"
+msgstr "Símbolos APL (Dyalog APL)"
 
 #: rules/base.extras.xml:26
 msgid "sax"
 msgstr "sax"
 
 #: rules/base.extras.xml:27
-msgid "APL Keyboard Symbols: sax"
-msgstr "Símbolos de teclado APL: sax"
+msgid "APL symbols (SAX, Sharp APL for Unix)"
+msgstr "Símbolos APL (SAX, Sharp APL para Unix)"
 
 #: rules/base.extras.xml:33
 msgid "ufd"
 msgstr "ufd"
 
 #: rules/base.extras.xml:34
-msgid "APL Keyboard Symbols: Unified Layout"
-msgstr "Símbolos de teclado APL: disposição unificada"
+msgid "APL symbols (unified)"
+msgstr "Símbolos APL (unificados)"
 
 #: rules/base.extras.xml:40
 msgid "apl2"
 msgstr "apl2"
 
 #: rules/base.extras.xml:41
-msgid "APL Keyboard Symbols: IBM APL2"
-msgstr "Símbolos de teclado APL: IBM APL2"
+msgid "APL symbols (IBM APL2)"
+msgstr "Símbolos APL (IBM APL2)"
 
 #: rules/base.extras.xml:47
 msgid "aplII"
 msgstr "aplII"
 
 #: rules/base.extras.xml:48
-msgid "APL Keyboard Symbols: Manugistics APL*PLUS II"
-msgstr "Símbolos de teclado APL: Manugistics APL*PLUS II"
+msgid "APL symbols (Manugistics APL*PLUS II)"
+msgstr "Símbolos APL (Manugistics APL*PLUS II)"
 
 #: rules/base.extras.xml:54
 msgid "aplx"
 msgstr "aplx"
 
 #: rules/base.extras.xml:55
-msgid "APL Keyboard Symbols: APLX Unified APL Layout"
-msgstr "Símbolos de teclado APL: APLX Disposição APL unificada"
+msgid "APL symbols (APLX unified)"
+msgstr "Símbolos APL (APLX unificada)"
 
 #: rules/base.extras.xml:73
 msgid "kut"
@@ -4446,12 +4466,12 @@ msgid "Multilingual (Canada, Sun Type 6/7)"
 msgstr "Multilingue (Canadá, Sun Type 6/7)"
 
 #: rules/base.extras.xml:105
-msgid "German (US, with German letters)"
-msgstr "Alemão (EUA, com letras alemãs)"
+msgid "German (US)"
+msgstr "Alemão (US)"
 
 #: rules/base.extras.xml:114
-msgid "German (with Hungarian letters and no dead keys)"
-msgstr "Alemão (com letras húngaras e sem teclas mortas)"
+msgid "German (with Hungarian letters, no dead keys)"
+msgstr "Alemão (com letras húngaras, sem teclas mortas)"
 
 #: rules/base.extras.xml:124
 msgid "Polish (Germany, no dead keys)"
@@ -4474,16 +4494,16 @@ msgid "German (Bone)"
 msgstr "Alemão (Bone)"
 
 #: rules/base.extras.xml:158
-msgid "German (Bone, eszett home row)"
-msgstr "Alemão (Bone, eszett home row)"
+msgid "German (Bone, eszett in the home row)"
+msgstr "Alemão (Bone, eszett na linha inicial)"
 
 #: rules/base.extras.xml:164
-msgid "German (Neo qwertz)"
-msgstr "Alemão (Neo qwertz)"
+msgid "German (Neo, QWERTZ)"
+msgstr "Alemão (Neo, QWERTZ)"
 
 #: rules/base.extras.xml:170
-msgid "German (Neo qwerty)"
-msgstr "Alemão (Neo qwerty)"
+msgid "German (Neo, QWERTY)"
+msgstr "Alemão (Neo, QWERTY)"
 
 #: rules/base.extras.xml:178
 msgid "Russian (Germany, recommended)"
@@ -4498,8 +4518,8 @@ msgid "de_lld"
 msgstr "de_lld"
 
 #: rules/base.extras.xml:199
-msgid "German Ladin"
-msgstr "Alemão Ladin"
+msgid "German (Ladin)"
+msgstr "Alemão (Ladin)"
 
 #: rules/base.extras.xml:217
 msgid "oldhun"
@@ -4509,404 +4529,632 @@ msgstr "oldhun"
 msgid "Old Hungarian"
 msgstr "Húngaro antigo"
 
-#: rules/base.extras.xml:236
+#: rules/base.extras.xml:224
+msgid "ohu_lig"
+msgstr "ohu_lig"
+
+#: rules/base.extras.xml:225
+msgid "Old Hungarian (for ligatures)"
+msgstr "Húngaro antigo (para ligações)"
+
+#: rules/base.extras.xml:244
 msgid "Avestan"
 msgstr "Avestan"
 
-#: rules/base.extras.xml:257
-msgid "Lithuanian (US Dvorak with Lithuanian letters)"
-msgstr "Lituano (EUA Dvorak com letras lituanas)"
+#: rules/base.extras.xml:265
+msgid "Lithuanian (Dvorak)"
+msgstr "Lituano (Dvorak)"
 
-#: rules/base.extras.xml:263
+#: rules/base.extras.xml:271
 msgid "Lithuanian (Sun Type 6/7)"
 msgstr "Lituano (Sun Type 6/7)"
 
-#: rules/base.extras.xml:281
-msgid "Latvian (US Dvorak)"
-msgstr "Letão (EUA Dvorak)"
+#: rules/base.extras.xml:289
+msgid "Latvian (Dvorak)"
+msgstr "Letão (Dvorak)"
 
-#: rules/base.extras.xml:287
-msgid "Latvian (US Dvorak, Y variant)"
-msgstr "Letão (EUA Dvorak, variante Y)"
+#: rules/base.extras.xml:295
+msgid "Latvian (Dvorak, with Y)"
+msgstr "Letão (Dvorak, com Y)"
 
-#: rules/base.extras.xml:293
-msgid "Latvian (US Dvorak, minus variant)"
-msgstr "Letão (EUA Dvorak, variante menos)"
+#: rules/base.extras.xml:301
+msgid "Latvian (Dvorak, with minus)"
+msgstr "Letão (Dvorak, com menos)"
 
-#: rules/base.extras.xml:299
-msgid "Latvian (programmer US Dvorak)"
-msgstr "Letão (programador EUA Dvorak)"
+#: rules/base.extras.xml:307
+msgid "Latvian (programmer Dvorak)"
+msgstr "Letão (programador Dvorak)"
 
-#: rules/base.extras.xml:305
-msgid "Latvian (programmer US Dvorak, Y variant)"
-msgstr "Letão (programador EUA Dvorak, variante Y)"
+#: rules/base.extras.xml:313
+msgid "Latvian (programmer Dvorak, with Y)"
+msgstr "Letão (programador Dvorak, com Y)"
 
-#: rules/base.extras.xml:311
-msgid "Latvian (programmer US Dvorak, minus variant)"
-msgstr "Letão (programador EUA Dvorak, variante menos)"
+#: rules/base.extras.xml:319
+msgid "Latvian (programmer Dvorak, with minus)"
+msgstr "Letão (programador Dvorak, com menos)"
 
-#: rules/base.extras.xml:317
-msgid "Latvian (US Colemak)"
-msgstr "Letão (EUA Colemak)"
+#: rules/base.extras.xml:325
+msgid "Latvian (Colemak)"
+msgstr "Letão (Colemak)"
 
-#: rules/base.extras.xml:323
-msgid "Latvian (US Colemak, apostrophe variant)"
-msgstr "Letão (EUA Colemak, variante apóstrofo)"
+#: rules/base.extras.xml:331
+msgid "Latvian (Colemak, with apostrophe)"
+msgstr "Letão (Colemak, com apóstrofo)"
 
-#: rules/base.extras.xml:329
+#: rules/base.extras.xml:337
 msgid "Latvian (Sun Type 6/7)"
 msgstr "Letão (Sun Type 6/7)"
 
-#: rules/base.extras.xml:347
-msgid "English (US, international AltGr Unicode combining)"
-msgstr "Inglês (EUA, AltGr Unicode internacional combinado)"
+#: rules/base.extras.xml:355
+msgid "English (US, intl., AltGr Unicode combining)"
+msgstr "Inglês (US, AltGr Unicode combinado)"
 
-#: rules/base.extras.xml:353
-msgid "English (US, international AltGr Unicode combining, alternative)"
-msgstr "Inglês (EUA, AltGr Unicode internacional combinado, alternativo)"
+#: rules/base.extras.xml:361
+msgid "English (US, intl., AltGr Unicode combining, alt.)"
+msgstr "Inglês (US, AltGr Unicode combinado, alt.)"
 
-#: rules/base.extras.xml:359
+#: rules/base.extras.xml:367
 msgid "Atsina"
 msgstr "Atsina"
 
-#: rules/base.extras.xml:366
+#: rules/base.extras.xml:374
 msgid "Coeur d'Alene Salish"
 msgstr "Coeur d\"Alene Salish"
 
-#: rules/base.extras.xml:375
+#: rules/base.extras.xml:383
 msgid "Czech Slovak and German (US)"
 msgstr "Checo Eslovaco e Alemão (EUA)"
 
-#: rules/base.extras.xml:387
+#: rules/base.extras.xml:395
 msgid "English (Drix)"
 msgstr "Inglês (Drix)"
 
-#: rules/base.extras.xml:393
+#: rules/base.extras.xml:401
 msgid "German, Swedish and Finnish (US)"
 msgstr "Alemão, Sueco e Finlandês (US)"
 
-#: rules/base.extras.xml:405
+#: rules/base.extras.xml:413
 msgid "English (US, IBM Arabic 238_L)"
 msgstr "Inglês (EUA, IBM Árabe 238_L)"
 
-#: rules/base.extras.xml:411
+#: rules/base.extras.xml:419
 msgid "English (US, Sun Type 6/7)"
 msgstr "Inglês (EUA, Sun Type 6/7)"
 
-#: rules/base.extras.xml:417
+#: rules/base.extras.xml:425
 msgid "English (Carpalx)"
 msgstr "Inglês (Carpalx)"
 
-#: rules/base.extras.xml:423
+#: rules/base.extras.xml:431
 msgid "English (Carpalx, intl., with dead keys)"
 msgstr "Inglês (Carpalx, intl., com teclas mortas)"
 
-#: rules/base.extras.xml:429
+#: rules/base.extras.xml:437
 msgid "English (Carpalx, intl., with AltGr dead keys)"
 msgstr "Inglês (Carpalx, intl., com AltGr + teclas mortas)"
 
-#: rules/base.extras.xml:435
+#: rules/base.extras.xml:443
 msgid "English (Carpalx, full optimization)"
 msgstr "Inglês (Carpalx, optimização total)"
 
-#: rules/base.extras.xml:441
+#: rules/base.extras.xml:449
 msgid "English (Carpalx, full optimization, intl., with dead keys)"
 msgstr "Inglês (Carpalx, optimização total, intl., com teclas mortas)"
 
-#: rules/base.extras.xml:447
+#: rules/base.extras.xml:455
 msgid "English (Carpalx, full optimization, intl., with AltGr dead keys)"
 msgstr "Inglês (Carpalx, optimização total, intl., com AltGr + teclas mortas)"
 
-#: rules/base.extras.xml:453
+#: rules/base.extras.xml:461
 msgid "English (3l)"
 msgstr "Inglês (3l)"
 
-#: rules/base.extras.xml:459
-msgid "English (3l, chromebook)"
-msgstr "Inglês ((3l, chromebook))"
+#: rules/base.extras.xml:467
+msgid "English (3l, Chromebook)"
+msgstr "Inglês ((3l, Chromebook))"
 
-#: rules/base.extras.xml:465
+#: rules/base.extras.xml:473
 msgid "Sicilian (US keyboard)"
 msgstr "Siciliano (teclado EUA)"
 
-#: rules/base.extras.xml:488
+#: rules/base.extras.xml:496
 msgid "Polish (intl., with dead keys)"
 msgstr "Polaco (intl., com teclas mortas)"
 
-#: rules/base.extras.xml:494
+#: rules/base.extras.xml:502
 msgid "Polish (Colemak)"
 msgstr "Polaco (Colemak)"
 
-#: rules/base.extras.xml:500
+#: rules/base.extras.xml:508
 msgid "Polish (Sun Type 6/7)"
 msgstr "Polaco (Sun Type 6/7)"
 
-#: rules/base.extras.xml:506
+#: rules/base.extras.xml:514
 msgid "Polish (Glagolica)"
 msgstr "Polaco (Glagolica)"
 
-#: rules/base.extras.xml:525
+#: rules/base.extras.xml:533
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr "Tatar da Crimeia (Dobruja Q)"
 
-#: rules/base.extras.xml:534
+#: rules/base.extras.xml:542
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Romeno (Touchtype ergonómico)"
 
-#: rules/base.extras.xml:540
+#: rules/base.extras.xml:548
 msgid "Romanian (Sun Type 6/7)"
 msgstr "Romeno (Sun Type 6/7)"
 
-#: rules/base.extras.xml:558
+#: rules/base.extras.xml:566
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Sérvio (combinando acentos em vez de teclas mortas)"
 
-#: rules/base.extras.xml:573
+#: rules/base.extras.xml:581
 msgid "Church Slavonic"
 msgstr "Eslavo eclesiástico"
 
-#: rules/base.extras.xml:583
+#: rules/base.extras.xml:591
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr "Russo (com disposição ucraniana-bielorrussa)"
 
-#: rules/base.extras.xml:594
+#: rules/base.extras.xml:602
 msgid "Russian (Rulemak, phonetic Colemak)"
 msgstr "Russo (Rulemak, fonético Colemak)"
 
-#: rules/base.extras.xml:600
+#: rules/base.extras.xml:608
 msgid "Russian (phonetic Macintosh)"
 msgstr "Russo (Macintosh fonético)"
 
-#: rules/base.extras.xml:606
+#: rules/base.extras.xml:614
 msgid "Russian (Sun Type 6/7)"
 msgstr "Russo (Sun Type 6/7)"
 
-#: rules/base.extras.xml:612
+#: rules/base.extras.xml:620
 msgid "Russian (with US punctuation)"
 msgstr "Russo (com pontuação EUA)"
 
-#: rules/base.extras.xml:619
+#: rules/base.extras.xml:627
 msgid "Russian (Polyglot and Reactionary)"
 msgstr "Russo (Poliglota e Reactionário)"
 
-#: rules/base.extras.xml:705
-msgid "Armenian (OLPC phonetic)"
+#: rules/base.extras.xml:713
+msgid "Armenian (OLPC, phonetic)"
 msgstr "Arménio (OLPC fonético)"
 
-#: rules/base.extras.xml:723
+#: rules/base.extras.xml:731
 msgid "Hebrew (Biblical, SIL phonetic)"
 msgstr "Hebreu (bíblico, SIL fonético)"
 
-#: rules/base.extras.xml:741
+#: rules/base.extras.xml:749
 msgid "Arabic (Sun Type 6/7)"
 msgstr "Árabe (Sun Type 6/7)"
 
-#: rules/base.extras.xml:747
-msgid "Arabic (with extensions for Arabic-written other languages and European digits preferred)"
-msgstr "Árabe (com extensões para outros idiomas escritos em Árabe e algarismos europeus)"
+#: rules/base.extras.xml:755
+msgid "Arabic (Arabic numerals, extensions in the 4th level)"
+msgstr "Árabe (numerais árabes, extensões no 4º nível)"
 
-#: rules/base.extras.xml:753
-msgid "Arabic (with extensions for Arabic-written other languages and Arabic digits preferred)"
-msgstr "Árabe (com extensões para outros idiomas escritos em Árabe e algarismos árabes)"
+#: rules/base.extras.xml:761
+msgid "Arabic (Eastern Arabic numerals, extensions in the 4th level)"
+msgstr "Árabe (numerais árabes leste, extensões no 4º nível)"
 
-#: rules/base.extras.xml:759
+#: rules/base.extras.xml:767
 msgid "Ugaritic instead of Arabic"
 msgstr "Ugaritic em vez de Árabe"
 
-#: rules/base.extras.xml:774
+#: rules/base.extras.xml:782
 msgid "Belgian (Sun Type 6/7)"
 msgstr "Belga (Sun Type 6/7) "
 
-#: rules/base.extras.xml:789
+#: rules/base.extras.xml:797
 msgid "Portuguese (Brazil, Sun Type 6/7)"
 msgstr "Português (Brasil, Sun Type 6/7)"
 
-#: rules/base.extras.xml:804
+#: rules/base.extras.xml:812
 msgid "Czech (Sun Type 6/7)"
 msgstr "Checo (Sun Type 6/7)"
 
-#: rules/base.extras.xml:810
+#: rules/base.extras.xml:818
 msgid "Czech (programming)"
 msgstr "Checo (programação)"
 
-#: rules/base.extras.xml:816
+#: rules/base.extras.xml:824
 msgid "Czech (typographic)"
 msgstr "Checo (tipográfico)"
 
-#: rules/base.extras.xml:822
+#: rules/base.extras.xml:830
 msgid "Czech (coder)"
 msgstr "Checo (codificador)"
 
-#: rules/base.extras.xml:828
+#: rules/base.extras.xml:836
 msgid "Czech (programming, typographic)"
 msgstr "Checo (programação, tipográfico"
 
-#: rules/base.extras.xml:843
+#: rules/base.extras.xml:851
 msgid "Danish (Sun Type 6/7)"
 msgstr "Dinamarquês (Sun Type 6/7)"
 
-#: rules/base.extras.xml:858
+#: rules/base.extras.xml:866
 msgid "Dutch (Sun Type 6/7)"
 msgstr "Holandês (Sun Type 6/7)"
 
-#: rules/base.extras.xml:873
+#: rules/base.extras.xml:881
 msgid "Estonian (Sun Type 6/7)"
 msgstr "Estónio (Sun Type 6/7)"
 
-#: rules/base.extras.xml:888
+#: rules/base.extras.xml:896
 msgid "Finnish (Sun Type 6/7)"
 msgstr "Finlandês (Sun Type 6/7)"
 
-#: rules/base.extras.xml:894
+#: rules/base.extras.xml:902
 msgid "Finnish (DAS)"
 msgstr "Finlandês (DAS)"
 
-#: rules/base.extras.xml:900
+#: rules/base.extras.xml:908
 msgid "Finnish (Dvorak)"
 msgstr "Finlandês (Dvorak)"
 
-#: rules/base.extras.xml:915
+#: rules/base.extras.xml:923
 msgid "French (Sun Type 6/7)"
 msgstr "Francês (Sun Type 6/7)"
 
-#: rules/base.extras.xml:921
-msgid "French (US, with French letters, with dead keys, alternative)"
-msgstr "Francês (EUA, com letras francesas, com teclas mortas, alternativo)"
+#: rules/base.extras.xml:929
+msgid "French (US with dead keys, alt.)"
+msgstr "Francês (US com teclas mortas, alt.)"
 
-#: rules/base.extras.xml:927
+#: rules/base.extras.xml:935
 msgid "French (US, AZERTY)"
 msgstr "Francês (EUA, AZERTY)"
 
-#: rules/base.extras.xml:942
+#: rules/base.extras.xml:950
 msgid "Greek (Sun Type 6/7)"
 msgstr "Grego (Sun Type 6/7)"
 
-#: rules/base.extras.xml:948
+#: rules/base.extras.xml:956
 msgid "Greek (Colemak)"
 msgstr "Grego (Colemak)"
 
-#: rules/base.extras.xml:963
+#: rules/base.extras.xml:971
 msgid "Italian (Sun Type 6/7)"
 msgstr "Italiano (Sun Type 6/7)"
 
-#: rules/base.extras.xml:969
+#: rules/base.extras.xml:977
 msgid "it_lld"
 msgstr "it_lld"
 
-#: rules/base.extras.xml:970
-msgid "Italian Ladin"
-msgstr "Italiano Ladin"
+#: rules/base.extras.xml:978
+msgid "Italian (Ladin)"
+msgstr "Italiano (Ladin)"
 
-#: rules/base.extras.xml:989
+#: rules/base.extras.xml:997
 msgid "Japanese (Sun Type 6)"
 msgstr "Japonês (Sun Type 6)"
 
-#: rules/base.extras.xml:995
-msgid "Japanese (Sun Type 7 - pc compatible)"
-msgstr "Japonês (Sun Type 7 - compatível pc)"
+#: rules/base.extras.xml:1003
+msgid "Japanese (Sun Type 7, PC-compatible)"
+msgstr "Japonês (Sun Type 7, compatível pc)"
 
-#: rules/base.extras.xml:1001
-msgid "Japanese (Sun Type 7 - sun compatible)"
-msgstr "Japonês (Sun Type 7 - compatível sun"
+#: rules/base.extras.xml:1009
+msgid "Japanese (Sun Type 7, Sun-compatible)"
+msgstr "Japonês (Sun Type 7, compatível sun"
 
-#: rules/base.extras.xml:1016
+#: rules/base.extras.xml:1024
 msgid "Norwegian (Sun Type 6/7)"
 msgstr "Norueguês (Sun Type 6/7)"
 
-#: rules/base.extras.xml:1031
+#: rules/base.extras.xml:1039
 msgid "Portuguese (Sun Type 6/7)"
 msgstr "Português (Sun Type 6/7)"
 
-#: rules/base.extras.xml:1046
+#: rules/base.extras.xml:1054
 msgid "Portuguese (Colemak)"
 msgstr "Português (Colemak)"
 
-#: rules/base.extras.xml:1061
+#: rules/base.extras.xml:1069
 msgid "Slovak (ACC layout, only accented letters)"
 msgstr "Eslovaco (disposição ACC, só letras acentuadas)"
 
-#: rules/base.extras.xml:1067
+#: rules/base.extras.xml:1075
 msgid "Slovak (Sun Type 6/7)"
 msgstr "Eslovaco (Sun Type 6/7)"
 
-#: rules/base.extras.xml:1082
+#: rules/base.extras.xml:1090
 msgid "Spanish (Sun Type 6/7)"
 msgstr "Espanhol (Sun Type 6/7)"
 
-#: rules/base.extras.xml:1097
+#: rules/base.extras.xml:1105
 msgid "Swedish (Dvorak A5)"
 msgstr "Sueco (Dvorak A5)"
 
-#: rules/base.extras.xml:1103
+#: rules/base.extras.xml:1111
 msgid "Swedish (Sun Type 6/7)"
 msgstr "Sueco (Sun Type 6/7)"
 
-#: rules/base.extras.xml:1109
+#: rules/base.extras.xml:1117
 msgid "Elfdalian (Swedish, with combining ogonek)"
 msgstr "Elfdalian (Sueco, com ogonek a combinar)"
 
-#: rules/base.extras.xml:1127
+#: rules/base.extras.xml:1135
 msgid "German (Switzerland, Sun Type 6/7)"
 msgstr "Alemão (Suíça, Sun Type 6/7)"
 
-#: rules/base.extras.xml:1133
+#: rules/base.extras.xml:1141
 msgid "French (Switzerland, Sun Type 6/7)"
 msgstr "Francês (Suíça, Sun Type 6/7)"
 
-#: rules/base.extras.xml:1148
+#: rules/base.extras.xml:1156
 msgid "Turkish (Sun Type 6/7)"
 msgstr "Turco (Sun Type 6/7)"
 
-#: rules/base.extras.xml:1163
+#: rules/base.extras.xml:1171
 msgid "Ukrainian (Sun Type 6/7)"
 msgstr "Ucraniano (Sun Type 6/7)"
 
-#: rules/base.extras.xml:1178
+#: rules/base.extras.xml:1186
 msgid "English (UK, Sun Type 6/7)"
 msgstr "Inglês (GBT, Sun Type 6/7)"
 
-#: rules/base.extras.xml:1193
+#: rules/base.extras.xml:1201
 msgid "Korean (Sun Type 6/7)"
 msgstr "Coreano (Sun Type 6/7)"
 
-#: rules/base.extras.xml:1212
+#: rules/base.extras.xml:1220
 msgid "Vietnamese (AÐERTY)"
 msgstr "Vietnamita (AÐERTY)"
 
-#: rules/base.extras.xml:1218
+#: rules/base.extras.xml:1226
 msgid "Vietnamese (QĐERTY)"
 msgstr "Vietnamita (QĐERTY)"
 
 #. Keyboard indicator for European layouts
-#: rules/base.extras.xml:1227
+#: rules/base.extras.xml:1235
 msgid "eu"
 msgstr "eu"
 
-#: rules/base.extras.xml:1228
-msgid "EurKEY (US based layout with European letters)"
-msgstr "EurKEY (disposição baseada nos EUA com letras europeias)"
+#: rules/base.extras.xml:1236
+msgid "EurKEY (US)"
+msgstr "EurKEY (US)"
 
 #. Keyboard layouts for transcription and transliteration systems
-#: rules/base.extras.xml:1269
+#: rules/base.extras.xml:1277
 msgid "International Phonetic Alphabet"
 msgstr "International Phonetic Alphabet"
 
-#: rules/base.extras.xml:1285
+#: rules/base.extras.xml:1293
+msgid "Modi (KaGaPa phonetic)"
+msgstr "Modi (KaGaPa fonético)"
+
+#: rules/base.extras.xml:1313
 msgid "Number key 4 when pressed in isolation"
 msgstr "Tecla numérica 4 quando premida isoladamente"
 
-#: rules/base.extras.xml:1291
+#: rules/base.extras.xml:1319
 msgid "Number key 9 when pressed in isolation"
 msgstr "Tecla numérica 9 quando premida isoladamente"
 
-#: rules/base.extras.xml:1299
+#: rules/base.extras.xml:1327
 msgid "Parentheses position"
 msgstr "Posição dos parênteses"
 
-#: rules/base.extras.xml:1304
+#: rules/base.extras.xml:1332
 msgid "Swap with square brackets"
 msgstr "Trocar com parênteses rectos"
 
+#~ msgid "Generic 105-key PC (intl.)"
+#~ msgstr "Genérico de 105 teclas PC (intl.)"
+
+#~ msgid "Arabic (AZERTY/digits)"
+#~ msgstr "Árabe (AZERTY/dígitos)"
+
+#~ msgid "Arabic (digits)"
+#~ msgstr "Árabe (dígitos)"
+
+#~ msgid "Arabic (qwerty/digits)"
+#~ msgstr "Árabe (qwerty/dígitos)"
+
+#~ msgid "German (Austria, with Sun dead keys)"
+#~ msgstr "Alemão (Áustria, com Sun + teclas mortas)"
+
+#~ msgid "Belgian (alt., with Sun dead keys)"
+#~ msgstr "Belga (alt., com Sun + teclas mortas)"
+
+#~ msgid "Belgian (alt. ISO)"
+#~ msgstr "Belga (alt. ISO)"
+
+#~ msgid "Belgian (with Sun dead keys)"
+#~ msgstr "Belga (com Sun + teclas mortas)"
+
+#~ msgid "Bosnian (US, with Bosnian letters)"
+#~ msgstr "Bósnio (EUA, com letras bósnias)"
+
+#~ msgid "Berber (Morocco, Tifinagh alt. phonetic)"
+#~ msgstr "Berber (Marrocos, Tifinagh alt. fonético)"
+
+#~ msgid "Cameroon Multilingual (Dvorak)"
+#~ msgstr "Camarões Multilingue (Dvorak)"
+
+#~ msgid "Hanyu Pinyin (altgr)"
+#~ msgstr "Hanyu Pinyin (altgr)"
+
+#~ msgid "Croatian (US, with Croatian letters)"
+#~ msgstr "Croata (EUA, com letras croatas)"
+
+#~ msgid "Estonian (US, with Estonian letters)"
+#~ msgstr "Estoniano (EUA, com letras estonianas)"
+
+#~ msgid "French (alt., with Sun dead keys)"
+#~ msgstr "Francês (alt., com Sun + teclas mortas)"
+
+#~ msgid "French (legacy, alt., with Sun dead keys)"
+#~ msgstr "Francês (antigo, alt., com Sun + teclas mortas)"
+
+#~ msgid "French (Bepo, ergonomic, Dvorak way)"
+#~ msgstr "Francês (Bepo, ergonónico, Dvorak)"
+
+#~ msgid "French (Bepo, ergonomic, Dvorak way, Latin-9 only)"
+#~ msgstr "Francês (Bepo, ergonónico, Dvorak, Latino-9 só)"
+
+#~ msgid "French (Bepo, ergonomic, Dvorak way, AFNOR)"
+#~ msgstr "Francês (Bepo, ergonónico, forma Dvorak, AFNOR)"
+
+#~ msgid "French (AFNOR standardized AZERTY)"
+#~ msgstr "Francês (AZERTY padronizado AFNOR)"
+
+#~ msgid "French (US, with French letters)"
+#~ msgstr "Francês (EUA, com letras francesas)"
+
+#~ msgid "German (with Sun dead keys)"
+#~ msgstr "Alemão (com Sun + teclas mortas)"
+
+#~ msgid "Hungarian (102/QWERTZ/comma/dead keys)"
+#~ msgstr "Húngaro (102/QWERTZ/vírgula/teclas mortas)"
+
+#~ msgid "Hungarian (102/QWERTZ/comma/no dead keys)"
+#~ msgstr "Húngaro (102/QWERTZ/vírgula/sem teclas mortas)"
+
+#~ msgid "Hungarian (102/QWERTZ/dot/dead keys)"
+#~ msgstr "Húngaro (102/QWERTZ/ponto/teclas mortas)"
+
+#~ msgid "Hungarian (102/QWERTZ/dot/no dead keys)"
+#~ msgstr "Húngaro (102/QWERTZ/ponto/sem teclas mortas)"
+
+#~ msgid "Hungarian (102/QWERTY/comma/dead keys)"
+#~ msgstr "Húngaro (102/QWERTY/vírgula/teclas mortas)"
+
+#~ msgid "Hungarian (102/QWERTY/comma/no dead keys)"
+#~ msgstr "Húngaro (102/QWERTY/vírgula/sem teclas mortas)"
+
+#~ msgid "Hungarian (102/QWERTY/dot/dead keys)"
+#~ msgstr "Húngaro (102/QWERTY/ponto/teclas mortas)"
+
+#~ msgid "Hungarian (102/QWERTY/dot/no dead keys)"
+#~ msgstr "Húngaro (102/QWERTY/ponto/sem teclas mortas)"
+
+#~ msgid "Icelandic (with Sun dead keys)"
+#~ msgstr "Islandês (com Sun + teclas mortas)"
+
+#~ msgid "Italian (US, with Italian letters)"
+#~ msgstr "Italiano (EUA, com letras italianas)"
+
+#~ msgid "Lao (STEA proposed standard layout)"
+#~ msgstr "Lao (STEA disposição padrão proposta)"
+
+#~ msgid "Spanish (Latin American, with Sun dead keys)"
+#~ msgstr "Espanhol (Latino-Americano, com Sun + teclas mortas)"
+
+#~ msgid "Lithuanian (US, with Lithuanian letters)"
+#~ msgstr "Lituano (EUA, com letras lituanas)"
+
+#~ msgid "Maltese (with US layout)"
+#~ msgstr "Maltês (com disposição EUA)"
+
+#~ msgid "Portuguese (with Sun dead keys)"
+#~ msgstr "Português (com Sun + teclas mortas)"
+
+#~ msgid "Portuguese (Macintosh, with Sun dead keys)"
+#~ msgstr "Português (Macintosh, com Sun + teclas mortas)"
+
+#~ msgid "Russian (phonetic, with Win keys)"
+#~ msgstr "Russo (fonético, com teclas Win)"
+
+#~ msgid "Russian (phonetic yazherty)"
+#~ msgstr "Russo (fonético yazherty)"
+
+#~ msgid "Slovenian (US, with Slovenian letters)"
+#~ msgstr "Esloveno (EUA, com letras eslovenas)"
+
+#~ msgid "Spanish (with Sun dead keys)"
+#~ msgstr "Espanhol (com Sun + teclas mortas)"
+
+#~ msgid "Swedish (based on US Intl. Dvorak)"
+#~ msgstr "Sueco (baseado em EUA Intl. Dvorak)"
+
+#~ msgid "Swedish (US, with Swedish letters)"
+#~ msgstr "Sueco (EUA, com letras suecas)"
+
+#~ msgid "German (Switzerland, with Sun dead keys)"
+#~ msgstr "Alemão (Suíça, com Sun +  teclas mortas)"
+
+#~ msgid "French (Switzerland, with Sun dead keys)"
+#~ msgstr "Francês (Suíça, com Sun +  teclas mortas)"
+
+#~ msgid "Sinhala (US, with Sinhala letters)"
+#~ msgstr "Sinhala (EUA, com letras Sinhala)"
+
+#~ msgid "English (UK, intl., Macintosh)"
+#~ msgstr "Inglês (GBT, intl., Macintosh)"
+
+#~ msgid "Vietnamese (US, with Vietnamese letters)"
+#~ msgstr "Vietnamita (EUA, com letras vietnamitas)"
+
+#~ msgid "Vietnamese (French, with Vietnamese letters)"
+#~ msgstr "Vietnamita (Francês, com letras vietnamitas)"
+
+#~ msgid "Esperanto (displaced semicolon and quote, obsolete)"
+#~ msgstr "Esperanto (ponto e vírgula e aspas deslocados, obsoleto)"
+
+#~ msgid "&lt;Less/Greater&gt;"
+#~ msgstr "&lt;Menor/Maior&gt;"
+
+#~ msgid "ATM/phone-style"
+#~ msgstr "ATM/phone-style"
+
+#~ msgid "Adding currency signs to certain keys"
+#~ msgstr "Adicionar símbolos monetários a teclas"
+
+#~ msgid "&lt;Less/Greater&gt; chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser"
+#~ msgstr "&lt;Menor/Maior&gt; escolhe 5º nível; actua como bloqueio único quando premido em conjunto com outro selector de 5º nível"
+
+#~ msgid "Using space key to input non-breaking space"
+#~ msgstr "Usar a tecla de espaço para inserido um espaço inseparável"
+
+#~ msgid "Adding Esperanto supersigned letters"
+#~ msgstr "Adicionar letras Esperanto"
+
+#~ msgid "Maintain key compatibility with old Solaris keycodes"
+#~ msgstr "Manter compatibilidade de teclas com códigos Solaris antigos"
+
+#~ msgid "Dyalog APL complete"
+#~ msgstr "Dyalog APL completo"
+
+#~ msgid "APL Keyboard Symbols: sax"
+#~ msgstr "Símbolos de teclado APL: sax"
+
+#~ msgid "APL Keyboard Symbols: Unified Layout"
+#~ msgstr "Símbolos de teclado APL: disposição unificada"
+
+#~ msgid "German (US, with German letters)"
+#~ msgstr "Alemão (EUA, com letras alemãs)"
+
+#~ msgid "German (Neo qwertz)"
+#~ msgstr "Alemão (Neo qwertz)"
+
+#~ msgid "German (Neo qwerty)"
+#~ msgstr "Alemão (Neo qwerty)"
+
+#~ msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+#~ msgstr "Lituano (EUA Dvorak com letras lituanas)"
+
+#~ msgid "Latvian (US Dvorak, Y variant)"
+#~ msgstr "Letão (EUA Dvorak, variante Y)"
+
+#~ msgid "Latvian (programmer US Dvorak, Y variant)"
+#~ msgstr "Letão (programador EUA Dvorak, variante Y)"
+
+#~ msgid "English (US, international AltGr Unicode combining, alternative)"
+#~ msgstr "Inglês (EUA, AltGr Unicode internacional combinado, alternativo)"
+
+#~ msgid "Arabic (with extensions for Arabic-written other languages and European digits preferred)"
+#~ msgstr "Árabe (com extensões para outros idiomas escritos em Árabe e algarismos europeus)"
+
+#~ msgid "Arabic (with extensions for Arabic-written other languages and Arabic digits preferred)"
+#~ msgstr "Árabe (com extensões para outros idiomas escritos em Árabe e algarismos árabes)"
+
+#~ msgid "French (US, with French letters, with dead keys, alternative)"
+#~ msgstr "Francês (EUA, com letras francesas, com teclas mortas, alternativo)"
+
+#~ msgid "EurKEY (US based layout with European letters)"
+#~ msgstr "EurKEY (disposição baseada nos EUA com letras europeias)"
+
 #~ msgid "HTC Dream"
 #~ msgstr "HTC Dream"