summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/da
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/da')
-rw-r--r--indra/newview/skins/default/xui/da/emoji_categories.xml10
-rw-r--r--indra/newview/skins/default/xui/da/floater_about.xml1
-rw-r--r--indra/newview/skins/default/xui/da/language_settings.xml1
-rw-r--r--indra/newview/skins/default/xui/da/sidepanel_item_info.xml3
4 files changed, 9 insertions, 6 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 &amp; følelser</string>
</map>
<map>
<key>Name</key>
<string>people and body</string>
<key>Category</key>
- <string>mennesker and krop</string>
+ <string>mennesker &amp; 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 &amp; natur</string>
</map>
<map>
<key>Name</key>
<string>food and drink</string>
<key>Category</key>
- <string>mad and drikke</string>
+ <string>mad &amp; drikke</string>
</map>
<map>
<key>Name</key>
<string>travel and places</string>
<key>Category</key>
- <string>rejser and steder</string>
+ <string>rejser &amp; steder</string>
</map>
<map>
<key>Name</key>
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index 7bcae69779..604eb7c58f 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -69,7 +69,6 @@ OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
PCRE Copyright (c) 1997-2008 University of Cambridge
SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
xxHash Copyright (C) 2012-2020 Yann Collet.
zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
google-perftools Copyright (c) 2005, Google Inc.
diff --git a/indra/newview/skins/default/xui/da/language_settings.xml b/indra/newview/skins/default/xui/da/language_settings.xml
index 0e3cbfd2d2..d31afb320a 100644
--- a/indra/newview/skins/default/xui/da/language_settings.xml
+++ b/indra/newview/skins/default/xui/da/language_settings.xml
@@ -5,6 +5,7 @@
<!-- Locale Information -->
<string name="MicrosoftLocale">danish</string>
<string name="MacLocale">da_DK.UTF-8</string>
+ <string name="macOSLocale">da_DK.UTF-8</string>
<string name="DarwinLocale">da_DK.UTF-8</string>
<string name="LinuxLocale">da_DK.UTF-8</string>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
index d52845160b..6a2acfedf7 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
@@ -15,6 +15,9 @@
<panel.string name="acquiredDate">
[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
</panel.string>
+ <panel.string name="acquiredDateAMPM">
+ [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [ampm,datetime,local] [year,datetime,local]
+ </panel.string>
<panel.string name="origin_inventory">
(Beholdning)
</panel.string>