Wanted to comment on the l10n string itself, but github won't let me.  You're changing the context of the string on many fronts (new position, now it's per-folder, not per-account, etc.), so you need to create a new string id and eliminate this string.  If we leave the string the same the localizers won't know that they potentially need to choose a better string.  You'll want the l10n note to mention that we are clever and spill to two lines.