diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-03-05 20:42:24 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-03-06 12:42:57 +0200 |
| commit | be35287184dde0f4a34ac05c5616b7d7d6f59ef7 (patch) | |
| tree | edceab398bc6c63db77b257d8b0908f4a67a98ea /indra/newview/skins/default/xui | |
| parent | a6e1f22a993fde79d0ecb76d60535fdc454a2acd (diff) | |
SL-20429 Fix emoji categories having mixed translations
Was caused by package substituting '&' with 'and' instead of '&'
Diffstat (limited to 'indra/newview/skins/default/xui')
5 files changed, 26 insertions, 22 deletions
diff --git a/indra/newview/skins/default/xui/da/emoji_categories.xml b/indra/newview/skins/default/xui/da/emoji_categories.xml index 456b18e4e2..f2a7f7a3aa 100644 --- a/indra/newview/skins/default/xui/da/emoji_categories.xml +++ b/indra/newview/skins/default/xui/da/emoji_categories.xml @@ -5,13 +5,13 @@ <key>Name</key> <string>smileys and emotion</string> <key>Category</key> - <string>smileys and følelser</string> + <string>smileys & følelser</string> </map> <map> <key>Name</key> <string>people and body</string> <key>Category</key> - <string>mennesker and krop</string> + <string>mennesker & krop</string> </map> <map> <key>Name</key> @@ -23,19 +23,19 @@ <key>Name</key> <string>animals and nature</string> <key>Category</key> - <string>dyr and natur</string> + <string>dyr & natur</string> </map> <map> <key>Name</key> <string>food and drink</string> <key>Category</key> - <string>mad and drikke</string> + <string>mad & drikke</string> </map> <map> <key>Name</key> <string>travel and places</string> <key>Category</key> - <string>rejser and steder</string> + <string>rejser & steder</string> </map> <map> <key>Name</key> diff --git a/indra/newview/skins/default/xui/de/emoji_categories.xml b/indra/newview/skins/default/xui/de/emoji_categories.xml index ed63d0bac9..ff9e4aec63 100644 --- a/indra/newview/skins/default/xui/de/emoji_categories.xml +++ b/indra/newview/skins/default/xui/de/emoji_categories.xml @@ -5,13 +5,13 @@ <key>Name</key> <string>smileys and emotion</string> <key>Category</key> - <string>Smileys and Emotionen</string> + <string>Smileys & Emotionen</string> </map> <map> <key>Name</key> <string>people and body</string> <key>Category</key> - <string>Menschen and Körper</string> + <string>Menschen & Körper</string> </map> <map> <key>Name</key> @@ -23,19 +23,19 @@ <key>Name</key> <string>animals and nature</string> <key>Category</key> - <string>Tiere and Natur</string> + <string>Tiere & Natur</string> </map> <map> <key>Name</key> <string>food and drink</string> <key>Category</key> - <string>Essen and Trinken</string> + <string>Essen & Trinken</string> </map> <map> <key>Name</key> <string>travel and places</string> <key>Category</key> - <string>Reisen and Orte</string> + <string>Reisen & Orte</string> </map> <map> <key>Name</key> diff --git a/indra/newview/skins/default/xui/en/emoji_categories.xml b/indra/newview/skins/default/xui/en/emoji_categories.xml index 0315d0c43a..5e7700da33 100644 --- a/indra/newview/skins/default/xui/en/emoji_categories.xml +++ b/indra/newview/skins/default/xui/en/emoji_categories.xml @@ -1,17 +1,21 @@ <?xml version="1.0" ?> <llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd"> + <!-- WARNING: This file isn't directly localizable at the moment, + translated variants Must match values provided by + 3p_emoji_shortcodes via emoji_characters for categories + to work correctly--> <array> <map> <key>Name</key> <string>smileys and emotion</string> <key>Category</key> - <string>smileys and emotion</string> + <string>smileys & emotion</string> </map> <map> <key>Name</key> <string>people and body</string> <key>Category</key> - <string>people and body</string> + <string>people & body</string> </map> <map> <key>Name</key> @@ -23,19 +27,19 @@ <key>Name</key> <string>animals and nature</string> <key>Category</key> - <string>animals and nature</string> + <string>animals & nature</string> </map> <map> <key>Name</key> <string>food and drink</string> <key>Category</key> - <string>food and drink</string> + <string>food & drink</string> </map> <map> <key>Name</key> <string>travel and places</string> <key>Category</key> - <string>travel and places</string> + <string>travel & places</string> </map> <map> <key>Name</key> diff --git a/indra/newview/skins/default/xui/it/emoji_categories.xml b/indra/newview/skins/default/xui/it/emoji_categories.xml index a4782e60a6..b447a5b78b 100644 --- a/indra/newview/skins/default/xui/it/emoji_categories.xml +++ b/indra/newview/skins/default/xui/it/emoji_categories.xml @@ -5,7 +5,7 @@ <key>Name</key> <string>smileys and emotion</string> <key>Category</key> - <string>smileys and emozione</string> + <string>smileys & emozione</string> </map> <map> <key>Name</key> @@ -23,7 +23,7 @@ <key>Name</key> <string>animals and nature</string> <key>Category</key> - <string>animali and natura</string> + <string>animali & natura</string> </map> <map> <key>Name</key> @@ -35,7 +35,7 @@ <key>Name</key> <string>travel and places</string> <key>Category</key> - <string>viaggi and luoghi</string> + <string>viaggi & luoghi</string> </map> <map> <key>Name</key> diff --git a/indra/newview/skins/default/xui/pl/emoji_categories.xml b/indra/newview/skins/default/xui/pl/emoji_categories.xml index 9aad7af794..42f8e2eb4a 100644 --- a/indra/newview/skins/default/xui/pl/emoji_categories.xml +++ b/indra/newview/skins/default/xui/pl/emoji_categories.xml @@ -5,13 +5,13 @@ <key>Name</key> <string>smileys and emotion</string> <key>Category</key> - <string>buźki and emocje</string> + <string>buźki & emocje</string> </map> <map> <key>Name</key> <string>people and body</string> <key>Category</key> - <string>ludzie and ciało</string> + <string>ludzie & ciało</string> </map> <map> <key>Name</key> @@ -23,7 +23,7 @@ <key>Name</key> <string>animals and nature</string> <key>Category</key> - <string>zwierzęta and przyroda</string> + <string>zwierzęta & przyroda</string> </map> <map> <key>Name</key> @@ -35,7 +35,7 @@ <key>Name</key> <string>travel and places</string> <key>Category</key> - <string>podróże and miejsca</string> + <string>podróże & miejsca</string> </map> <map> <key>Name</key> |