user cog wheel menu

css/qvitter.css

@@ -424,6 +424,9 @@ button.icon.nav-search span {
     top: 100%;
     z-index: 900;
 	}
+.user-menu-cog .dropdown-menu {
+	width:150px;
+	}
 .quitter-settings.dropdown-menu {
 	margin-right: -400px;
     right: 50%;
@@ -1655,7 +1658,8 @@ body.rtl #history-container.menu-container a .chev-right {
 	display:none;
 	}
 
-#stream-menu-cog {
+#stream-menu-cog,
+.user-menu-cog {
 	display: inline-block;
     font-size: 20px;
     line-height: 20px;
@@ -1664,14 +1668,37 @@ body.rtl #history-container.menu-container a .chev-right {
     position: relative;
 	cursor:pointer;
 	}
-#stream-menu-cog::before {
+.user-menu-cog {
+    float: right;
+    line-height: 26px;
+    margin: 13px 0 0;
+    opacity: 0.6;
+    padding: 0 5px 12px 10px;
+	}
+.hover-card .user-menu-cog {
+    color: #fff;
+    display: block;
+    float: none;
+    font-size: 16px;
+    margin: -32px 0 0;
+    opacity: 0.8;
+    position: absolute;
+    text-shadow: none;
+	}
+.profile-card:not(.logged-in) .user-menu-cog {
+	display:none !important;
+	}
+#stream-menu-cog::before,
+.user-menu-cog::before {
 	content:'\f013';
 	font-family: fontAwesome;
 	}
-#stream-menu-cog.dropped {
+#stream-menu-cog.dropped,
+.user-menu-cog.dropped {
 	opacity:1;
 	}
-#stream-menu-cog .dropdown-menu {
+#stream-menu-cog .dropdown-menu,
+.user-menu-cog .dropdown-menu {
 	z-index:1000;
 	display:block;
 	}

js/ajax-functions.js

@@ -261,6 +261,7 @@ function getAllFollowsMembershipsAndBlocks(callback) {
 
 		if(data.blocks)	{
 			window.allBlocking = data.blocks;
+			markAllNoticesFromBlockedUsersAsBlockedInJQueryObject($('body'));
 			}
 
 		if(typeof callback == 'function') {

js/dom-functions.js

@@ -358,6 +358,18 @@ function buildProfileCard(data) {
 		var follows_you = '<span class="follows-you">' + window.sL.followsYou + '</span>';
 		}
 
+	// me?
+	var is_me = '';
+	if(window.loggedIn !== false && window.loggedIn.id == data.id) {
+		var is_me = ' is-me';
+		}
+
+	// logged in?
+	var logged_in = '';
+	if(window.loggedIn !== false) {
+		var logged_in = ' logged-in';
+		}
+
 	// silenced?
 	var is_silenced = '';
 	if(data.is_silenced === true) {
@@ -394,8 +406,8 @@ function buildProfileCard(data) {
 
 	// full card html
 	data.profileCardHtml = '\
-		<div class="profile-card">\
+		<div class="profile-card' + is_me + logged_in + '">\
-			<div class="profile-header-inner' + is_silenced + is_sandboxed + '" style="' + coverPhotoHtml + '" data-user-id="' + data.id + '">\
+			<div class="profile-header-inner' + is_silenced + is_sandboxed + '" style="' + coverPhotoHtml + '" data-user-id="' + data.id + '" data-screen-name="' + data.screen_name + '">\
 				<div class="profile-header-inner-overlay"></div>\
 				<a class="profile-picture" href="' + data.profile_image_url_original + '">\
 					<img class="avatar profile-size" src="' + data.profile_image_url_profile_size + '" data-user-id="' + data.id + '" />\
@@ -426,6 +438,7 @@ function buildProfileCard(data) {
 					<li class="groups-num"><a href="' + data.statusnet_profile_url + '/groups" class="groups-stats">' + window.sL.groups + '<strong>' + data.groups_count + '</strong></a></li>\
 				</ul>\
 				' + followButton + '\
+				<div class="user-menu-cog" data-tooltip="' + window.sL.userOptions + '"></div>\
 				<div class="clearfix"></div>\
 			</div>\
 		</div>\
@@ -538,6 +551,7 @@ function buildExternalProfileCard(data) {
 					<li class="follower-num"><a class="follower-stats" target="_blank" href="' + data.statusnet_profile_url + '/subscribers">' + window.sL.followers + '<strong>' + data.followers_count + '</strong></a></li>\
 				</ul>\
 				' + followButton + '\
+				<div class="user-menu-cog" data-tooltip="' + window.sL.userOptions + '"></div>\
 				<div class="clearfix"></div>\
 			</div>\
 		</div>\
@@ -783,10 +797,7 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess
 
 			// hide all notices from blocked users (not for user lists)
 			if(window.currentStreamObject.type != 'users' && typeof window.allBlocking != 'undefined') {
-				$.each(window.allBlocking,function(){
+				markAllNoticesFromBlockedUsersAsBlockedInJQueryObject(oldStreamState);
-					oldStreamState.find('strong.name[data-user-id="' + this + '"]').closest('.stream-item').addClass('profile-blocked-by-me');
-					oldStreamState.find('strong.name[data-user-id="' + this + '"]').closest('.stream-item').children('.queet').attr('data-tooltip',window.sL.thisIsANoticeFromABlockedUser);
-					});
 				}
 
 			// hide dublicate repeats, only show the first/oldest instance of a notice

js/misc-functions.js

@@ -309,6 +309,8 @@ function localStorageIsEnabled() {
 
 function blockUser(arg, callback) {
 
+	$('body').click(); // a click somewhere hides any open menus
+
 	// arguments is sent as an object, for easier use with a menu's function-row
 	var userId = arg.userId;
 	var blockButton_jQueryElement = arg.blockButton_jQueryElement;
@@ -337,6 +339,8 @@ function blockUser(arg, callback) {
 	}
 function unblockUser(arg, callback) {
 
+	$('body').click(); // a click somewhere hides any open menus
+
 	// arguments is sent as an object, for easier use with a menu's function-row
 	var userId = arg.userId;
 	var blockButton_jQueryElement = arg.blockButton_jQueryElement;
@@ -431,6 +435,20 @@ function userIsBlocked(userId) {
 		}
 	}
 
+/* ·
+   ·
+   ·  Marks all notices from blocked users in an jQuery object as blocked
+   ·
+   · · · · · · · · · */
+
+
+function markAllNoticesFromBlockedUsersAsBlockedInJQueryObject(obj) {
+	$.each(window.allBlocking,function(){
+		obj.find('.stream-item[data-user-id="' + this + '"]').addClass('profile-blocked-by-me');
+		obj.find('.stream-item[data-user-id="' + this + '"]').children('.queet').attr('data-tooltip',window.sL.thisIsANoticeFromABlockedUser);
+		});
+
+	}
 
 /* ·
    ·

js/qvitter.js

@@ -1174,6 +1174,95 @@ $('#settingslink').click(function(){
 	});
 
 
+
+/* ·
+   ·
+   ·   Show/hide the user menu dropdown on click
+   ·
+   · · · · · · · · · · · · · */
+
+$('body').on('click','.user-menu-cog',function(e){
+	if(!$(e.target).is($(this))) {
+		// don't show/hide when clicking inside the menu
+		}
+
+	// hide
+	else if($(this).hasClass('dropped')) {
+		$(this).removeClass('dropped');
+		$(this).children('.dropdown-menu').remove();
+		}
+
+	// show
+	else {
+
+		$(this).addClass('dropped');
+
+		var profileCard = $(this).closest('.profile-card');
+		var profileHeaderInner = profileCard.children('.profile-header-inner');
+		var userID = profileHeaderInner.attr('data-user-id');
+		var userScreenName = profileHeaderInner.attr('data-screen-name');
+		var silenced = profileHeaderInner.hasClass('silenced');
+		var sandboxed = profileHeaderInner.hasClass('sandboxed');
+
+		// menu
+		var menuArray = [];
+
+		// block/unblock if it's not me
+		if(userID == window.loggedIn.id) {
+			menuArray.push({
+				type: 'function',
+				functionName: 'triggerEditProfileButtonClick',
+				label: window.sL.editMyProfile
+				});
+			menuArray.push({
+				type: 'link',
+				href: window.siteInstanceURL + 'settings/profile',
+				label: window.sL.settings
+				});
+			menuArray.push({
+				type: 'link',
+				href: window.siteInstanceURL + window.loggedIn.screen_name + '/blocks',
+				label: window.sL.userBlocks
+				});
+			}
+		else {
+			if(userIsBlocked(userID)) {
+				menuArray.push({
+					type: 'function',
+					functionName: 'unblockUser',
+					functionArguments: {
+						userId: userID
+						},
+					label: window.sL.unblockUser.replace('{username}','@' + userScreenName)
+					});
+				}
+			else {
+				menuArray.push({
+					type: 'function',
+					functionName: 'blockUser',
+					functionArguments: {
+						userId: userID
+						},
+					label: window.sL.blockUser.replace('{username}','@' + userScreenName)
+					});
+				}
+			}
+
+		var menu = $(getMenu(menuArray)).appendTo(this);
+		alignMenuToParent(menu,$(this));
+		}
+	});
+
+// hide the stream menu when clicking outside it
+$('body').on('click',function(e){
+	if(!$(e.target).is('.user-menu-cog') && $('.user-menu-cog').hasClass('dropped') && !$(e.target).closest('.user-menu-cog').length>0) {
+		$('.user-menu-cog').children('.dropdown-menu').remove();
+		$('.user-menu-cog').removeClass('dropped');
+		}
+	});
+
+
+
 /* ·
    ·
    ·   Show/hide the stream menu dropdown on click
@@ -4048,7 +4137,7 @@ function uploadAttachment(e, thisUploadButton) {
    ·
    · · · · · · · · · · · · · */
 
-$('body').on('click','#mini-edit-profile-button, #edit-profile-header-link, .hover-card .edit-profile-button',function(){
+$('body').on('click','#mini-edit-profile-button, #edit-profile-header-link, .hover-card .edit-profile-button, .row-type-edit-profile-menu-link',function(){
 	if(window.currentStreamObject.name == 'my profile') {
 		$('#page-container > .profile-card .edit-profile-button').trigger('click');
 		}
@@ -4058,3 +4147,6 @@ $('body').on('click','#mini-edit-profile-button, #edit-profile-header-link, .hov
 			});
 		}
 	});
+function triggerEditProfileButtonClick() {
+	$('#user-header #mini-edit-profile-button').trigger('click');
+	}

locale/ar.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/ast.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/ca.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/de.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/en.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/eo.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/es.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/es_ahorita.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/eu.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/fa.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/fi.json

@@ -180,5 +180,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/fr.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Profils dans le bac à sable sur {site-title}",
 	"silencedStreamDescription":"Le profils réduits au silence ne peuvent pas se connecter, commencer des diatribes et celles déjà postées sont cachées. Pour les comptes locaux, le résultat est similaire à une suppression de compte qui peut être annulée. Pour les comptes distants, c’est un blocage sur l’entièreté du site.",
 	"sandboxedStreamDescription":"Les mises à jour des profils du bac à sable sont exclues de l’Accueil et de l’Ensemble de la Fédération. Les messages postés tout en étant dans le bac à sable ne seront pas inclus dans les flux publics si le profil est remis en dehors du bac à sable.",
-	"onlyShowNotificationsFromUsersIFollow":"Afficher uniquement les notifications des utilisateurs que je suis"
+	"onlyShowNotificationsFromUsersIFollow":"Afficher uniquement les notifications des utilisateurs que je suis",
+	"userOptions":"More user actions"
 }

locale/gl.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/he.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/io.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/it.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/ja.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/nb.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Profiler satt i lekekasse på {site-title}",
 	"silencedStreamDescription":"Forstummede brukere can ikke logge på tjenesten, sende status meldinger, samt allerede status meldinger er skjult. For lokale brukere vil dette oppleves som å bli slettet, men beslutnignen kan reverseres. For brukere på andre instanser vil det oppleves som en utvidet blokkering.",
 	"sandboxedStreamDescription":"Statusmeldinger fra brukere satt i lekekassen, så vil meldingene bli ekskludert fra den offentlige tidslinjen og hele nettverks tidslinjen. Statusmeldinger send når man er i lekekasse vil ikke bli inkludert i den offentlige tidslinjen hvis brukeren blir tatt ut av lekekassen.",
-	"onlyShowNotificationsFromUsersIFollow":"Vis kun notifikasjoner fra brukere jeg følger"
+	"onlyShowNotificationsFromUsersIFollow":"Vis kun notifikasjoner fra brukere jeg følger",
+	"userOptions":"More user actions"
 }

locale/nl.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/pt.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/pt_br.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/ru.json

@@ -177,5 +177,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/sq.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/sv.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Användare i sandlådan på {site-title}",
 	"silencedStreamDescription":"Nedtystade användare kan inte logga in eller skriva qvittringar. Qvittringar som de redan skrivit är dolda. För lokala användare är det som en borttagning som kan ångras, och för externa användare är det som att blockera användaren från instansen.",
 	"sandboxedStreamDescription":"Qvittringar från användare som är i sandlådan visas inte i "Hela sajtens flöde" eller "Hela det kända nätverket". Qvittringar som användaren skriver under tiden den är i sandlådan kommer inte visas i de offentliga flödena om hen tas ur sandlådan senare.",
-	"onlyShowNotificationsFromUsersIFollow":"Visa bara notiser från användare som jag följer"
+	"onlyShowNotificationsFromUsersIFollow":"Visa bara notiser från användare som jag följer",
+	"userOptions":"Fler användaråtgärder"
 }

locale/tr.json

@@ -179,5 +179,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/zh_cn.json

@@ -178,5 +178,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }

locale/zh_tw.json

@@ -178,5 +178,6 @@
 	"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
 	"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
 	"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
-	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
+	"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow",
+	"userOptions":"More user actions"
 }