From 1b8b6e76bf175c4d0ead8d3fc6f01558066cbec9 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 1 Nov 2013 20:47:28 +0100
Subject: added LLFlickrConnect for ACME-1116
---
indra/newview/skins/default/xui/en/strings.xml | 3 +++
1 file changed, 3 insertions(+)
(limited to 'indra/newview/skins/default/xui/en/strings.xml')
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8ac95beddb..0d2083632d 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3442,6 +3442,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="facebook_post_success">
You posted to Facebook.
</string>
+ <string name="flickr_post_success">
+ You posted to Flickr.
+ </string>
<string name="no_session_message">
(IM Session Doesn't Exist)
--
cgit v1.2.3
From 963c97f64a4d1490fe8380805c4de38598adddad Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 1 Nov 2013 23:12:45 +0100
Subject: added LLTwitterConnect for ACME-1133
---
indra/newview/skins/default/xui/en/strings.xml | 3 +++
1 file changed, 3 insertions(+)
(limited to 'indra/newview/skins/default/xui/en/strings.xml')
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0d2083632d..df04ddee86 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3445,6 +3445,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="flickr_post_success">
You posted to Flickr.
</string>
+ <string name="twitter_post_success">
+ You posted to Twitter.
+ </string>
<string name="no_session_message">
(IM Session Doesn't Exist)
--
cgit v1.2.3
From 0e71fb3c9d82bf2a307431f68f8ec84d223a4887 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Sat, 2 Nov 2013 01:50:17 +0100
Subject: added Flickr floater for ACME-1136, ACME-1137, ACME-1138, ACME-1140,
and ACME-1141
---
indra/newview/skins/default/xui/en/strings.xml | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
(limited to 'indra/newview/skins/default/xui/en/strings.xml')
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index df04ddee86..ce09faeac0 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -148,13 +148,19 @@ Please try logging in again in a minute.</string>
<string name="SentToInvalidRegion">You were sent to an invalid region.</string>
<string name="TestingDisconnect">Testing viewer disconnect</string>
- <!-- Facebook Connect and, eventually, other Social Network -->
- <string name="SocialFacebookConnecting">Connecting to Facebook...</string>
- <string name="SocialFacebookPosting">Posting...</string>
- <string name="SocialFacebookDisconnecting">Disconnecting from Facebook...</string>
- <string name="SocialFacebookErrorConnecting">Problem connecting to Facebook</string>
- <string name="SocialFacebookErrorPosting">Problem posting to Facebook</string>
- <string name="SocialFacebookErrorDisconnecting">Problem disconnecting from Facebook</string>
+ <!-- SLShare: Facebook, Flickr, and so on... -->
+ <string name="SocialFacebookConnecting">Connecting to Facebook...</string>
+ <string name="SocialFacebookPosting">Posting...</string>
+ <string name="SocialFacebookDisconnecting">Disconnecting from Facebook...</string>
+ <string name="SocialFacebookErrorConnecting">Problem connecting to Facebook</string>
+ <string name="SocialFacebookErrorPosting">Problem posting to Facebook</string>
+ <string name="SocialFacebookErrorDisconnecting">Problem disconnecting from Facebook</string>
+ <string name="SocialFlickrConnecting">Connecting to Flickr...</string>
+ <string name="SocialFlickrPosting">Posting...</string>
+ <string name="SocialFlickrDisconnecting">Disconnecting from Flickr...</string>
+ <string name="SocialFlickrErrorConnecting">Problem connecting to Flickr</string>
+ <string name="SocialFlickrErrorPosting">Problem posting to Flickr</string>
+ <string name="SocialFlickrErrorDisconnecting">Problem disconnecting from Flickr</string>
<!-- Tooltip -->
<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
--
cgit v1.2.3
From cea9ffe89ce98f04e311aa989cce5955e77a15ff Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Mon, 4 Nov 2013 23:42:21 +0000
Subject: added Twitter floater for ACME-1146, ACME-1147, ACME-1148, ACME-1149,
and ACME-1150
---
indra/newview/skins/default/xui/en/strings.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'indra/newview/skins/default/xui/en/strings.xml')
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ce09faeac0..2b707ed84b 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -148,7 +148,7 @@ Please try logging in again in a minute.</string>
<string name="SentToInvalidRegion">You were sent to an invalid region.</string>
<string name="TestingDisconnect">Testing viewer disconnect</string>
- <!-- SLShare: Facebook, Flickr, and so on... -->
+ <!-- SLShare: Facebook, Flickr, and Twitter -->
<string name="SocialFacebookConnecting">Connecting to Facebook...</string>
<string name="SocialFacebookPosting">Posting...</string>
<string name="SocialFacebookDisconnecting">Disconnecting from Facebook...</string>
@@ -161,6 +161,12 @@ Please try logging in again in a minute.</string>
<string name="SocialFlickrErrorConnecting">Problem connecting to Flickr</string>
<string name="SocialFlickrErrorPosting">Problem posting to Flickr</string>
<string name="SocialFlickrErrorDisconnecting">Problem disconnecting from Flickr</string>
+ <string name="SocialTwitterConnecting">Connecting to Twitter...</string>
+ <string name="SocialTwitterPosting">Posting...</string>
+ <string name="SocialTwitterDisconnecting">Disconnecting from Twitter...</string>
+ <string name="SocialTwitterErrorConnecting">Problem connecting to Twitter</string>
+ <string name="SocialTwitterErrorPosting">Problem posting to Twitter</string>
+ <string name="SocialTwitterErrorDisconnecting">Problem disconnecting from Twitter</string>
<!-- Tooltip -->
<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
--
cgit v1.2.3
From 86442d1f8beae66890231c12ddc1cd9e1f1a6170 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Nov 2013 01:43:00 +0000
Subject: added Flickr and Twitter FUI buttons for ACME-1179
---
indra/newview/skins/default/xui/en/strings.xml | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'indra/newview/skins/default/xui/en/strings.xml')
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2b707ed84b..b24cca588e 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3893,6 +3893,8 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Search_Label">Search</string>
<string name="Command_Snapshot_Label">Snapshot</string>
<string name="Command_Social_Label">Facebook</string>
+ <string name="Command_Flickr_Label">Flickr</string>
+ <string name="Command_Twitter_Label">Twitter</string>
<string name="Command_Speak_Label">Speak</string>
<string name="Command_View_Label">Camera controls</string>
<string name="Command_Voice_Label">Voice settings</string>
@@ -3921,6 +3923,8 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Search_Tooltip">Find places, events, people</string>
<string name="Command_Snapshot_Tooltip">Take a picture</string>
<string name="Command_Social_Tooltip">Post to Facebook</string>
+ <string name="Command_Flickr_Tooltip">Upload to Flickr</string>
+ <string name="Command_Twitter_Tooltip">Twitter</string>
<string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
<string name="Command_View_Tooltip">Changing camera angle</string>
<string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
--
cgit v1.2.3
From 9108354e9d39d93dadbad34ff5ba7ecb7abc7bf9 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 5 Dec 2013 00:28:28 +0000
Subject: Renamed floater_social to floater_facebook for ACME-1205
---
indra/newview/skins/default/xui/en/strings.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'indra/newview/skins/default/xui/en/strings.xml')
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b24cca588e..3806e1287c 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3877,6 +3877,8 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Conversations_Label">Conversations</string>
<string name="Command_Compass_Label">Compass</string>
<string name="Command_Destinations_Label">Destinations</string>
+ <string name="Command_Facebook_Label">Facebook</string>
+ <string name="Command_Flickr_Label">Flickr</string>
<string name="Command_Gestures_Label">Gestures</string>
<string name="Command_HowTo_Label">How to</string>
<string name="Command_Inventory_Label">Inventory</string>
@@ -3892,10 +3894,8 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Profile_Label">Profile</string>
<string name="Command_Search_Label">Search</string>
<string name="Command_Snapshot_Label">Snapshot</string>
- <string name="Command_Social_Label">Facebook</string>
- <string name="Command_Flickr_Label">Flickr</string>
- <string name="Command_Twitter_Label">Twitter</string>
<string name="Command_Speak_Label">Speak</string>
+ <string name="Command_Twitter_Label">Twitter</string>
<string name="Command_View_Label">Camera controls</string>
<string name="Command_Voice_Label">Voice settings</string>
@@ -3907,6 +3907,8 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Conversations_Tooltip">Converse with everyone</string>
<string name="Command_Compass_Tooltip">Compass</string>
<string name="Command_Destinations_Tooltip">Destinations of interest</string>
+ <string name="Command_Facebook_Tooltip">Post to Facebook</string>
+ <string name="Command_Flickr_Tooltip">Upload to Flickr</string>
<string name="Command_Gestures_Tooltip">Gestures for your avatar</string>
<string name="Command_HowTo_Tooltip">How to do common tasks</string>
<string name="Command_Inventory_Tooltip">View and use your belongings</string>
@@ -3922,10 +3924,8 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Profile_Tooltip">Edit or view your profile</string>
<string name="Command_Search_Tooltip">Find places, events, people</string>
<string name="Command_Snapshot_Tooltip">Take a picture</string>
- <string name="Command_Social_Tooltip">Post to Facebook</string>
- <string name="Command_Flickr_Tooltip">Upload to Flickr</string>
- <string name="Command_Twitter_Tooltip">Twitter</string>
<string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
+ <string name="Command_Twitter_Tooltip">Twitter</string>
<string name="Command_View_Tooltip">Changing camera angle</string>
<string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
--
cgit v1.2.3
From 91f401fa2de8c78da7c83561501a1be993588867 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 16 Jan 2014 17:52:14 -0800
Subject: ACME-1237 : Use translation service for filter names so they can be
localized and as also look proper in English. General filter manager cleanup
---
indra/newview/skins/default/xui/en/strings.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
(limited to 'indra/newview/skins/default/xui/en/strings.xml')
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d226a72d7b..92913f678d 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -168,6 +168,18 @@ Please try logging in again in a minute.</string>
<string name="SocialTwitterErrorPosting">Problem posting to Twitter</string>
<string name="SocialTwitterErrorDisconnecting">Problem disconnecting from Twitter</string>
+ <!-- SLShare: User Friendly Filter Names Translation -->
+ <string name="BlackAndWhite">Black & White</string>
+ <string name="Colors1970">1970's Colors</string>
+ <string name="Heatwave">Heat Wave</string>
+ <string name="Intense">Intense</string>
+ <string name="JulesVerne">Jules Verne</string>
+ <string name="Newspaper">Newspaper</string>
+ <string name="Overcast">Overcast</string>
+ <string name="Sepia">Sepia</string>
+ <string name="Spotlight">Spotlight</string>
+ <string name="Video">Video</string>
+
<!-- Tooltip -->
<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
--
cgit v1.2.3
From a5366f06edf5aa1b75328e26011989eba7c601ca Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 13 Feb 2014 15:15:05 -0800
Subject: ACME-1277 : Final set of filters, added a SnapshotFiltersEnabled
debug setting
---
indra/newview/skins/default/xui/en/strings.xml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
(limited to 'indra/newview/skins/default/xui/en/strings.xml')
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 92913f678d..51576f71a8 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -171,16 +171,17 @@ Please try logging in again in a minute.</string>
<!-- SLShare: User Friendly Filter Names Translation -->
<string name="BlackAndWhite">Black & White</string>
<string name="Colors1970">1970's Colors</string>
- <string name="Heatwave">Heat Wave</string>
<string name="Intense">Intense</string>
- <string name="JulesVerne">Jules Verne</string>
- <string name="Newspaper">Newspaper</string>
- <string name="Overcast">Overcast</string>
+ <string name="Newspaper">Newsprint</string>
<string name="Sepia">Sepia</string>
<string name="Spotlight">Spotlight</string>
<string name="Video">Video</string>
-
- <!-- Tooltip -->
+ <string name="Autocontrast">Autocontrast</string>
+ <string name="LensFlare">Lens Flare</string>
+ <string name="Miniature">Miniature</string>
+ <string name="Toycamera">Toy Camera</string>
+
+ <!-- Tooltip -->
<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
<string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
--
cgit v1.2.3