From be35287184dde0f4a34ac05c5616b7d7d6f59ef7 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 5 Mar 2024 20:42:24 +0200 Subject: SL-20429 Fix emoji categories having mixed translations Was caused by package substituting '&' with 'and' instead of '&' --- autobuild.xml | 14 +++++++++----- indra/newview/CMakeLists.txt | 2 ++ indra/newview/skins/default/xui/da/emoji_categories.xml | 10 +++++----- indra/newview/skins/default/xui/de/emoji_categories.xml | 10 +++++----- indra/newview/skins/default/xui/en/emoji_categories.xml | 14 +++++++++----- indra/newview/skins/default/xui/it/emoji_categories.xml | 6 +++--- indra/newview/skins/default/xui/pl/emoji_categories.xml | 8 ++++---- 7 files changed, 37 insertions(+), 27 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 8d4ab978fa..de503a7d34 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -474,9 +474,11 @@ archive hash - 7ac35da9b1b5c9a05954edeef3fe8e54 + 52c41a4547d2d9aceb4a9a1e9e1680c71e5ffa79 + hash_algorithm + sha1 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113242/980233/emoji_shortcodes-6.1.0.579438-darwin64-579438.tar.bz2 + https://github.com/secondlife/3p-emoji-shortcodes/releases/download/v6.1.0.5413f58/emoji_shortcodes-6.1.0.5413f58-darwin64-5413f58.tar.zst name darwin64 @@ -486,16 +488,18 @@ archive hash - 087ce7e6d93dcd88b477b10d8e1ab259 + 3137e06d376767a631bc9626832d558c4d5e5aa9 + hash_algorithm + sha1 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113243/980244/emoji_shortcodes-6.1.0.579438-windows64-579438.tar.bz2 + https://github.com/secondlife/3p-emoji-shortcodes/releases/download/v6.1.0.5413f58/emoji_shortcodes-6.1.0.5413f58-windows64-5413f58.tar.zst name windows64 version - 6.1.0.579438 + 6.1.0.5413f58 expat diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 355f35c558..5e6b8c1b87 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1617,6 +1617,8 @@ set(viewer_APPSETTINGS_FILES app_settings/anim.ini app_settings/cmd_line.xml app_settings/commands.xml + app_settings/emoji_groups.xml + app_settings/foldertypes.xml app_settings/grass.xml app_settings/ignorable_dialogs.xml app_settings/key_bindings.xml 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 @@ Name smileys and emotion Category - smileys and følelser + smileys & følelser Name people and body Category - mennesker and krop + mennesker & krop Name @@ -23,19 +23,19 @@ Name animals and nature Category - dyr and natur + dyr & natur Name food and drink Category - mad and drikke + mad & drikke Name travel and places Category - rejser and steder + rejser & steder Name 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 @@ Name smileys and emotion Category - Smileys and Emotionen + Smileys & Emotionen Name people and body Category - Menschen and Körper + Menschen & Körper Name @@ -23,19 +23,19 @@ Name animals and nature Category - Tiere and Natur + Tiere & Natur Name food and drink Category - Essen and Trinken + Essen & Trinken Name travel and places Category - Reisen and Orte + Reisen & Orte Name 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 @@ + Name smileys and emotion Category - smileys and emotion + smileys & emotion Name people and body Category - people and body + people & body Name @@ -23,19 +27,19 @@ Name animals and nature Category - animals and nature + animals & nature Name food and drink Category - food and drink + food & drink Name travel and places Category - travel and places + travel & places Name 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 @@ Name smileys and emotion Category - smileys and emozione + smileys & emozione Name @@ -23,7 +23,7 @@ Name animals and nature Category - animali and natura + animali & natura Name @@ -35,7 +35,7 @@ Name travel and places Category - viaggi and luoghi + viaggi & luoghi Name 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 @@ Name smileys and emotion Category - buźki and emocje + buźki & emocje Name people and body Category - ludzie and ciało + ludzie & ciało Name @@ -23,7 +23,7 @@ Name animals and nature Category - zwierzęta and przyroda + zwierzęta & przyroda Name @@ -35,7 +35,7 @@ Name travel and places Category - podróże and miejsca + podróże & miejsca Name -- cgit v1.2.3